Skip to content

Commit 143e68f

Browse files
AXIS2-6051 Use jakarta.transaction-api instead of javax.transaction-api
1 parent 7838164 commit 143e68f

File tree

9 files changed

+17
-17
lines changed

9 files changed

+17
-17
lines changed

modules/kernel/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
6363
</dependency>
6464
<dependency>
65-
<groupId>javax.transaction</groupId>
66-
<artifactId>javax.transaction-api</artifactId>
65+
<groupId>jakarta.transaction</groupId>
66+
<artifactId>jakarta.transaction-api</artifactId>
6767
</dependency>
6868
<dependency>
6969
<groupId>org.apache.commons</groupId>

modules/kernel/src/org/apache/axis2/transaction/Axis2UserTransaction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.apache.axis2.transaction;
2121

22-
import javax.transaction.*;
22+
import jakarta.transaction.*;
2323

2424

2525
public class Axis2UserTransaction implements UserTransaction {

modules/kernel/src/org/apache/axis2/transaction/TransactionConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import javax.naming.Context;
3030
import javax.naming.InitialContext;
3131
import javax.naming.NamingException;
32-
import javax.transaction.TransactionManager;
33-
import javax.transaction.UserTransaction;
32+
import jakarta.transaction.TransactionManager;
33+
import jakarta.transaction.UserTransaction;
3434
import java.util.Hashtable;
3535
import java.util.Iterator;
3636

modules/transport/jms/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
</dependency>
7777

7878
<dependency>
79-
<groupId>javax.transaction</groupId>
80-
<artifactId>javax.transaction-api</artifactId>
79+
<groupId>jakarta.transaction</groupId>
80+
<artifactId>jakarta.transaction-api</artifactId>
8181
</dependency>
8282

8383
<dependency>

modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import jakarta.jms.JMSException;
3030
import jakarta.jms.Message;
3131
import jakarta.jms.TextMessage;
32-
import javax.transaction.UserTransaction;
32+
import jakarta.transaction.UserTransaction;
3333

3434
/**
3535
* This is the JMS message receiver which is invoked when a message is received. This processes

modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageSender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import jakarta.jms.QueueSender;
3434
import jakarta.jms.Session;
3535
import jakarta.jms.TopicPublisher;
36-
import javax.transaction.UserTransaction;
36+
import jakarta.transaction.UserTransaction;
3737

3838
/**
3939
* Performs the actual sending of a JMS message, and the subsequent committing of a JTA transaction

modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
import javax.naming.InitialContext;
3737
import javax.naming.Context;
3838
import javax.naming.NamingException;
39-
import javax.transaction.UserTransaction;
40-
import javax.transaction.NotSupportedException;
41-
import javax.transaction.SystemException;
42-
import javax.transaction.Status;
39+
import jakarta.transaction.UserTransaction;
40+
import jakarta.transaction.NotSupportedException;
41+
import jakarta.transaction.SystemException;
42+
import jakarta.transaction.Status;
4343

4444
import java.util.ArrayList;
4545
import java.util.Collections;

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -969,9 +969,9 @@
969969
<version>3.17.0</version>
970970
</dependency>
971971
<dependency>
972-
<groupId>javax.transaction</groupId>
973-
<artifactId>javax.transaction-api</artifactId>
974-
<version>1.3</version>
972+
<groupId>jakarta.transaction</groupId>
973+
<artifactId>jakarta.transaction-api</artifactId>
974+
<version>2.0.1</version>
975975
</dependency>
976976
<dependency>
977977
<groupId>org.osgi</groupId>

src/site/markdown/release-notes/2.0.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Apache Axis2 2.0.0 Release Notes
22
--------------------------------
33

44
This release marks the transition to jakarta that has been tested with Tomcat 11
5-
and Wildfly 32 and above, and is expected to support EE 10 and Spring 6 / Spring Boot 3.
5+
and Wildfly 32, and is expected to support EE 10 and Spring 6 / Spring Boot 3.
66

77
The Axis2 project transition to jakarta depends partly on Axiom, which has also been updated to 2.0.0.
88

0 commit comments

Comments
 (0)