feat(jakarta): Migrate remaining javax APIs to Jakarta namespace

assemblies/features/base/pom.xml

@@ -54,9 +54,9 @@
             <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${javax.annotation.version}</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta.annotation.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
@@ -192,8 +192,8 @@
                                     <outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>javax.annotation</groupId>
-                                    <artifactId>javax.annotation-api</artifactId>
+                                    <groupId>jakarta.annotation</groupId>
+                                    <artifactId>jakarta.annotation-api</artifactId>
                                     <outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>

assemblies/features/enterprise/pom.xml

@@ -191,8 +191,8 @@
 
         <!-- hibernate deps -->
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-osgi</artifactId>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
     </dependencies>

assemblies/features/enterprise/src/main/feature/feature.xml

@@ -20,21 +20,19 @@
 
     <!-- NB: this file is not the one really used. This file is used by the karaf-maven-plugin to define the start-level of bundles in the generated feature.xml -->
 
-    <!-- <repository>mvn:org.hibernate/hibernate-osgi/${hibernate.version}/xml/karaf</repository> -->
-
     <repository>mvn:org.ops4j.pax.jdbc/pax-jdbc-features/${pax.jdbc.version}/xml/features</repository>
-    <repository>mvn:org.ops4j.pax.jms/pax-jms-features/${pax.jms.version}/xml/features</repository>
     <repository>mvn:org.ops4j.pax.transx/pax-transx-features/${pax.transx.version}/xml/features</repository>
     <repository>mvn:org.apache.karaf.features/standard/${project.version}/xml/features</repository>
     <repository>mvn:org.apache.aries.jpa/jpa-features/${aries.jpa.version}/xml/features</repository>
     <repository>mvn:org.apache.openjpa/openjpa-features/${openjpa.version}/xml/features</repository>
 
-    <feature name="transaction-api" version="1.2.0">
-        <bundle dependency="true">mvn:javax.interceptor/javax.interceptor-api/1.2.2</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.2</bundle>
-        <bundle dependency="true">mvn:jakarta.el/jakarta.el-api/3.0.3</bundle>
-        <bundle dependency="true">mvn:javax.enterprise/cdi-api/1.2</bundle>
-        <bundle>mvn:javax.transaction/javax.transaction-api/1.2</bundle>
+    <feature name="transaction-api" version="2.0.0">
+        <bundle dependency="true">mvn:jakarta.interceptor/jakarta.interceptor-api/2.2.0</bundle>
+        <bundle dependency="true">mvn:jakarta.inject/jakarta.inject-api/2.0.1</bundle>
+        <bundle dependency="true">mvn:jakarta.el/jakarta.el-api/5.0.1</bundle>
+        <bundle dependency="true">mvn:jakarta.enterprise/jakarta.enterprise.lang-model/4.1.0</bundle>
+        <bundle dependency="true">mvn:jakarta.enterprise/jakarta.enterprise.cdi-api/4.1.0</bundle>
+        <bundle>mvn:jakarta.transaction/jakarta.transaction-api/2.0.1</bundle>
         <feature>pax-transx-tm-api</feature>
     </feature>
 
@@ -67,7 +65,7 @@ org.apache.geronimo.tm.howl.maxLogFiles = 2
 org.apache.geronimo.tm.howl.maxBlocksPerFile = 512
 org.apache.geronimo.tm.howl.bufferSize = 4
         </config>
-        <feature version="[1.1,2)">transaction-api</feature>
+        <feature version="[2.0,3)">transaction-api</feature>
         <feature>pax-transx-tm-geronimo</feature>
         <capability>
             transaction-manager;provider:=geronimo
@@ -100,7 +98,7 @@ com.arjuna.ats.arjuna.objectstore.objectStoreDir=${karaf.data}/narayana
 com.arjuna.ats.arjuna.objectstore.communicationStore.objectStoreDir=${karaf.data}/narayana
 com.arjuna.ats.arjuna.hornetqjournal.storeDir=${karaf.data}/narayana/hornetq
         </config>
