Various POM fixes

Parameterise Jakarta EE version Use group jakarta.tck for output Fix parent POM path warnings Fix element ordering (repositories after dependencies) Remove finalName (it is read-only)
jakartaee · May 8, 2024 · 254f435 · 254f435
1 parent 3956175
commit 254f435
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/tck/pom.xml b/tck/pom.xml
@@ -24,9 +24,10 @@
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
         <version>1.0.9</version>
-        <relativePath/>
+        <relativePath>./do-no-tuse</relativePath>
     </parent>
 
+    <groupId>jakarta.tck</groupId>
     <artifactId>jakarta-pages-tck</artifactId>
     <version>4.0.0</version>
     <packaging>jar</packaging>
@@ -42,44 +43,32 @@
         <jakarta.servlet-api.version>6.1.0-M2</jakarta.servlet-api.version>
         <jms-api.version>3.1.0</jms-api.version>
         <jsp-api.version>4.0.0-M2</jsp-api.version>
+        <jakarta.ee.version>11.0.0-M1</jakarta.ee.version>
         <junit.jupiter.version>5.9.3</junit.jupiter.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>repo2</id>
-            <name>staging repo</name>
-            <url>https://jakarta.oss.sonatype.org/content/repositories/staging</url>
-        </repository>
-        <repository>
-            <id>repo1</id>
-            <name>maven repo</name>
-            <url>https://repo1.maven.org/maven2/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>common</artifactId>
-            <version>11.0.0-M1</version>
+            <version>${jakarta.ee.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>runtime</artifactId>
-            <version>11.0.0-M1</version>
+            <version>${jakarta.ee.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>libutil</artifactId>
-            <version>11.0.0-M1</version>
+            <version>${jakarta.ee.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.tck</groupId>
             <artifactId>signaturetest</artifactId>
-            <version>11.0.0-M1</version>
+            <version>${jakarta.ee.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.tck</groupId>
@@ -133,8 +122,20 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>repo2</id>
+            <name>staging repo</name>
+            <url>https://jakarta.oss.sonatype.org/content/repositories/staging</url>
+        </repository>
+        <repository>
+            <id>repo1</id>
+            <name>maven repo</name>
+            <url>https://repo1.maven.org/maven2/</url>
+        </repository>
+    </repositories>
+
     <build>
-        <finalName>${bundle-name}-${project.version}</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -180,7 +181,6 @@
                             </descriptors>
                             <escapeString>\</escapeString>
                             <appendAssemblyId>false</appendAssemblyId>
-                            <finalName>${bundle-name}-${project.version}</finalName>
                         </configuration>
                     </execution>
                 </executions>