Skip to content

Commit

Permalink
Prepare a 11.0.0-M1 release of core profile tck (#1574)
Browse files Browse the repository at this point in the history 
Signed-off-by: Scott M Stark <[email protected]>
  • Loading branch information
@starksm64
starksm64 authored Oct 10, 2024
1 parent f088988 commit 4aea241
Show file tree
Hide file tree
Showing 10 changed files with 201 additions and 95 deletions.
4 changes: 2 additions & 2 deletions core-profile-tck/ca-sigtest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>jakarta.ee.tck.coreprofile</groupId>
<groupId>jakarta.tck.coreprofile</groupId>
<artifactId>core-tck-parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.0.0-M1</version>
</parent>
<artifactId>common-annotations</artifactId>

Expand Down
4 changes: 2 additions & 2 deletions core-profile-tck/cdi-tck-suite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>jakarta.ee.tck.coreprofile</groupId>
<groupId>jakarta.tck.coreprofile</groupId>
<artifactId>core-tck-parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.0.0-M1</version>
</parent>

<artifactId>cdi-lite-tck-suite</artifactId>
Expand Down
15 changes: 7 additions & 8 deletions core-profile-tck/jsonp-tck-ext/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>jakarta.ee.tck.coreprofile</groupId>
<groupId>jakarta.tck.coreprofile</groupId>
<artifactId>core-tck-parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.0.0-M1</version>
</parent>

<artifactId>core-tck-jsonp-extension</artifactId>
Expand All @@ -28,11 +28,6 @@
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
Expand All @@ -44,7 +39,11 @@
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-api-maven</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>

<build>
Expand Down
49 changes: 0 additions & 49 deletions core-profile-tck/jsonp-tck-ext/src/test/java/maven/resolver/ResolverApiTest.java
View file

This file was deleted.

2 changes: 2 additions & 0 deletions core-profile-tck/jsonp-tck-ext/src/test/java/shrinkwrap/JsonpTckArtifactTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.junit.jupiter.api.Test;

public class JsonpTckArtifactTest {
@Disabled
@Test
public void testCreateJsonpTckArtifact() {
MavenResolvedArtifact[] resolvedArtifacts = Maven.resolver()
Expand All @@ -35,6 +36,7 @@ public void testCreateJsonpTckArtifact() {
System.out.println(archive.toString(true));
}

@Disabled
@Test
public void testCreateJsonpTckArtifactAll() {
String[] activeMavenProfiles = {"staging"};
Expand Down
188 changes: 172 additions & 16 deletions core-profile-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@
~ SPDX-License-Identifier: Apache-2.0
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>jakarta.tck</groupId>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>1.0.9</version>
<relativePath></relativePath>
</parent>

<groupId>jakarta.ee.tck.coreprofile</groupId>
<groupId>jakarta.tck.coreprofile</groupId>
<artifactId>core-tck-parent</artifactId>
<version>11.0.0-M1</version>
<packaging>pom</packaging>
<name>Jakarta Core TCK</name>

Expand All @@ -30,7 +32,7 @@

<organization>
<name>Jakarta Core Profile TCK</name>
<url>https://github.com/eclipse-ee4j/jakartaee-tck</url>
<url>https://github.com/jakartaee/platform-tck.git</url>
</organization>

<licenses>
Expand Down Expand Up @@ -66,7 +68,7 @@

<issueManagement>
<system>GitHub</system>
<url>https://github.com/eclipse-ee4j/jakartaee-tck/issues</url>
<url>https://github.com/jakartaee/platform-tck/issues</url>
</issueManagement>

<ciManagement>
Expand All @@ -75,13 +77,17 @@
</ciManagement>

<properties>
<arquillian.version>1.9.1.Final</arquillian.version>
<arquillian.container.se.api.version>1.0.2.Final</arquillian.container.se.api.version>

<!-- Jakarta EE APIs Core -->
<annotations.api.version>3.0.0</annotations.api.version>
<apache.httpclient.version>3.1</apache.httpclient.version>

<cdi.api.version>4.1.0</cdi.api.version>
<cdi.tck.version>4.1.0</cdi.tck.version>
<jakarta.interceptor-api.version>2.2.0</jakarta.interceptor-api.version>

<!-- Required for distribution build, should be overriden for each build -->
<core.tck.version>${project.version}</core.tck.version>
<el.api.version>6.0.0</el.api.version>
Expand All @@ -97,6 +103,7 @@

<!-- Test tools/dependencies -->
<testng.version>7.10.2</testng.version>
<shrinkwrap.version>3.2.1</shrinkwrap.version>
<weld.version>6.0.0.Beta4</weld.version>
</properties>

Expand Down Expand Up @@ -150,6 +157,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-bom</artifactId>
<version>${shrinkwrap.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.jboss.arquillian.container</groupId>
Expand All @@ -167,17 +181,159 @@
<artifactId>arquillian-junit5-container</artifactId>
<version>${arquillian.version}</version>
</dependency>

<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${cdi.api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
<version>${jakarta.interceptor-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${annotations.api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${inject.api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
<version>${jsonp.api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-api</artifactId>
<version>${jsonb.api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${rest.api.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<!-- do not publish this artifact to Maven repositories -->
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.8.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<preparationGoals>clean install</preparationGoals>
<arguments>-Drelease -Dtck-audit</arguments>
</configuration>
</plugin>
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<doclint>none</doclint>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<environmentVariables>
<AS_JAVA>${java.home}</AS_JAVA>
<JAVA_HOME>${java.home}</JAVA_HOME>
</environmentVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.0.0-M1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>tck-extract-tests-maven-plugin</artifactId>
<version>1.2.0-SNAPSHOT</version>
<configuration>
<tckTestsFile>${project.build.outputDirectory}/META-INF/tck-tests.txt</tckTestsFile>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
4 changes: 2 additions & 2 deletions core-profile-tck/restful-tck-suite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>jakarta.ee.tck.coreprofile</groupId>
<groupId>jakarta.tck.coreprofile</groupId>
<artifactId>core-tck-parent</artifactId>
<version>11.0.0-SNAPSHOT</version>
<version>11.0.0-M1</version>
</parent>

<artifactId>rest-tck-suite</artifactId>
Expand Down
Loading

0 comments on commit 4aea241

Please sign in to comment.