Cleanup versions by introducing consistent version properties

Add jakarta.tck.sigtest.version property for jakarta.tck:signaturetest Change jakarta.tck.tools.version to jakarta.tck.common.version Use jakarta.jakartaee-bom.version for the jakarta.platform:jakarta.jakartaee-bom version Use jakarta.tck.arquillian.version for jakarta.tck.arquillian:* artifacts Related to #1991 Signed-off-by: Scott M Stark <[email protected]>
jakartaee · Feb 27, 2025 · 146f1fd · 146f1fd
1 parent ae7f6af
commit 146f1fd
Show file tree

Hide file tree

Showing 88 changed files with 176 additions and 2,652 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -33,8 +33,8 @@
   <name>Jakarta EE TCK Artifacts BOM</name>
 
   <properties>
-    <version.jakarta.tck.arquillian>11.0.0-RC1</version.jakarta.tck.arquillian>
-    <version.jakarta.tck.common>11.0.0-RC5</version.jakarta.tck.common>
+    <version.jakarta.tck.arquillian>11.0.0-RC2</version.jakarta.tck.arquillian>
+    <jakarta.tck.common.version>11.0.0-RC5</jakarta.tck.common.version>
   </properties>
 
   <dependencyManagement> 
@@ -190,12 +190,12 @@
       <dependency>
         <groupId>jakarta.tck</groupId>
         <artifactId>common</artifactId>
-        <version>${version.jakarta.tck.common}</version>
+        <version>${jakarta.tck.common.version}</version>
       </dependency>
       <dependency>
         <groupId>jakarta.tck</groupId>
         <artifactId>signaturetest</artifactId>
-        <version>${version.jakarta.tck.common}</version>
+        <version>${jakarta.tck.sigtest.version}</version>
       </dependency>
 
       <!-- TCK Arquillian artifacts -->

diff --git a/glassfish-runner/jsonb-platform-extra-tck/jsonb-platform-extra-tck-run/pom.xml b/glassfish-runner/jsonb-platform-extra-tck/jsonb-platform-extra-tck-run/pom.xml
@@ -42,7 +42,7 @@
         <glassfish.version>8.0.0-JDK17-M9</glassfish.version>
 
         <jakarta.tck.arquillian.version>11.0.0-RC1</jakarta.tck.arquillian.version>
-        <jakarta.tck.tools.version>11.0.0-RC5</jakarta.tck.tools.version>
+        <jakarta.tck.common.version>11.0.0-RC5</jakarta.tck.common.version>
         <tck.version>3.0.0-M1</tck.version>
         <ts.home>/jakartaeetck</ts.home>
     </properties>
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.common.version}</version>
         </dependency>
 
         <dependency>

diff --git a/glassfish-runner/jsonp-platform-extra-tck/jsonp-platform-extra-tck-run/pom.xml b/glassfish-runner/jsonp-platform-extra-tck/jsonp-platform-extra-tck-run/pom.xml
@@ -42,7 +42,7 @@
         <glassfish.version>8.0.0-JDK17-M9</glassfish.version>
 
         <jakarta.tck.arquillian.version>11.0.0-RC1</jakarta.tck.arquillian.version>
-        <jakarta.tck.tools.version>11.0.0-RC5</jakarta.tck.tools.version>
+        <jakarta.tck.common.version>11.0.0-RC5</jakarta.tck.common.version>
         <tck.version>${project.version}</tck.version>
         <ts.home>/jakartaeetck</ts.home>
     </properties>
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.common.version}</version>
         </dependency>
 
         <dependency>

diff --git a/glassfish-runner/pages-tck/pages-tck-run/pom.xml b/glassfish-runner/pages-tck/pages-tck-run/pom.xml
@@ -40,6 +40,8 @@
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <jakarta.tck.common.version>11.0.0-RC6</jakarta.tck.common.version>
+        <jakarta.tck.sigtest.version>11.0.0-RC5</jakarta.tck.sigtest.version>
     </properties>
 
     <dependencyManagement>
@@ -85,13 +87,13 @@
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>common</artifactId>
-            <version>11.0.0-M2</version>
+            <version>${jakarta.tck.common.version}</version>
         </dependency>
 
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>signaturetest</artifactId>
-            <version>11.0.0-M2</version>
+            <version>${jakarta.tck.sigtest.version}</version>
         </dependency>
 
         <!-- Junit 5 -->

diff --git a/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/pom.xml b/glassfish-runner/persistence-platform-tck/persistence-platform-tck-run/pom.xml
@@ -44,7 +44,7 @@
 
         <tck.version>11.0.0-M10</tck.version>
         <jakarta.tck.arquillian.version>11.0.0-RC1</jakarta.tck.arquillian.version>
-        <jakarta.tck.tools.version>11.0.0-RC5</jakarta.tck.tools.version>
+        <jakarta.tck.common.version>11.0.0-RC5</jakarta.tck.common.version>
         <version.persistence.tck>11.0.0-M10</version.persistence.tck>
 
         <ts.home>./jakartaeetck</ts.home>
