Migrate from Java EE 8 to Jakarta EE 9

apache · Sep 11, 2023 · 45b1c32 · 45b1c32
1 parent ae1cc5e
commit 45b1c32
Show file tree

Hide file tree

Showing 423 changed files with 3,276 additions and 3,104 deletions.
diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE b/distribution/proxy-native/src/main/release-docs/LICENSE
@@ -332,17 +332,16 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     jts-core 1.19.0: https://github.com/locationtech/jts, EDL 1.0
 
 ========================================================================
-CDDL licenses
+EDL licenses
 ========================================================================
 
-The following components are provided under the CDDL License. See project link for details.
+The following components are provided under the EDL License. See project link for details.
 The text of each license is also included at licenses/LICENSE-[project].txt.
 
-    javax.activation-api 1.2.0: https://github.com/javaee/javax.annotation, CDDL
-    jta 1.1: http://jta-spec.java.net, CDDL
-    jaxb-api 2.3.0: http://www.oracle.com, CDDL
-    jaxb-core 2.3.0: http://www.oracle.com, CDDL
-    jaxb-impl 2.3.0 http://www.oracle.com, CDDL
+    jakarta.activation-api 2.0.1: https://github.com/eclipse-ee4j/jaf, EDL 1.0
+    jakarta.xml.bind-api 3.0.1: https://github.com/eclipse-ee4j/jaxb-api, EDL 1.0
+    jaxb-core 3.0.2: https://eclipse-ee4j.github.io/jaxb-ri/, EDL 1.0
+    jaxb-impl 3.0.2 https://eclipse-ee4j.github.io/jaxb-ri/, EDL 1.0
 
 ========================================================================
 EPL licenses
@@ -351,6 +350,7 @@ EPL licenses
 The following components are provided under the EPL License. See project link for details.
 The text of each license is also included at licenses/LICENSE-[project].txt.
 
+    jakarta.transaction-api 2.0.1: https://projects.eclipse.org/projects/ee4j.jta, EPL 2.0
     logback-classic 1.2.11: https://github.com/qos-ch/logback, EPL 1.0
     logback-core 1.2.11: https://github.com/qos-ch/logback, EPL 1.0
     mchange-commons-java 0.2.15: https://github.com/swaldman/mchange-commons-java, EPL 1.0

diff --git a/distribution/proxy-native/src/main/release-docs/licenses/LICENSE-jakarta.annotation-api.txt b/distribution/proxy-native/src/main/release-docs/licenses/LICENSE-jakarta.annotation-api.txt
diff --git a/distribution/proxy-native/src/main/release-docs/licenses/LICENSE-jakarta.transaction-api.txt b/distribution/proxy-native/src/main/release-docs/licenses/LICENSE-jakarta.transaction-api.txt
diff --git a/distribution/proxy-native/src/main/release-docs/licenses/LICENSE-jta.txt b/distribution/proxy-native/src/main/release-docs/licenses/LICENSE-jta.txt
diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE
@@ -332,17 +332,16 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     jts-core 1.19.0: https://github.com/locationtech/jts, EDL 1.0
 
 ========================================================================
-CDDL licenses
+EDL licenses
 ========================================================================
 
-The following components are provided under the CDDL License. See project link for details.
+The following components are provided under the EDL License. See project link for details.
 The text of each license is also included at licenses/LICENSE-[project].txt.
 
-    javax.activation-api 1.2.0: https://github.com/javaee/javax.annotation, CDDL
-    jta 1.1: http://jta-spec.java.net, CDDL
-    jaxb-api 2.3.0: http://www.oracle.com, CDDL
-    jaxb-core 2.3.0: http://www.oracle.com, CDDL
-    jaxb-impl 2.3.0 http://www.oracle.com, CDDL
+    jakarta.activation-api 2.0.1: https://github.com/eclipse-ee4j/jaf, EDL 1.0
+    jakarta.xml.bind-api 3.0.1: https://github.com/eclipse-ee4j/jaxb-api, EDL 1.0
+    jaxb-core 3.0.2: https://eclipse-ee4j.github.io/jaxb-ri/, EDL 1.0
+    jaxb-impl 3.0.2 https://eclipse-ee4j.github.io/jaxb-ri/, EDL 1.0
 
 ========================================================================
 EPL licenses