-        <feature version="[1.1,2)">transaction-api</feature>
+        <feature version="[2.0,3)">transaction-api</feature>
         <feature>pax-transx-tm-narayana</feature>
         <capability>
             transaction-manager;provider:=narayana
@@ -131,7 +129,7 @@ com.arjuna.ats.arjuna.hornetqjournal.storeDir=${karaf.data}/narayana/hornetq
 
 com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
         </config>
-        <feature version="[1.1,2)">transaction-api</feature>
+        <feature version="[2.0,3)">transaction-api</feature>
         <feature>pax-transx-tm-atomikos</feature>
         <capability>
             transaction-manager;provider:=atomikos
@@ -163,37 +161,43 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
     </feature>
 
     <feature name="hibernate" description="Hibernate JPA engine support" version="${hibernate.version}">
-        <!-- hibernate-orm feature installs osgi.core and osgi.compendium bundle (it should not), causing huge refresh -->
-        <feature prerequisite="true">pax-url-wrap</feature>
+        <feature prerequisite="true">wrap</feature>
         <feature>transaction-api</feature>
         <feature>aries-blueprint</feature>
-        <bundle>mvn:org.jboss.logging/jboss-logging/3.3.2.Final</bundle>
-        <bundle>wrap:mvn:antlr/antlr/2.7.7</bundle>
-        <bundle>mvn:javax.persistence/javax.persistence-api/2.2</bundle>
-        <bundle>mvn:org.javassist/javassist/3.27.0-GA</bundle>
-        <bundle>mvn:net.bytebuddy/byte-buddy/1.12.9</bundle>
-        <bundle>mvn:org.jboss.spec.javax.transaction/jboss-transaction-api_1.2_spec/1.1.1.Final</bundle>
-        <bundle>mvn:org.jboss/jandex/2.4.2.Final</bundle>
+        <feature>jackson</feature>
+        <bundle>mvn:org.jboss.logging/jboss-logging/3.5.0.Final</bundle>
+        <bundle>mvn:org.antlr/antlr4-runtime/4.13.0</bundle>
+        <bundle>mvn:jakarta.persistence/jakarta.persistence-api/3.2.0</bundle>
+        <bundle>mvn:net.bytebuddy/byte-buddy/1.18.0</bundle>
+        <bundle>mvn:jakarta.transaction/jakarta.transaction-api/2.0.1</bundle>
+        <bundle>mvn:io.smallrye/jandex/3.2.0</bundle>
         <bundle>mvn:com.fasterxml/classmate/1.5.1</bundle>
-        <bundle>wrap:mvn:org.dom4j/dom4j/2.1.4</bundle>
-        <bundle>mvn:org.hibernate.common/hibernate-commons-annotations/5.1.2.Final</bundle>
-        <bundle>mvn:org.hibernate/hibernate-core/${hibernate.version}</bundle>
-        <bundle>mvn:javax.interceptor/javax.interceptor-api/1.2.2</bundle>
-        <bundle>mvn:org.hibernate/hibernate-osgi/${hibernate.version}</bundle>
+        <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson.version}</bundle>
+        <bundle>mvn:org.codehaus.woodstox/stax2-api/4.2.2</bundle>
+        <bundle>mvn:com.fasterxml.woodstox/woodstox-core/7.1.0</bundle>
+        <bundle>mvn:jakarta.json/jakarta.json-api/2.1.3</bundle>
+        <bundle>mvn:org.eclipse.parsson/parsson/1.1.7</bundle>
+        <bundle>mvn:jakarta.json.bind/jakarta.json.bind-api/3.0.1</bundle>
+        <bundle>mvn:org.eclipse/yasson/3.0.4</bundle>
+        <bundle>wrap:mvn:org.hibernate.models/hibernate-models/1.1.0</bundle>
+        <bundle>wrap:mvn:org.hibernate.orm/hibernate-core/${hibernate.version}$overwrite=merge&amp;Import-Package=oracle.jdbc.*;resolution:=optional,oracle.sql.*;resolution:=optional,org.postgresql.*;resolution:=optional,tools.jackson.*;resolution:=optional,*</bundle>
+        <bundle>mvn:jakarta.interceptor/jakarta.interceptor-api/2.2.0</bundle>
+        <bundle>mvn:jakarta.validation/jakarta.validation-api/3.1.0</bundle>
+        <bundle>mvn:jakarta.xml.bind/jakarta.xml.bind-api/4.0.2</bundle>
+        <bundle>mvn:jakarta.activation/jakarta.activation-api/2.1.3</bundle>
         <capability>