@@ -125,7 +125,7 @@
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.common.version}</version>
         </dependency>
 
         <!-- Junit -->

diff --git a/glassfish-runner/platform/appclient-platform-tck/pom.xml b/glassfish-runner/platform/appclient-platform-tck/pom.xml
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.common.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.tck</groupId>

diff --git a/glassfish-runner/platform/assembly-tck/pom.xml b/glassfish-runner/platform/assembly-tck/pom.xml
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.common.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.main.common</groupId>

diff --git a/glassfish-runner/platform/integration-platform-tck/pom.xml b/glassfish-runner/platform/integration-platform-tck/pom.xml
@@ -250,7 +250,7 @@
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.common.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.tck</groupId>

diff --git a/glassfish-runner/platform/jdbc-platform-tck/jdbc-platform-tck-run/pom.xml b/glassfish-runner/platform/jdbc-platform-tck/jdbc-platform-tck-run/pom.xml
@@ -44,7 +44,7 @@
         <glassfish.toplevel.dir>glassfish8</glassfish.toplevel.dir>
         <!-- Use JDK17 to run with GF-8.0.0-JDK17-M7 -->
         <glassfish.version>8.0.0-JDK17-M9</glassfish.version>
-        <jakarta.tck.tools.version>11.0.0-RC5</jakarta.tck.tools.version>
+        <jakarta.tck.common.version>11.0.0-RC5</jakarta.tck.common.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.common.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.tck</groupId>

diff --git a/glassfish-runner/platform/xa-platform-tck/pom.xml b/glassfish-runner/platform/xa-platform-tck/pom.xml
@@ -92,7 +92,7 @@
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.common.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.tck</groupId>

diff --git a/glassfish-runner/transactions-tck/transactions-tck-run/pom.xml b/glassfish-runner/transactions-tck/transactions-tck-run/pom.xml
@@ -43,7 +43,7 @@
         <junit.jupiter.version>5.10.2</junit.jupiter.version>
         <ts.home>${basedir}/jakartaeetck</ts.home>
 
-        <jakarta.tck.tools.version>11.0.0-RC5</jakarta.tck.tools.version>
+        <jakarta.tck.common.version>11.0.0-RC5</jakarta.tck.common.version>
         <jakarta.tck.arquillian.version>11.0.0-RC1</jakarta.tck.arquillian.version>
         <tck.version>${project.version}</tck.version>
         <jakarta.tck.transactions.version>${tck.version}</jakarta.tck.transactions.version>
@@ -135,7 +135,7 @@
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.common.version}</version>
         </dependency>
 
         <!--

diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,6 @@
         <module>tcks/profiles/platform/integration</module>
         <module>tcks/profiles/platform/javaee</module>
         <module>tcks/profiles/platform/jdbc</module>
-        <module>tcks/profiles/platform/samples</module>
         <module>tcks/profiles/platform/signaturevalidation</module>
         <module>tcks/profiles/platform/xa</module>
         <module>tcks/profiles/platform/docs/userguide</module>
@@ -82,14 +81,19 @@
     </modules>
 
     <properties>
-        <!-- Arquillian -->
         <ant.version>1.10.15</ant.version>
+        <!-- Arquillian -->
         <arquillian.container.se.api.version>1.0.2.Final</arquillian.container.se.api.version>
         <arquillian.version>1.9.3.Final</arquillian.version>
-
+        <!-- The version of the jakarta platform api bom -->
+        <jakarta.jakartaee-bom.version>11.0.0-M5</jakarta.jakartaee-bom.version>
         <!-- Jakarta TCK Tools version from the independently released tools submodule -->
-        <jakarta.tck.arquillian.version>11.0.0-RC1</jakarta.tck.arquillian.version>
-        <jakarta.tck.tools.version>11.0.0-RC5</jakarta.tck.tools.version>
+        <!-- The Arquillian protocol artifacts -->
+        <jakarta.tck.arquillian.version>11.0.0-RC2</jakarta.tck.arquillian.version>
+        <!-- The released version of tools/common -->
+        <jakarta.tck.common.version>11.0.0-RC6</jakarta.tck.common.version>
+        <!-- The released version of tools/signaturetest -->
+        <jakarta.tck.sigtest.version>11.0.0-RC5</jakarta.tck.sigtest.version>
 
         <maven.compiler.release>17</maven.compiler.release>
         <maven.compiler.testRelease>${maven.compiler.release}</maven.compiler.testRelease>
@@ -101,7 +105,6 @@
         <slf4j.version>2.0.16</slf4j.version>
         <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
 
-        <jakarta.jakartaee-bom.version>11.0.0-M5</jakarta.jakartaee-bom.version>
     </properties>
 
     <dependencyManagement>
@@ -129,7 +132,7 @@
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>common</artifactId>
-                <version>${jakarta.tck.tools.version}</version>
+                <version>${jakarta.tck.common.version}</version>
             </dependency>
 
             <dependency>