@@ -351,6 +350,7 @@ EPL licenses
 The following components are provided under the EPL License. See project link for details.
 The text of each license is also included at licenses/LICENSE-[project].txt.
 
+    jakarta.transaction-api 2.0.1: https://projects.eclipse.org/projects/ee4j.jta, EPL 2.0
     logback-classic 1.2.11: https://github.com/qos-ch/logback, EPL 1.0
     logback-core 1.2.11: https://github.com/qos-ch/logback, EPL 1.0
     mchange-commons-java 0.2.15: https://github.com/swaldman/mchange-commons-java, EPL 1.0

diff --git a/distribution/proxy/src/main/release-docs/licenses/LICENSE-jakarta.annotation-api.txt b/distribution/proxy/src/main/release-docs/licenses/LICENSE-jakarta.annotation-api.txt
diff --git a/distribution/proxy/src/main/release-docs/licenses/LICENSE-jakarta.transaction-api.txt b/distribution/proxy/src/main/release-docs/licenses/LICENSE-jakarta.transaction-api.txt
diff --git a/distribution/proxy/src/main/release-docs/licenses/LICENSE-javax.annotation-api.txt b/distribution/proxy/src/main/release-docs/licenses/LICENSE-javax.annotation-api.txt
diff --git a/distribution/proxy/src/main/release-docs/licenses/LICENSE-jta.txt b/distribution/proxy/src/main/release-docs/licenses/LICENSE-jta.txt
diff --git a/.../content/user-manual/shardingsphere-jdbc/special-api/transaction/narayana.cn.md b/.../content/user-manual/shardingsphere-jdbc/special-api/transaction/narayana.cn.md
@@ -13,9 +13,8 @@ Apache ShardingSphere 提供 XA 事务，集成了 Narayana 的实现。
 
 ```xml
 <properties>
-    <narayana.version>5.12.4.Final</narayana.version>
-    <jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
-    <jboss-logging.version>3.2.1.Final</jboss-logging.version>
+    <narayana.version>5.12.7.Final</narayana.version>
+    <jboss-logging.version>3.4.3.Final</jboss-logging.version>
 </properties>
 
 <dependency>
@@ -38,23 +37,18 @@ Apache ShardingSphere 提供 XA 事务，集成了 Narayana 的实现。
 </dependency>
 <dependency>
       <groupId>org.jboss.narayana.jta</groupId>
-      <artifactId>jta</artifactId>
+      <artifactId>narayana-jta-jakarta</artifactId>
       <version>${narayana.version}</version>
 </dependency>
 <dependency>
-       <groupId>org.jboss.narayana.jts</groupId>
-       <artifactId>narayana-jts-integration</artifactId>
-       <version>${narayana.version}</version>
-</dependency>
-<dependency>
-       <groupId>org.jboss</groupId>
-       <artifactId>jboss-transaction-spi</artifactId>
-       <version>${jboss-transaction-spi.version}</version>
+      <groupId>org.jboss.narayana.jts</groupId>
+      <artifactId>narayana-jts-integration-jakarta</artifactId>
+      <version>${narayana.version}</version>
 </dependency>
 <dependency>
-       <groupId>org.jboss.logging</groupId>
-       <artifactId>jboss-logging</artifactId>
-       <version>${jboss-logging.version}</version>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging</artifactId>
+      <version>${jboss-logging.version}</version>
 </dependency>
 ```
 ## 操作步骤

diff --git a/.../content/user-manual/shardingsphere-jdbc/special-api/transaction/narayana.en.md b/.../content/user-manual/shardingsphere-jdbc/special-api/transaction/narayana.en.md
@@ -13,9 +13,8 @@ Introducing Maven dependency
 
 ```xml
 <properties>
-    <narayana.version>5.12.4.Final</narayana.version>
-    <jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
-    <jboss-logging.version>3.2.1.Final</jboss-logging.version>
+    <narayana.version>5.12.7.Final</narayana.version>
+    <jboss-logging.version>3.4.3.Final</jboss-logging.version>
 </properties>
 
 <dependency>
@@ -38,23 +37,18 @@ Introducing Maven dependency
 </dependency>
 <dependency>
       <groupId>org.jboss.narayana.jta</groupId>
-      <artifactId>jta</artifactId>
+      <artifactId>narayana-jta-jakarta</artifactId>
       <version>${narayana.version}</version>
 </dependency>
 <dependency>
-       <groupId>org.jboss.narayana.jts</groupId>
-       <artifactId>narayana-jts-integration</artifactId>
-       <version>${narayana.version}</version>
-</dependency>
-<dependency>
-       <groupId>org.jboss</groupId>
-       <artifactId>jboss-transaction-spi</artifactId>
-       <version>${jboss-transaction-spi.version}</version>
+      <groupId>org.jboss.narayana.jts</groupId>
+      <artifactId>narayana-jts-integration-jakarta</artifactId>
+      <version>${narayana.version}</version>
 </dependency>
 <dependency>
-       <groupId>org.jboss.logging</groupId>
-       <artifactId>jboss-logging</artifactId>
-       <version>${jboss-logging.version}</version>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging</artifactId>
+      <version>${jboss-logging.version}</version>
 </dependency>
 ```
 ## Procedure