-            osgi.service;objectClass=javax.persistence.spi.PersistenceProvider;effective:=active;javax.persistence.provider=org.hibernate.jpa.HibernatePersistenceProvider
+            osgi.service;objectClass=jakarta.persistence.spi.PersistenceProvider;effective:=active;jakarta.persistence.provider=org.hibernate.jpa.HibernatePersistenceProvider
         </capability>
     </feature>
 
     <feature name="hibernate-envers" version="${hibernate.version}" description="Feature for easily adding Envers support to hibernate">
         <feature version="${hibernate.version}">hibernate</feature>
-        <bundle>mvn:org.jboss/jandex/2.2.3.Final</bundle>
-        <bundle>mvn:org.hibernate/hibernate-envers/${hibernate.version}</bundle>
+        <bundle>mvn:org.hibernate.orm/hibernate-envers/${hibernate.version}</bundle>
     </feature>
 
     <feature name="hibernate-validator" version="${hibernate.validator.version}">
         <bundle>mvn:org.hibernate.validator/hibernate-validator/${hibernate.validator.version}</bundle>
-        <bundle>mvn:jakarta.validation/jakarta.validation-api/3.0.0</bundle>
+        <bundle>mvn:jakarta.validation/jakarta.validation-api/3.1.0</bundle>
         <bundle>mvn:org.jboss.logging/jboss-logging/3.4.1.Final</bundle>
         <bundle>mvn:com.fasterxml/classmate/1.5.1</bundle>
         <bundle>mvn:jakarta.el/jakarta.el-api/4.0.0</bundle>
@@ -207,7 +211,7 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
         <feature>hibernate-validator</feature>
         <bundle>mvn:javax.money/money-api/1.0.1</bundle>
         <bundle>mvn:org.javamoney/moneta/1.1</bundle>
-        <bundle>mvn:javax.annotation/javax.annotation-api/1.3.2</bundle>
+        <bundle>mvn:jakarta.annotation/jakarta.annotation-api/2.1.1</bundle>
     </feature>
     <feature name="hibernate-validator-groovy" version="${hibernate.validator.version}">
         <feature>hibernate-validator</feature>
@@ -222,16 +226,14 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
     <feature name="eclipselink" description="Eclipselink JPA persistence engine support" version="${eclipselink.version}">
         <details>Eclipselink persistence engine.</details>
         <feature version="[2,3)">jpa</feature>
-        <bundle dependency="true">mvn:org.eclipse.persistence/javax.persistence/2.2.0</bundle>
+        <bundle dependency="true">mvn:jakarta.persistence/jakarta.persistence-api/3.1.0</bundle>
         <feature version="[2,3)">transaction</feature>
         <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.jpa/${eclipselink.version}</bundle>
         <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.core/${eclipselink.version}</bundle>
         <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.asm/9.7.0</bundle>
-        <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.antlr/${eclipselink.version}</bundle>
         <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.jpa.jpql/${eclipselink.version}</bundle>
-        <bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.eclipselink.adapter/${aries.jpa.version}</bundle>
         <capability>