@@ -245,12 +248,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>samples</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>signaturetest</artifactId>

diff --git a/release/artifact-install.pom b/release/artifact-install.pom
@@ -401,9 +401,9 @@
                         <configuration>
                             <groupId>jakarta.tck</groupId>
                             <artifactId>signaturetest</artifactId>
-                            <version>${jakarta.tck.tools.version}</version>
+                            <version>${jakarta.tck.sigtest.version}</version>
                             <packaging>jar</packaging>
-                            <file>signaturetest-${jakarta.tck.tools.version}.jar</file>
+                            <file>signaturetest-${jakarta.tck.sigtest.version}.jar</file>
                             <generatePom>false</generatePom>
                         </configuration>
                     </execution>

diff --git a/release/pom.xml b/release/pom.xml
@@ -62,18 +62,18 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.common.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.common.version}</version>
             <classifier>javadoc</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.common.version}</version>
             <classifier>sources</classifier>
         </dependency>
         <dependency>
@@ -245,7 +245,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>signaturetest</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.sigtest.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.tck</groupId>

diff --git a/tcks/apis/connector/pom.xml b/tcks/apis/connector/pom.xml
@@ -37,7 +37,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <jakarta.tck.tools.version>11.0.0-RC5</jakarta.tck.tools.version>
+        <jakarta.tck.common.version>11.0.0-RC5</jakarta.tck.common.version>
+        <jakarta.jakartaee-bom.version>11.0.0-M5</jakarta.jakartaee-bom.version>
         <jakarta.tck.arquillian.version>11.0.0-RC1</jakarta.tck.arquillian.version>
     </properties>
 
@@ -60,7 +61,7 @@
             <dependency>
                  <groupId>jakarta.platform</groupId>
                  <artifactId>jakarta.jakartaee-bom</artifactId>
-                 <version>11.0.0-M5</version>
+                 <version>${jakarta.jakartaee-bom.version}</version>
                  <type>pom</type>
                  <scope>import</scope>
              </dependency>
@@ -95,7 +96,7 @@
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.common.version}</version>
         </dependency>
 
         <dependency>

diff --git a/tcks/apis/enterprise-beans/ejb30/pom.xml b/tcks/apis/enterprise-beans/ejb30/pom.xml
@@ -35,8 +35,9 @@
 
     <properties>
         <maven.compiler.release>17</maven.compiler.release>
-        <jaxwsStaleDirectory>${project.build.directory}/jaxws/stale</jaxwsStaleDirectory>
-        <jakarta.tck.tools.version>11.0.0-RC5</jakarta.tck.tools.version>
+        <jakarta.jakartaee-bom.version>11.0.0-M5</jakarta.jakartaee-bom.version>
+        <jakarta.tck.common.version>11.0.0-RC6</jakarta.tck.common.version>
+        <jakarta.tck.arquillian.version>11.0.0-M2</jakarta.tck.arquillian.version>
     </properties>
 
     <dependencyManagement>
@@ -58,7 +59,7 @@
             <dependency>
                  <groupId>jakarta.platform</groupId>
                  <artifactId>jakarta.jakartaee-bom</artifactId>
-                 <version>11.0.0-M5</version>
+                 <version>${jakarta.jakartaee-bom.version}</version>
                  <type>pom</type>
                  <scope>import</scope>
              </dependency>
@@ -69,7 +70,7 @@
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>common</artifactId>
-            <version>${jakarta.tck.tools.version}</version>
+            <version>${jakarta.tck.common.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/tcks/apis/enterprise-beans/ejb32/pom.xml b/tcks/apis/enterprise-beans/ejb32/pom.xml
@@ -36,6 +36,9 @@
     <properties>
         <maven.compiler.release>17</maven.compiler.release>
         <ejb30.version>${project.version}</ejb30.version>
+        <jakarta.tck.common.version>11.0.0-RC5</jakarta.tck.common.version>
+        <jakarta.jakartaee-bom.version>11.0.0-M5</jakarta.jakartaee-bom.version>
+        <jakarta.tck.arquillian.version>11.0.0-RC2</jakarta.tck.arquillian.version>
     </properties>
 
     <dependencyManagement>
@@ -57,7 +60,7 @@
             <dependency>
                  <groupId>jakarta.platform</groupId>
                  <artifactId>jakarta.jakartaee-bom</artifactId>
-                 <version>11.0.0-M5</version>
+                 <version>${jakarta.jakartaee-bom.version}</version>
                  <type>pom</type>
                  <scope>import</scope>
              </dependency>
@@ -99,12 +102,12 @@
         <dependency>
             <groupId>jakarta.tck.arquillian</groupId>
             <artifactId>arquillian-protocol-common</artifactId>
-            <version>11.0.0-M1</version>
+            <version>${jakarta.tck.arquillian.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.tck.arquillian</groupId>
             <artifactId>tck-porting-lib</artifactId>
-            <version>11.0.0-RC1</version>
+            <version>${jakarta.tck.arquillian.version}</version>
         </dependency>
 
         <dependency>