#1099 Upgrade from Java EE 7 to Jakarta EE 8

use Jakarta dependencies
ops4j · Dec 14, 2023 · 6a75516 · 6a75516
1 parent 4488f9a
commit 6a75516
Show file tree

Hide file tree

Showing 35 changed files with 105 additions and 96 deletions.
diff --git a/containers/pax-exam-container-forked/pom.xml b/containers/pax-exam-container-forked/pom.xml
@@ -105,8 +105,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/containers/pax-exam-container-karaf/pom.xml b/containers/pax-exam-container-karaf/pom.xml
@@ -99,8 +99,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/containers/pax-exam-container-openwebbeans/pom.xml b/containers/pax-exam-container-openwebbeans/pom.xml
@@ -38,14 +38,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/containers/pax-exam-container-tomcat/pom.xml b/containers/pax-exam-container-tomcat/pom.xml
@@ -58,8 +58,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/containers/pax-exam-container-weld/pom.xml b/containers/pax-exam-container-weld/pom.xml
@@ -37,14 +37,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/core/pax-exam-inject/pom.xml b/core/pax-exam-inject/pom.xml
@@ -37,8 +37,8 @@
             <artifactId>pax-swissbox-framework</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/core/pax-exam-invoker-jaxrs2/pom.xml b/core/pax-exam-invoker-jaxrs2/pom.xml
@@ -34,9 +34,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <version>2.0</version>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/core/pax-exam-link-assembly/pom.xml b/core/pax-exam-link-assembly/pom.xml
@@ -114,8 +114,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/core/pax-exam-link-assembly/src/main/resources/META-INF/links/jakarta.inject-api.link b/core/pax-exam-link-assembly/src/main/resources/META-INF/links/jakarta.inject-api.link
@@ -0,0 +1 @@
+classpath:jakarta.inject-api.jar
diff --git a/...m-link-assembly/src/main/resources/META-INF/links/org.apache.geronimo.specs.atinject.link b/...m-link-assembly/src/main/resources/META-INF/links/org.apache.geronimo.specs.atinject.link
diff --git a/core/pax-exam-link-mvn/src/main/resources/META-INF/links/jakarta.inject-api.link b/core/pax-exam-link-mvn/src/main/resources/META-INF/links/jakarta.inject-api.link
@@ -0,0 +1 @@
+mvn:jakarta.inject/jakarta.inject-api/${dependency.atinject.version}
diff --git a/...x-exam-link-mvn/src/main/resources/META-INF/links/org.apache.geronimo.specs.atinject.link b/...x-exam-link-mvn/src/main/resources/META-INF/links/org.apache.geronimo.specs.atinject.link
diff --git a/core/pax-exam-spi/src/main/java/org/ops4j/pax/exam/spi/PaxExamRuntime.java b/core/pax-exam-spi/src/main/java/org/ops4j/pax/exam/spi/PaxExamRuntime.java
@@ -217,7 +217,7 @@ private static Option[] defaultTestSystemOptions() {
                 START_LEVEL_SYSTEM_BUNDLES),
             url("link:classpath:META-INF/links/org.ops4j.pax.swissbox.tracker.link").startLevel(
                 START_LEVEL_SYSTEM_BUNDLES),
-            url("link:classpath:META-INF/links/org.apache.geronimo.specs.atinject.link")
+            url("link:classpath:META-INF/links/jakarta.inject-api.link")
                 .startLevel(START_LEVEL_SYSTEM_BUNDLES) };
     }
 

diff --git a/core/pax-exam/src/main/java/org/ops4j/pax/exam/Info.java b/core/pax-exam/src/main/java/org/ops4j/pax/exam/Info.java
@@ -169,7 +169,7 @@ public static String getPaxTinybundlesVersion() {
     }
 
     /**
-     * Discovers the Geronimo Atinject version. If version cannot be determined returns an empty string.
+     * Discovers the Jakarta (javax) Inject version. If version cannot be determined returns an empty string.
      * 
      * @return Pax Tinybundles version
      */