diff --git a/...hardingsphere-proxy/startup/dependencies-download/add_Narayana_dependency.cn.md b/...hardingsphere-proxy/startup/dependencies-download/add_Narayana_dependency.cn.md
@@ -9,18 +9,14 @@ weight = 2
 
 ### jar 文件下载地址
 
-- [arjuna-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/arjunacore/arjuna/5.12.4.Final/arjuna-5.12.4.Final.jar)
-- [common-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/common/5.12.4.Final/common-5.12.4.Final.jar)
-- [javax.activation-api-1.2.0.jar](https://repo1.maven.org/maven2/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar)
-- [jaxb-api-2.3.0.jar](https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar)
-- [jaxb-core-2.3.0.jar](https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-core/2.3.0/jaxb-core-2.3.0.jar)
-- [jaxb-impl-2.3.0.jar](https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/2.3.0/jaxb-impl-2.3.0.jar)
-- [jboss-connector-api_1.7_spec-1.0.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/spec/javax/resource/jboss-connector-api_1.7_spec/1.0.0.Final/jboss-connector-api_1.7_spec-1.0.0.Final.jar)
-- [jboss-logging-3.2.1.Final.jar](https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.2.1.Final/jboss-logging-3.2.1.Final.jar)
-- [jboss-transaction-api_1.2_spec-1.0.0.Alpha3.jar](https://repo1.maven.org/maven2/org/jboss/spec/javax/transaction/jboss-transaction-api_1.2_spec/1.0.0.Alpha3/jboss-transaction-api_1.2_spec-1.0.0.Alpha3.jar)
-- [jboss-transaction-spi-7.6.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/jboss-transaction-spi/7.6.0.Final/jboss-transaction-spi-7.6.0.Final.jar)
-- [jta-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jta/jta/5.12.4.Final/jta-5.12.4.Final.jar)
-- [narayana-jts-integration-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jts/narayana-jts-integration/5.12.4.Final/narayana-jts-integration-5.12.4.Final.jar)
+- [jakarta.activation-api-2.0.1.jar](https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api/2.0.1/jakarta.activation-api-2.0.1.jar)
+- [jakarta.xml.bind-api-3.0.1.jar](https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/3.0.1/jakarta.xml.bind-api-3.0.1.jar)
+- [jaxb-core-3.0.2.jar](https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-core/3.0.2/jaxb-core-3.0.2.jar)
+- [jaxb-impl-3.0.2.jar](https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/3.0.2/jaxb-impl-3.0.2.jar)
+- [jboss-logging-3.4.3.Final.jar](https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final.jar)
+- [jboss-transaction-spi-jakarta-7.6.1.Final.jar](https://repo1.maven.org/maven2/org/jboss/jboss-transaction-spi-jakarta/7.6.1.Final/jboss-transaction-spi-jakarta-7.6.1.Final.jar)
+- [narayana-jta-jakarta-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jta/narayana-jta-jakarta/5.12.7.Final/narayana-jta-jakarta-5.12.7.Final.jar)
+- [narayana-jts-integration-jakarta-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jts/narayana-jts-integration-jakarta/5.12.7.Final/narayana-jts-integration-jakarta-5.12.7.Final.jar)
 - [shardingsphere-transaction-xa-narayana.jar](https://mvnrepository.com/artifact/org.apache.shardingsphere/shardingsphere-transaction-xa-narayana)
 
 请根据 `proxy` 版本下载对应 `shardingsphere-transaction-xa-narayana.jar` 文件。
diff --git a/...hardingsphere-proxy/startup/dependencies-download/add_Narayana_dependency.en.md b/...hardingsphere-proxy/startup/dependencies-download/add_Narayana_dependency.en.md
@@ -9,18 +9,14 @@ Adding Narayana dependencies requires downloading the following jar files and ad
 
 ### jar file downloads
 
-- [arjuna-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/arjunacore/arjuna/5.12.4.Final/arjuna-5.12.4.Final.jar)
-- [common-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/common/5.12.4.Final/common-5.12.4.Final.jar)
-- [javax.activation-api-1.2.0.jar](https://repo1.maven.org/maven2/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.jar)
-- [jaxb-api-2.3.0.jar](https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar)
-- [jaxb-core-2.3.0.jar](https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-core/2.3.0/jaxb-core-2.3.0.jar)
-- [jaxb-impl-2.3.0.jar](https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/2.3.0/jaxb-impl-2.3.0.jar)
-- [jboss-connector-api_1.7_spec-1.0.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/spec/javax/resource/jboss-connector-api_1.7_spec/1.0.0.Final/jboss-connector-api_1.7_spec-1.0.0.Final.jar)
-- [jboss-logging-3.2.1.Final.jar](https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.2.1.Final/jboss-logging-3.2.1.Final.jar)
-- [jboss-transaction-api_1.2_spec-1.0.0.Alpha3.jar](https://repo1.maven.org/maven2/org/jboss/spec/javax/transaction/jboss-transaction-api_1.2_spec/1.0.0.Alpha3/jboss-transaction-api_1.2_spec-1.0.0.Alpha3.jar)
-- [jboss-transaction-spi-7.6.0.Final.jar](https://repo1.maven.org/maven2/org/jboss/jboss-transaction-spi/7.6.0.Final/jboss-transaction-spi-7.6.0.Final.jar)
-- [jta-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jta/jta/5.12.4.Final/jta-5.12.4.Final.jar)
-- [narayana-jts-integration-5.12.4.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jts/narayana-jts-integration/5.12.4.Final/narayana-jts-integration-5.12.4.Final.jar)
+- [jakarta.activation-api-2.0.1.jar](https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api/2.0.1/jakarta.activation-api-2.0.1.jar)
+- [jakarta.xml.bind-api-3.0.1.jar](https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/3.0.1/jakarta.xml.bind-api-3.0.1.jar)
+- [jaxb-core-3.0.2.jar](https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-core/3.0.2/jaxb-core-3.0.2.jar)
+- [jaxb-impl-3.0.2.jar](https://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/3.0.2/jaxb-impl-3.0.2.jar)
+- [jboss-logging-3.4.3.Final.jar](https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final.jar)
+- [jboss-transaction-spi-jakarta-7.6.1.Final.jar](https://repo1.maven.org/maven2/org/jboss/jboss-transaction-spi-jakarta/7.6.1.Final/jboss-transaction-spi-jakarta-7.6.1.Final.jar)
+- [narayana-jta-jakarta-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jta/narayana-jta-jakarta/5.12.7.Final/narayana-jta-jakarta-5.12.7.Final.jar)
+- [narayana-jts-integration-jakarta-5.12.7.Final.jar](https://repo1.maven.org/maven2/org/jboss/narayana/jts/narayana-jts-integration-jakarta/5.12.7.Final/narayana-jts-integration-jakarta-5.12.7.Final.jar)
 - [shardingsphere-transaction-xa-narayana.jar](https://mvnrepository.com/artifact/org.apache.shardingsphere/shardingsphere-transaction-xa-narayana)
 
 Please download the corresponding `shardingsphere-transaction-xa-narayana.jar` file according to the `proxy` version.
diff --git a/kernel/sql-federation/core/pom.xml b/kernel/sql-federation/core/pom.xml
@@ -125,8 +125,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -140,8 +140,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>javax.activation-api</artifactId>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...test/java/org/apache/shardingsphere/sqlfederation/compiler/it/SQLStatementCompilerIT.java b/...test/java/org/apache/shardingsphere/sqlfederation/compiler/it/SQLStatementCompilerIT.java
@@ -45,7 +45,7 @@
 import org.junit.jupiter.params.provider.ArgumentsProvider;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import java.io.IOException;
 import java.sql.Types;
 import java.util.Arrays;

diff --git a/...tion/core/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/TestCase.java b/...tion/core/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/TestCase.java
@@ -20,10 +20,10 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
 
 /**
  * JAXB definition of test case.

diff --git a/.../src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/TestCaseAssertion.java b/.../src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/TestCaseAssertion.java
@@ -20,9 +20,9 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
 
 /**
  * JAXB definition of test case assertion.

diff --git a/...ion/core/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/TestCases.java b/...ion/core/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/TestCases.java
@@ -19,8 +19,8 @@
 
 import lombok.Getter;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import java.util.Collection;
 import java.util.LinkedList;
 

diff --git a/...re/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/TestCasesLoader.java b/...re/src/test/java/org/apache/shardingsphere/sqlfederation/compiler/it/TestCasesLoader.java
@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.sqlfederation.compiler.it;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.net.URL;

diff --git a/...ain/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java b/...ain/java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManager.java
@@ -17,6 +17,13 @@
 
 package org.apache.shardingsphere.transaction.xa;
 
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.TransactionManager;
 import lombok.SneakyThrows;
 import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
@@ -32,13 +39,6 @@
 import org.apache.shardingsphere.transaction.xa.spi.XATransactionManagerProvider;
 
 import javax.sql.DataSource;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.NotSupportedException;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;

diff --git a/...java/org/apache/shardingsphere/transaction/xa/jta/datasource/XATransactionDataSource.java b/...java/org/apache/shardingsphere/transaction/xa/jta/datasource/XATransactionDataSource.java
@@ -17,8 +17,12 @@
 
 package org.apache.shardingsphere.transaction.xa.jta.datasource;
 
-import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Synchronization;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
 import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.util.reflection.ReflectionUtils;
 import org.apache.shardingsphere.transaction.xa.jta.connection.XAConnectionWrapper;
 import org.apache.shardingsphere.transaction.xa.jta.datasource.properties.XADataSourceDefinition;
@@ -29,10 +33,6 @@
 import javax.sql.DataSource;
 import javax.sql.XAConnection;
 import javax.sql.XADataSource;
-import javax.transaction.RollbackException;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Arrays;

diff --git a/...java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManagerTest.java b/...java/org/apache/shardingsphere/transaction/xa/XAShardingSphereTransactionManagerTest.java
@@ -19,6 +19,7 @@
 
 import com.atomikos.jdbc.AtomikosDataSourceBean;
 import com.zaxxer.hikari.HikariDataSource;
+import jakarta.transaction.Transaction;
 import lombok.SneakyThrows;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
@@ -31,7 +32,6 @@
 import org.mockito.internal.configuration.plugins.Plugins;
 
 import javax.sql.DataSource;
-import javax.transaction.Transaction;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.LinkedHashMap;

diff --git a/...org/apache/shardingsphere/transaction/xa/fixture/FixtureXATransactionManagerProvider.java b/...org/apache/shardingsphere/transaction/xa/fixture/FixtureXATransactionManagerProvider.java
@@ -17,11 +17,11 @@
 
 package org.apache.shardingsphere.transaction.xa.fixture;
 
+import jakarta.transaction.TransactionManager;
 import org.apache.shardingsphere.transaction.xa.spi.SingleXAResource;
 import org.apache.shardingsphere.transaction.xa.spi.XATransactionManagerProvider;
 
 import javax.sql.XADataSource;
-import javax.transaction.TransactionManager;
 
 public final class FixtureXATransactionManagerProvider implements XATransactionManagerProvider {
 

diff --git a/.../org/apache/shardingsphere/transaction/xa/jta/datasource/XATransactionDataSourceTest.java b/.../org/apache/shardingsphere/transaction/xa/jta/datasource/XATransactionDataSourceTest.java
@@ -19,6 +19,11 @@
 
 import com.atomikos.jdbc.AtomikosDataSourceBean;
 import com.zaxxer.hikari.HikariDataSource;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Synchronization;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.transaction.xa.fixture.DataSourceUtils;
@@ -34,11 +39,6 @@
 
 import javax.sql.DataSource;
 import javax.sql.XADataSource;
-import javax.transaction.RollbackException;
-import javax.transaction.Synchronization;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
 import java.sql.Connection;
 import java.sql.SQLException;