Prepare a 11.0.0-M2 release of core profile tck (#1577)

* Prepare a 11.0.0-M1 release of core profile tck Signed-off-by: Scott M Stark <[email protected]> * Fix the artifacts-pom.xml tck versions Prepare a 11.0.0-M2 release of core profile tck Signed-off-by: Scott M Stark <[email protected]> --------- Signed-off-by: Scott M Stark <[email protected]>
jakartaee · Oct 10, 2024 · b957c30 · b957c30
1 parent b0f0da3
commit b957c30
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 40 deletions.
diff --git a/core-profile-tck/README.adoc b/core-profile-tck/README.adoc
@@ -17,3 +17,12 @@ Main branch contains the work-in-progress on Jakarta Core Profile TCK 10.0
 * LICENSE - the project development license, Apache License
 Version 2.0. When distributed as a final TCK the bundled license is the https://www.eclipse.org/legal/tck.php[Eclipse Foundation Technology Compatibility Kit License].
 * README.adoc - this doc
+
+## Checklist for updating the TCK
+* update the EE api versions in the pom.xml
+* update the EE tck versions in the pom.xml
+* set the release version in the pom.xml in all modules
+
+## Staging the TCK
+https://ci.eclipse.org/jakartaee-tck/job/10/job/jakarta-coreprofile-tck-build/
+TBD: should be moved to the https://ci.eclipse.org/jakartaee-tck/job/11/ jobs?
diff --git a/core-profile-tck/ca-sigtest/pom.xml b/core-profile-tck/ca-sigtest/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>jakarta.tck.coreprofile</groupId>
         <artifactId>core-tck-parent</artifactId>
-        <version>11.0.0-M1</version>
+        <version>11.0.0-M2</version>
     </parent>
     <artifactId>common-annotations</artifactId>
 

diff --git a/core-profile-tck/cdi-tck-suite/pom.xml b/core-profile-tck/cdi-tck-suite/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>jakarta.tck.coreprofile</groupId>
         <artifactId>core-tck-parent</artifactId>
-        <version>11.0.0-M1</version>
+        <version>11.0.0-M2</version>
     </parent>
 
     <artifactId>cdi-lite-tck-suite</artifactId>

diff --git a/core-profile-tck/jsonp-tck-ext/pom.xml b/core-profile-tck/jsonp-tck-ext/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>jakarta.tck.coreprofile</groupId>
         <artifactId>core-tck-parent</artifactId>
-        <version>11.0.0-M1</version>
+        <version>11.0.0-M2</version>
     </parent>
 
     <artifactId>core-tck-jsonp-extension</artifactId>

diff --git a/core-profile-tck/pom.xml b/core-profile-tck/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>jakarta.tck.coreprofile</groupId>
     <artifactId>core-tck-parent</artifactId>
-    <version>11.0.0-M1</version>
+    <version>11.0.0-M2</version>
     <packaging>pom</packaging>
     <name>Jakarta Core TCK</name>
 
@@ -88,14 +88,16 @@
         <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 -->
+        <!-- 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>
         <inject.api.version>2.0.1</inject.api.version>
         <inject.tck.version>2.0.2</inject.tck.version>
         <interceptors.api.version>2.2.0</interceptors.api.version>
         <jsonb.api.version>3.0.0</jsonb.api.version>
+        <jsonb.tck.version>3.0.0</jsonb.tck.version>
         <jsonp.api.version>2.1.0</jsonp.api.version>
+        <jsonp.tck.version>2.1.0</jsonp.tck.version>
         <junit.version>5.8.2</junit.version>
         <maven.compiler.release>17</maven.compiler.release>
         <rest.api.version>4.0.0</rest.api.version>

diff --git a/core-profile-tck/restful-tck-suite/pom.xml b/core-profile-tck/restful-tck-suite/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>jakarta.tck.coreprofile</groupId>
         <artifactId>core-tck-parent</artifactId>
-        <version>11.0.0-M1</version>
+        <version>11.0.0-M2</version>
     </parent>
 
     <artifactId>rest-tck-suite</artifactId>

diff --git a/core-profile-tck/tck-dist/RELEASE-NOTES.adoc b/core-profile-tck/tck-dist/RELEASE-NOTES.adoc
@@ -1,5 +1,11 @@
 = Jakarta Core Profile TCK Release notes
 
+== Version 11.0.0-M2
+* Fix the artifacts-pom.xml failing to be updated for the new EE 11 component TCKs
+
+== Version 11.0.0-M1
+* Initial milestone test release of the Jakarta Core Profile TCK for EE 11
+
 == Version 10.0.1
 
 Adds bug fixes for two Core Profile TCK challenges:

diff --git a/core-profile-tck/tck-dist/pom.xml b/core-profile-tck/tck-dist/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>jakarta.tck.coreprofile</groupId>
         <artifactId>core-tck-parent</artifactId>
-        <version>11.0.0-M1</version>
+        <version>11.0.0-M2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/core-profile-tck/tck-dist/src/main/assembly/assembly.xml b/core-profile-tck/tck-dist/src/main/assembly/assembly.xml
@@ -30,7 +30,7 @@
 
       <!-- A maven pom.xml to install the TCK artifacts into a local maven repo -->
       <file>
-         <source>artifacts-pom.xml</source>
+         <source>src/main/resources/artifacts-pom.xml</source>
          <destName>pom.xml</destName>
          <outputDirectory>artifacts</outputDirectory>
          <filtered>true</filtered>
@@ -70,12 +70,12 @@
    <dependencySets>
       <dependencySet>
          <includes>
-            <include>jakarta.ee.tck.coreprofile:core-tck-parent</include>
-            <include>jakarta.ee.tck.coreprofile:common-annotations</include>
-            <include>jakarta.ee.tck.coreprofile:cdi-lite-tck-suite</include>
-            <include>jakarta.ee.tck.coreprofile:rest-tck-suite</include>
-            <include>jakarta.ee.tck.coreprofile:core-profile-tck-impl</include>
-            <include>jakarta.ee.tck.coreprofile:core-tck-jsonp-extension</include>
+            <include>jakarta.tck.coreprofile:core-tck-parent</include>
+            <include>jakarta.tck.coreprofile:common-annotations</include>
+            <include>jakarta.tck.coreprofile:cdi-lite-tck-suite</include>
+            <include>jakarta.tck.coreprofile:rest-tck-suite</include>
+            <include>jakarta.tck.coreprofile:core-profile-tck-impl</include>
+            <include>jakarta.tck.coreprofile:core-tck-jsonp-extension</include>
          </includes>
          <useTransitiveDependencies>true</useTransitiveDependencies>
          <outputDirectory>artifacts</outputDirectory>

diff --git a/core-profile-tck/tck-dist/artifacts-pom.xml → ...dist/src/main/resources/artifacts-pom.xml b/core-profile-tck/tck-dist/artifacts-pom.xml → ...dist/src/main/resources/artifacts-pom.xml
@@ -13,7 +13,7 @@
 <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>
 
-  <groupId>jakarta.ee.tck.coreprofile</groupId>
+  <groupId>jakarta.tck.coreprofile</groupId>
   <artifactId>core-profile-tck-dependencies</artifactId>
   <packaging>pom</packaging>
   <!-- This is set to project release version during assembly -->
@@ -44,41 +44,41 @@
               <target>
                 <mkdir dir="downloads/tcks"/>
                 <!-- download file -->
-                <get src="https://download.eclipse.org/jakartaee/jsonp/2.1/jakarta-jsonp-tck-2.1.0.zip"
+                <get src="https://download.eclipse.org/jakartaee/jsonp/2.1/jakarta-jsonp-tck-${jsonp.tck.version}.zip"
 
                      dest="downloads/tcks/"
                      verbose="false"
                      usetimestamp="true"/>
-                <get src="https://download.eclipse.org/jakartaee/jsonb/3.0/jakarta-jsonb-tck-3.0.0.zip"
+                <get src="https://download.eclipse.org/jakartaee/jsonb/3.0/jakarta-jsonb-tck-${jsonb.tck.version}.zip"
                      dest="downloads/tcks/"
                      verbose="false"
                      usetimestamp="true"/>
-                <get src="https://download.eclipse.org/jakartaee/restful-ws/3.1/jakarta-restful-ws-tck-3.1.1.zip"
+                <get src="https://download.eclipse.org/jakartaee/restful-ws/4.0/jakarta-restful-ws-tck-${rest.tck.version}.zip"
                      dest="downloads/tcks/"
                      verbose="false"
                      usetimestamp="true"/>
-                <get src="https://download.eclipse.org/jakartaee/cdi/4.0/cdi-tck-${cdi.tck.dist.version}-dist.zip"
+                <get src="https://download.eclipse.org/jakartaee/cdi/4.1/cdi-tck-${cdi.tck.dist.version}-dist.zip"
                      dest="downloads/tcks/"
                      verbose="false"
                      usetimestamp="true"/>
-                <get src="https://download.eclipse.org/jakartaee/dependency-injection/2.0/jakarta.inject-tck-2.0.2-bin.zip"
+                <get src="https://download.eclipse.org/jakartaee/dependency-injection/2.0/jakarta.inject-tck-${inject.tck.version}-bin.zip"
                      dest="downloads/tcks/"
                      verbose="false"
                      usetimestamp="true"/>
-                <unzip src="downloads/tcks/jakarta-jsonp-tck-2.1.0.zip" dest="downloads/tcks/" />
-                <unzip src="downloads/tcks/jakarta-jsonb-tck-3.0.0.zip" dest="downloads/tcks/" />
-                <unzip src="downloads/tcks/jakarta-restful-ws-tck-3.1.1.zip" dest="downloads/tcks/rest-tck" />
+                <unzip src="downloads/tcks/jakarta-jsonp-tck-${jsonp.tck.version}.zip" dest="downloads/tcks/" />
+                <unzip src="downloads/tcks/jakarta-jsonb-tck-${jsonb.tck.version}.zip" dest="downloads/tcks/" />
+                <unzip src="downloads/tcks/jakarta-restful-ws-tck-${rest.tck.version}.zip" dest="downloads/tcks/rest-tck" />
                 <unzip src="downloads/tcks/cdi-tck-${cdi.tck.dist.version}-dist.zip" dest="downloads/tcks/" />
-                <unzip src="downloads/tcks/jakarta.inject-tck-2.0.2-bin.zip" dest="downloads/tcks/" />
+                <unzip src="downloads/tcks/jakarta.inject-tck-${inject.tck.version}-bin.zip" dest="downloads/tcks/" />
 
 
                 <exec executable="/bin/bash" dir="downloads/tcks/jsonp-tck/artifacts">
                   <arg value="artifact-install.sh"/>
-                  <arg value="2.1.0" />
+                  <arg value="${jsonp.tck.version}" />
                 </exec>
                 <exec executable="/bin/bash" dir="downloads/tcks/jsonb-tck/artifacts">
                   <arg value="artifact-install.sh"/>
-                  <arg value="3.0.0" />
+                  <arg value="${jsonb.tck.version}" />
                 </exec>
                 <exec executable="mvn" dir="downloads/tcks/cdi-tck-${cdi.tck.dist.version}/artifacts">
                   <arg value="install"/>
@@ -100,7 +100,7 @@
             </goals>
             <phase>prepare-package</phase>
             <configuration>
-              <groupId>jakarta.ee.tck.coreprofile</groupId>
+              <groupId>jakarta.tck.coreprofile</groupId>
               <artifactId>core-tck-parent</artifactId>
               <version>${project.version}</version>
               <packaging>pom</packaging>
@@ -116,7 +116,7 @@
             </goals>
             <phase>prepare-package</phase>
             <configuration>
-              <groupId>jakarta.ee.tck.coreprofile</groupId>
+              <groupId>jakarta.tck.coreprofile</groupId>
               <artifactId>core-tck-jsonp-extension</artifactId>
               <version>${project.version}</version>
               <packaging>jar</packaging>
@@ -132,7 +132,7 @@
             </goals>
             <phase>prepare-package</phase>
             <configuration>
-              <groupId>jakarta.ee.tck.coreprofile</groupId>
+              <groupId>jakarta.tck.coreprofile</groupId>
               <artifactId>core-profile-tck-impl</artifactId>
               <version>${project.version}</version>
               <packaging>jar</packaging>
@@ -148,7 +148,7 @@
             </goals>
             <phase>prepare-package</phase>
             <configuration>
-              <groupId>jakarta.ee.tck.coreprofile</groupId>
+              <groupId>jakarta.tck.coreprofile</groupId>
               <artifactId>cdi-lite-tck-suite</artifactId>
               <version>${project.version}</version>
               <packaging>jar</packaging>
@@ -163,7 +163,7 @@
             </goals>
             <phase>prepare-package</phase>
             <configuration>
-              <groupId>jakarta.ee.tck.coreprofile</groupId>
+              <groupId>jakarta.tck.coreprofile</groupId>
               <artifactId>cdi-lite-tck-suite</artifactId>
               <version>${project.version}</version>
               <packaging>xml</packaging>
@@ -179,7 +179,7 @@
             </goals>
             <phase>prepare-package</phase>
             <configuration>
-              <groupId>jakarta.ee.tck.coreprofile</groupId>
+              <groupId>jakarta.tck.coreprofile</groupId>
               <artifactId>common-annotations</artifactId>
               <version>${project.version}</version>
               <packaging>sig</packaging>
@@ -198,9 +198,9 @@
             <configuration>
               <groupId>jakarta.ws.rs</groupId>
               <artifactId>jakarta-restful-ws-tck</artifactId>
-              <version>3.1.1</version>
+              <version>${rest.tck.version}</version>
               <packaging>jar</packaging>
-              <file>downloads/tcks/rest-tck/jakarta-restful-ws-tck-3.1.1.jar</file>
+              <file>downloads/tcks/rest-tck/restful-ws-tck/artifacts/jakarta-restful-ws-tck-${rest.tck.version}.jar</file>
               <generatePom>true</generatePom>
             </configuration>
           </execution>
@@ -211,7 +211,7 @@
             </goals>
             <phase>prepare-package</phase>
             <configuration>
-              <groupId>jakarta.ee.tck.coreprofile</groupId>
+              <groupId>jakarta.tck.coreprofile</groupId>
               <artifactId>rest-tck-suite</artifactId>
               <version>${project.version}</version>
               <file>rest-tck-suite-${project.version}.jar</file>
@@ -228,9 +228,9 @@
             <configuration>
               <groupId>jakarta.inject</groupId>
               <artifactId>jakarta.inject-tck</artifactId>
-              <version>2.0.2</version>
+              <version>${inject.tck.version}</version>
               <packaging>jar</packaging>
-              <file>downloads/tcks/jakarta.inject-tck-2.0.2/jakarta.inject-tck-2.0.2.jar</file>
+              <file>downloads/tcks/jakarta.inject-tck-${inject.tck.version}/jakarta.inject-tck-${inject.tck.version}.jar</file>
               <generatePom>true</generatePom>
             </configuration>
           </execution>
@@ -246,8 +246,8 @@
               <artifactId>cdi-tck-core-impl</artifactId>
               <version>${cdi.tck.dist.version}</version>
               <packaging>sig</packaging>
-              <classifier>sigtest-jdk11</classifier>
-              <file>downloads/tcks/cdi-tck-${cdi.tck.dist.version}/artifacts/cdi-tck-core-impl-${cdi.tck.dist.version}-sigtest-jdk11.sig</file>
+              <classifier>sigtest-jdk17</classifier>
+              <file>downloads/tcks/cdi-tck-${cdi.tck.dist.version}/artifacts/cdi-tck-core-impl-${cdi.tck.dist.version}-sigtest-jdk17.sig</file>
               <generatePom>false</generatePom>
             </configuration>
           </execution>

diff --git a/core-profile-tck/tck/pom.xml b/core-profile-tck/tck/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>jakarta.tck.coreprofile</groupId>
         <artifactId>core-tck-parent</artifactId>
-        <version>11.0.0-M1</version>
+        <version>11.0.0-M2</version>
     </parent>
     <artifactId>core-profile-tck-impl</artifactId>
     <name>Jakarta Core Profile TCK Test Suite</name>