diff --git a/core/pax-exam/src/main/java/org/ops4j/pax/exam/options/WarProbeOption.java b/core/pax-exam/src/main/java/org/ops4j/pax/exam/options/WarProbeOption.java
@@ -40,7 +40,7 @@ public class WarProbeOption implements Option {
     public static final String[] DEFAULT_CLASS_PATH_EXCLUDES = { //
     ".cp", //
         "bndlib", //
-        "geronimo-atinject_", //
+        "jakarta.inject-api", //
         "geronimo-ejb_", //
         "geronimo-jcdi_", //
         "geronimo-jpa_", //

diff --git a/drivers/pax-exam-testng-servlet-bridge/pom.xml b/drivers/pax-exam-testng-servlet-bridge/pom.xml
@@ -38,9 +38,9 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
-            <version>2.0</version>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
@@ -18,7 +18,7 @@
         <bundle>mvn:org.ops4j.pax.exam/pax-exam/${project.version}</bundle>
         <bundle>mvn:org.ops4j.pax.exam/pax-exam-extender-service/${project.version}</bundle>
         <bundle>mvn:org.ops4j.pax.exam/pax-exam-container-rbc/${project.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.0</bundle>
+        <bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/1.0.5</bundle>
         <bundle>mvn:org.ops4j.pax.exam/pax-exam-inject/${project.version}</bundle>
     </feature>
     <feature name="exam" version="${project.version}">

diff --git a/itest/cdi/pom.xml b/itest/cdi/pom.xml
@@ -97,11 +97,6 @@
                     <artifactId>weld-se-core</artifactId>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
-                    <groupId>javax.enterprise</groupId>
-                    <artifactId>cdi-api</artifactId>
-                    <scope>test</scope>
-                </dependency>
             </dependencies>
         </profile>
 
@@ -132,23 +127,12 @@
                     <artifactId>openwebbeans-impl</artifactId>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
-                    <groupId>javax.enterprise</groupId>
-                    <artifactId>cdi-api</artifactId>
-                    <scope>test</scope>
-                </dependency>
                 <dependency>
                     <groupId>javax.servlet</groupId>
                     <artifactId>javax.servlet-api</artifactId>
                     <version>3.1.0</version>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
-                    <groupId>javax.annotation</groupId>
-                    <artifactId>javax.annotation-api</artifactId>
-                    <version>1.2</version>
-                    <scope>test</scope>
-                </dependency>
             </dependencies>
         </profile>
 

diff --git a/itest/cdi/src/it/regression-cdi-invalid/pom.xml b/itest/cdi/src/it/regression-cdi-invalid/pom.xml
@@ -54,14 +54,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/itest/cdi/src/it/regression-cdi-probe/pom.xml b/itest/cdi/src/it/regression-cdi-probe/pom.xml
@@ -40,14 +40,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/itest/cdi/src/it/regression-cdi/pom.xml b/itest/cdi/src/it/regression-cdi/pom.xml
@@ -54,8 +54,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/itest/cdi/src/it/regression-deltaspike/pom.xml b/itest/cdi/src/it/regression-deltaspike/pom.xml
@@ -57,14 +57,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/itest/javaee/src/it/regression-javaee-data/pom.xml b/itest/javaee/src/it/regression-javaee-data/pom.xml
@@ -124,14 +124,14 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>test</scope>
         </dependency>
 

diff --git a/itest/javaee/src/it/regression-javaee-moviefun/pom.xml b/itest/javaee/src/it/regression-javaee-moviefun/pom.xml
@@ -110,8 +110,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/itest/javaee/src/it/regression-javaee-userprobe/pom.xml b/itest/javaee/src/it/regression-javaee-userprobe/pom.xml
@@ -111,8 +111,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/itest/javaee/src/it/regression-javaee/pom.xml b/itest/javaee/src/it/regression-javaee/pom.xml
@@ -121,8 +121,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/itest/karaf/src/it/regression-karaf/pom.xml b/itest/karaf/src/it/regression-karaf/pom.xml
@@ -132,8 +132,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/itest/osgi/src/it/regression-maven-plugin/pom.xml b/itest/osgi/src/it/regression-maven-plugin/pom.xml
@@ -83,8 +83,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/itest/osgi/src/it/regression-multi/pom.xml b/itest/osgi/src/it/regression-multi/pom.xml
@@ -137,8 +137,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/itest/osgi/src/it/regression-plumbing/pom.xml b/itest/osgi/src/it/regression-plumbing/pom.xml
@@ -84,8 +84,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 

diff --git a/itest/web/pom.xml b/itest/web/pom.xml
@@ -170,8 +170,8 @@
                 </dependency>
 
                 <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+                    <groupId>jakarta.inject</groupId>
+                    <artifactId>jakarta.inject-api</artifactId>
                     <scope>test</scope>
                 </dependency>
 
@@ -193,8 +193,8 @@
 
             <dependencies>
                 <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                    <groupId>jakarta.inject</groupId>
+                    <artifactId>jakarta.inject-api</artifactId>
                 </dependency>
 
             </dependencies>

diff --git a/itest/web/src/it/regression-web-spring-userprobe/pom.xml b/itest/web/src/it/regression-web-spring-userprobe/pom.xml
@@ -21,8 +21,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>test</scope>
         </dependency>