-            osgi.service;objectClass=javax.persistence.spi.PersistenceProvider;effective:=active;javax.persistence.provider=org.eclipse.persistence.jpa.PersistenceProvider
+            osgi.service;objectClass=jakarta.persistence.spi.PersistenceProvider;effective:=active;jakarta.persistence.provider=org.eclipse.persistence.jpa.PersistenceProvider
         </capability>
     </feature>
 
@@ -258,14 +260,8 @@ com.atomikos.icatch.log_base_dir=${karaf.data}/atomikos
 
     <feature name="jms" description="JMS service and commands" version="${project.version}">
         <details>JMS support providing service, commands, and MBean.</details>
-        <feature>pax-jms-pool</feature>
-        <feature>pax-jms-config</feature>
-        <feature>pax-jms-pool-transx</feature>
         <feature>transaction</feature>
-        <bundle dependency="true">mvn:javax.jms/javax.jms-api/2.0.1</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.commons/commons-pool2/${commons-pool2.version}</bundle>
+        <bundle dependency="true">mvn:jakarta.jms/jakarta.jms-api/3.1.0</bundle>
         <bundle>mvn:org.apache.karaf.jms/org.apache.karaf.jms.core/${project.version}</bundle>
     </feature>
 

assemblies/features/integration/src/main/feature/feature.xml

@@ -24,7 +24,6 @@
     <repository>mvn:org.apache.karaf.features/enterprise/${project.version}/xml/features</repository>
 
     <repository>mvn:org.ops4j.pax.jdbc/pax-jdbc-features/${pax.jdbc.version}/xml/features</repository>
-    <repository>mvn:org.ops4j.pax.jms/pax-jms-features/${pax.jms.version}/xml/features</repository>
     <repository>mvn:org.ops4j.pax.transx/pax-transx-features/${pax.transx.version}/xml/features</repository>
     <repository>mvn:org.apache.karaf.features/standard/${project.version}/xml/features</repository>
     <repository>mvn:org.apache.aries.jpa/jpa-features/${aries.jpa.version}/xml/features</repository>

assemblies/features/spring/src/main/feature/feature.xml

@@ -64,7 +64,7 @@
 
     <feature name="spring-test" description="Spring 6.1.x Test support" version="${spring61.version}">
         <feature version="[${spring61.version},6.2)">spring</feature>
-        <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+        <bundle dependency="true">mvn:jakarta.websocket/jakarta.websocket-api/2.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.6</bundle>
         <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.2</bundle>
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring61.version}</bundle>
@@ -94,7 +94,7 @@
     </feature>
 
     <feature name="spring-websocket" description="Spring 6.1.x WebSocket support" version="${spring61.version}">
-        <bundle dependency="true">mvn:javax.websocket/javax.websocket-api/1.1</bundle>
+        <bundle dependency="true">mvn:jakarta.websocket/jakarta.websocket-api/2.1.1</bundle>
         <feature version="[${spring61.version},6.2)">spring-web</feature>
         <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring61.version}</bundle>
     </feature>
@@ -107,7 +107,7 @@
         <feature version="[6.1,6.2)">spring-jdbc</feature>
         <feature version="[6.1,6.2)">spring-tx</feature>
         <feature version="[6.1,6.2)">spring-web</feature>
-        <bundle dependency="true">mvn:javax.annotation/javax.annotation-api/${javax.annotation.version}</bundle>
+        <bundle dependency="true">mvn:jakarta.annotation/jakarta.annotation-api/${jakarta.annotation.version}</bundle>
         <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
         <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.annotations.version}</bundle>
         <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>

assemblies/features/standard/pom.xml

@@ -36,7 +36,7 @@
 
     <properties>
         <appendedResourcesDirectory>${basedir}/../../../../etc/appended-resources</appendedResourcesDirectory>
-        <javax.annotation.version>1.3</javax.annotation.version>
+        <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
         <geronimo.jaspic-spec.version>1.1</geronimo.jaspic-spec.version>
     </properties>
 

