Override the license directory path in the API to ensure the license … (

#1251) * Override the license directory path in the API to ensure the license and notice files are copied to the API. Signed-off-by: James R. Perkins <jperkins@redhat.com> * Update the spec.version used for OSGi. Signed-off-by: James R. Perkins <jperkins@redhat.com> * Remove unneeded dependencies from the API. Upgrade some dependencies in the parent POM that the TCK was overriding. Signed-off-by: James R. Perkins <jperkins@redhat.com> --------- Signed-off-by: James R. Perkins <jperkins@redhat.com>
jakartaee · Apr 2, 2024 · 895716b · 895716b
1 parent ec8a7bd
commit 895716b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/jaxrs-api/pom.xml b/jaxrs-api/pom.xml
@@ -31,6 +31,10 @@
         <version>4.0.0-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <legal.doc.folder>${project.basedir}/..</legal.doc.folder>
+    </properties>
+
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
@@ -81,19 +85,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.inject</groupId>
-            <artifactId>jakarta.inject-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>jakarta.enterprise.cdi-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>

diff --git a/jaxrs-tck/pom.xml b/jaxrs-tck/pom.xml
@@ -41,8 +41,6 @@
         <servlet.api.version>6.1.0-M2</servlet.api.version>
         <common.httpclient.version>3.1</common.httpclient.version>
         <arquillian.version>1.8.0.Final</arquillian.version>
-        <annotation-api.version>3.0.0-M1</annotation-api.version>
-        <activation-api.version>2.1.3</activation-api.version>
     </properties>
 
     <dependencies>
@@ -89,7 +87,6 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${annotation-api.version}</version>
         </dependency>
 
         <dependency>
@@ -101,7 +98,6 @@
         <dependency>
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
-            <version>${activation-api.version}</version>
         </dependency>
 
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -102,11 +102,11 @@
         <api.package>jakarta.ws.rs</api.package>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <skip.release.tests>false</skip.release.tests>
-        <spec.version>3.2</spec.version>
+        <spec.version>4.0</spec.version>
         <spec.version.revision /> <!-- e.g. (Rev a) -->
 
-        <annotation.api.version>2.1.1</annotation.api.version>
-        <activation.api.version>2.0.0</activation.api.version>
+        <annotation.api.version>3.0.0-M1</annotation.api.version>
+        <activation.api.version>2.1.3</activation.api.version>
         <inject.api.version>2.0.0</inject.api.version>
         <validation.api.version>3.0.0</validation.api.version>
         <concurrent.api.version>2.0.0</concurrent.api.version>
@@ -139,31 +139,37 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- Used only in the examples -->
             <dependency>
                 <groupId>jakarta.annotation</groupId>
                 <artifactId>jakarta.annotation-api</artifactId>
                 <version>${annotation.api.version}</version>
             </dependency>
+            <!-- Required for the TCK -->
             <dependency>
                 <groupId>jakarta.activation</groupId>
                 <artifactId>jakarta.activation-api</artifactId>
                 <version>${activation.api.version}</version>
             </dependency>
+            <!-- Used onlu in the examples -->
             <dependency>
                 <groupId>jakarta.inject</groupId>
                 <artifactId>jakarta.inject-api</artifactId>
                 <version>${inject.api.version}</version>
             </dependency>
+            <!-- Used only in the examples -->
             <dependency>
                 <groupId>jakarta.enterprise</groupId>
                 <artifactId>jakarta.enterprise.cdi-api</artifactId>
                 <version>${cdi.api.version}</version>
             </dependency>
+            <!-- Used only in the examples -->
             <dependency>
                 <groupId>jakarta.validation</groupId>
                 <artifactId>jakarta.validation-api</artifactId>
                 <version>${validation.api.version}</version>
             </dependency>
+            <!-- Used only in the examples -->
             <dependency>
                 <groupId>jakarta.enterprise.concurrent</groupId>
                 <artifactId>jakarta.enterprise.concurrent-api</artifactId>