Migrate aries transaction to Jakarta EE APIs

.github/workflows/transaction.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8 ]
+        java: [ 17 ]
         os: [ ubuntu-latest ]
     name: JDK${{ matrix.java }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}

transaction/transaction-blueprint/pom.xml

@@ -24,14 +24,14 @@
     <parent>
         <groupId>org.apache.aries</groupId>
         <artifactId>parent</artifactId>
-        <version>2.1.1</version>
+        <version>3.0.0</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.aries.transaction</groupId>
     <artifactId>org.apache.aries.transaction.blueprint</artifactId>
     <packaging>bundle</packaging>
-    <version>2.3.2-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <name>Apache Aries Transaction Blueprint</name>
 
     <scm>
@@ -52,12 +52,12 @@
         <lastReleaseVersion>1.1.0</lastReleaseVersion>
 
         <easymock.version>5.6.0</easymock.version>
-        <javax.transaction-api.version>1.2</javax.transaction-api.version>
+        <jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
         <junit.version>4.13.2</junit.version>
         <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
         <org.apache.aries.blueprint.core.version>1.0.0</org.apache.aries.blueprint.core.version>
-        <osgi.cmpn.version>4.3.1</osgi.cmpn.version>
-        <osgi.core.version>4.3.1</osgi.core.version>
+        <osgi.cmpn.version>7.0.0</osgi.cmpn.version>
+        <osgi.core.version>8.0.0</osgi.core.version>
     </properties>
 
     <dependencies>
@@ -85,9 +85,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.transaction</groupId>
-            <artifactId>javax.transaction-api</artifactId>
-            <version>${javax.transaction-api.version}</version>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
+            <version>${jakarta.transaction-api.version}</version>
             <scope>provided</scope>
         </dependency>
 

transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/ComponentTxData.java

@@ -23,8 +23,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.transaction.Transactional;
-import javax.transaction.Transactional.TxType;
+import jakarta.transaction.Transactional;
+import jakarta.transaction.Transactional.TxType;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionAttribute.java

@@ -18,16 +18,16 @@
  */
 package org.apache.aries.transaction;
 
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.InvalidTransactionException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.Transactional.TxType;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.InvalidTransactionException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.Transactional.TxType;
 
 /**
  * TODO This is copied from aries transaction. We could share this code

transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionToken.java

@@ -18,7 +18,7 @@
  */
 package org.apache.aries.transaction;
 
-import javax.transaction.Transaction;
+import jakarta.transaction.Transaction;
 
 import org.osgi.service.coordinator.Coordination;
 

transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TransactionalAnnotationAttributes.java