assemblies/features/standard/src/main/feature/feature.xml

@@ -102,7 +102,6 @@ wicket=mvn:org.ops4j.pax.wicket/features/RELEASE/xml/features
 hawtio=mvn:io.hawt/hawtio-karaf/RELEASE/xml/features
 
 pax-jdbc=mvn:org.ops4j.pax.jdbc/pax-jdbc-features/RELEASE/xml/features
-pax-jms=mvn:org.ops4j.pax.jms/pax-jms-features/RELEASE/xml/features
 pax-jpa=mvn:org.ops4j.pax.jpa/pax-jpa-features/RELEASE/xml/features
 pax-transx=mvn:org.ops4j.pax.transx/pax-transx-features/RELEASE/xml/features
 pax-keycloak=mvn:org.ops4j.pax.keycloak/pax-keycloak-features/RELEASE/xml/features
@@ -114,7 +113,7 @@ eclipsesource-jaxrs=mvn:com.eclipsesource.jaxrs/features/RELEASE/xml/features
 aries-cdi=mvn:org.apache.aries.cdi/aries-cdi-feature/RELEASE/xml/features
 aries-jpa=mvn:org.apache.aries.jpa/jpa-features/RELEASE/xml/features
 aries-rsa=mvn:org.apache.aries.rsa/rsa-features/RELEASE/xml/features
-hibernate=mvn:org.hibernate/hibernate-osgi/RELEASE/xml/karaf
+hibernate=mvn:org.apache.karaf.features/enterprise/RELEASE/xml/features
 ignite=mvn:org.apache.ignite/ignite-osgi-karaf/RELEASE/xml/features
 openjpa=mvn:org.apache.openjpa/openjpa-features/RELEASE/xml/features
 artemis=mvn:org.apache.activemq/artemis-features/RELEASE/xml/features

bom/pom.xml

@@ -228,9 +228,9 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.mail</groupId>
-                <artifactId>mail</artifactId>
-                <version>${javax.mail.version}</version>
+                <groupId>com.sun.mail</groupId>
+                <artifactId>jakarta.mail</artifactId>
+                <version>${jakarta.mail.version}</version>
             </dependency>
 
             <dependency>
@@ -1149,11 +1149,6 @@
                 <artifactId>pax-web-extender-whiteboard</artifactId>
                 <version>${pax.web.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.ops4j.pax.jms</groupId>
-                <artifactId>pax-jms-api</artifactId>
-                <version>${pax.jms.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.xbean</groupId>
                 <artifactId>xbean-bundleutils</artifactId>
@@ -1236,9 +1231,9 @@
                 <version>${junit.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-atinject_1.0_spec</artifactId>
-                <version>1.2</version>
+                <groupId>jakarta.inject</groupId>
+                <artifactId>jakarta.inject-api</artifactId>
+                <version>2.0.1</version>
             </dependency>
 
             <!-- specs -->

examples/karaf-cdi-example/karaf-cdi-example-consumer/pom.xml

@@ -44,14 +44,14 @@
             <version>1.0.1</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
-            <version>1.2</version>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>2.0.1</version>
         </dependency>
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>2.0.2</version>
+            <version>4.0.1</version>
         </dependency>
     </dependencies>
 

examples/karaf-cdi-example/karaf-cdi-example-consumer/src/main/java/org/apache/karaf/examples/cdi/consumer/MyConsumerBean.java

@@ -18,10 +18,10 @@
 import org.apache.karaf.examples.cdi.api.MyService;
 import org.osgi.service.cdi.annotations.Reference;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
 
 @ApplicationScoped
 public class MyConsumerBean {

examples/karaf-cdi-example/karaf-cdi-example-provider/pom.xml

@@ -44,14 +44,14 @@
             <version>1.0.1</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
-            <version>1.2</version>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>2.0.1</version>
         </dependency>
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>2.0.2</version>
+            <version>4.0.1</version>
         </dependency>
     </dependencies>