@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.transaction.Transactional.TxType;
+import jakarta.transaction.Transactional.TxType;
 
 public class TransactionalAnnotationAttributes {
 

transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/TxInterceptorImpl.java

@@ -20,10 +20,10 @@
 
 import java.lang.reflect.Method;
 import java.util.Optional;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Status;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
 
 import org.apache.aries.blueprint.Interceptor;
 import org.osgi.service.blueprint.reflect.ComponentMetadata;
@@ -75,7 +75,7 @@ public Object preCall(ComponentMetadata cm, Method m, Object... parameters) thro
         if (requiresNewCoordination) {
             String coordName = "txInterceptor." + m.getDeclaringClass().getName() + "." + m.getName();
             Coordination coord = coordinator.begin(coordName , 0);
-            // @javax.transaction.Transactional is only part of 1.2 and even if it's about time that all previous
+            // @jakarta.transaction.Transactional is only part of 1.2 and even if it's about time that all previous
             // JTA versions should be forgotten, we can't rely on it...
             coord.getVariables().put(Transaction.class, txAttribute.name());
             token.setCoordination(coord);
@@ -139,7 +139,7 @@ public void postCallWithReturn(ComponentMetadata cm, Method m, Object returnType
         } catch (Exception e) {
             // We are throwing an exception, so we don't error it out
             LOGGER.debug("Exception while completing transaction.", e);
-            RollbackException rbe = new javax.transaction.RollbackException();
+            RollbackException rbe = new RollbackException();
             rbe.addSuppressed(e);
             throw rbe;
         }

transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/AnnotationProcessor.java

@@ -18,7 +18,7 @@
  */
 package org.apache.aries.transaction.parsing;
 
-import javax.transaction.TransactionManager;
+import jakarta.transaction.TransactionManager;
 
 import org.apache.aries.blueprint.BeanProcessor;
 import org.apache.aries.blueprint.ComponentDefinitionRegistry;

transaction/transaction-blueprint/src/main/java/org/apache/aries/transaction/parsing/TxNamespaceHandler.java

@@ -23,7 +23,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import javax.transaction.TransactionManager;
+import jakarta.transaction.TransactionManager;
 
 import org.apache.aries.blueprint.ComponentDefinitionRegistry;
 import org.apache.aries.blueprint.NamespaceHandler;

transaction/transaction-blueprint/src/main/resources/OSGI-INF/blueprint/transaction.xml

@@ -31,7 +31,7 @@
     <property name="coordinator" ref="coordinator" />
   </bean>
 
-  <reference id="tm" interface="javax.transaction.TransactionManager"/>
+  <reference id="tm" interface="jakarta.transaction.TransactionManager"/>
   <reference id="coordinator" interface="org.osgi.service.coordinator.Coordinator"/>
 
 </blueprint>

transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/BaseNameSpaceHandlerSetup.java

@@ -22,7 +22,7 @@
 import java.net.URL;
 import java.util.Arrays;
 import java.util.Set;
-import javax.transaction.TransactionManager;
+import jakarta.transaction.TransactionManager;
 
 import org.apache.aries.blueprint.ComponentDefinitionRegistry;
 import org.apache.aries.blueprint.parser.ComponentDefinitionRegistryImpl;

transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/ComponentTxDataTest.java

@@ -26,7 +26,7 @@
 import java.sql.BatchUpdateException;
 import java.sql.SQLDataException;
 import java.util.List;
-import javax.transaction.Transactional.TxType;
+import jakarta.transaction.Transactional.TxType;
 
 import org.apache.aries.transaction.pojo.AnnotatedPojo;
 import org.apache.aries.transaction.pojo.BadlyAnnotatedPojo1;

transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/InterceptorTest.java

@@ -22,8 +22,8 @@
 import static org.easymock.EasyMock.replay;
 
 import java.io.IOException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
 
 import org.apache.aries.transaction.pojo.AnnotatedPojo;
 import org.easymock.EasyMock;

transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/TranStrategyTest.java

@@ -29,15 +29,15 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.InvalidTransactionException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.InvalidTransactionException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
 
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;

transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/pojo/AnnotatedPojo.java

@@ -18,8 +18,8 @@
  */
 package org.apache.aries.transaction.pojo;
 
-import javax.transaction.Transactional;
-import javax.transaction.Transactional.TxType;
+import jakarta.transaction.Transactional;
+import jakarta.transaction.Transactional.TxType;
 
 @Transactional(TxType.REQUIRED)
 public class AnnotatedPojo {

transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/pojo/BadlyAnnotatedPojo1.java

@@ -18,7 +18,7 @@
  */
 package org.apache.aries.transaction.pojo;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 
 public class BadlyAnnotatedPojo1 {

transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/pojo/BadlyAnnotatedPojo2.java

@@ -18,7 +18,7 @@
  */
 package org.apache.aries.transaction.pojo;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 public class BadlyAnnotatedPojo2 {
 

transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/pojo/BaseClass.java

@@ -18,8 +18,8 @@
  */
 package org.apache.aries.transaction.pojo;
 
-import javax.transaction.Transactional;
-import javax.transaction.Transactional.TxType;
+import jakarta.transaction.Transactional;
+import jakarta.transaction.Transactional.TxType;
 
 @Transactional(value=TxType.REQUIRED)
 public class BaseClass {

transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/pojo/ExtendedPojo.java

@@ -18,8 +18,8 @@
  */
 package org.apache.aries.transaction.pojo;
 
-import javax.transaction.Transactional;
-import javax.transaction.Transactional.TxType;
+import jakarta.transaction.Transactional;
+import jakarta.transaction.Transactional.TxType;
 
 public class ExtendedPojo extends BaseClass {
 

transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/pojo/ExtendedPojo2.java

@@ -18,8 +18,8 @@
  */
 package org.apache.aries.transaction.pojo;
 
-import javax.transaction.Transactional;
-import javax.transaction.Transactional.TxType;
+import jakarta.transaction.Transactional;
+import jakarta.transaction.Transactional.TxType;
 
 @Transactional(value=TxType.MANDATORY)
 public class ExtendedPojo2 extends BaseClass {

transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/pojo/ExtendedPojo3.java

@@ -18,8 +18,8 @@
  */
 package org.apache.aries.transaction.pojo;
 
-import javax.transaction.Transactional;
-import javax.transaction.Transactional.TxType;
+import jakarta.transaction.Transactional;
+import jakarta.transaction.Transactional.TxType;
 
 @Transactional(value=TxType.MANDATORY)
 public class ExtendedPojo3 extends BaseClass {

transaction/transaction-blueprint/src/test/java/org/apache/aries/transaction/pojo/OnRollbackPojo.java

@@ -20,7 +20,7 @@
 
 import java.sql.BatchUpdateException;
 import java.sql.SQLDataException;
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 @Transactional(rollbackOn = SQLDataException.class)
 public class OnRollbackPojo {