diff --git a/pom.xml b/pom.xml index 9993e4df..f02664b2 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ Guice 7.0.0 2.1.1 - 3.2.6 + 4.0.1 2.0.1 com.alibaba.druid.pool.*;resolution:=optional,com.zaxxer.hikari.*;resolution:=optional,com.mchange.v2.c3p0.*;resolution:=optional,org.apache.commons.dbcp2.*;resolution:=optional,javax.transaction.*;resolution:=optional UnreadFields diff --git a/src/main/java/org/mybatis/guice/transactional/TxTransactionalMethodInterceptor.java b/src/main/java/org/mybatis/guice/transactional/TxTransactionalMethodInterceptor.java index 4852f72f..85862ddb 100644 --- a/src/main/java/org/mybatis/guice/transactional/TxTransactionalMethodInterceptor.java +++ b/src/main/java/org/mybatis/guice/transactional/TxTransactionalMethodInterceptor.java @@ -17,6 +17,7 @@ import static java.lang.String.format; +import jakarta.ejb.ApplicationException; import jakarta.inject.Inject; import jakarta.inject.Provider; import jakarta.transaction.TransactionManager; @@ -24,7 +25,6 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; -import javax.ejb.ApplicationException; import javax.transaction.xa.XAResource; import org.aopalliance.intercept.MethodInterceptor; @@ -53,7 +53,7 @@ public TxTransactionalMethodInterceptor() { private boolean isApplicationExceptionAvailable() { try { - Class.forName("javax.ejb.ApplicationException"); + Class.forName("jakarta.ejb.ApplicationException"); return true; } catch (ClassNotFoundException e) { return false; diff --git a/src/test/java/org/mybatis/guice/jta/simple/SimpleJTATest.java b/src/test/java/org/mybatis/guice/jta/simple/SimpleJTATest.java index e58e9444..a722735e 100644 --- a/src/test/java/org/mybatis/guice/jta/simple/SimpleJTATest.java +++ b/src/test/java/org/mybatis/guice/jta/simple/SimpleJTATest.java @@ -23,11 +23,11 @@ import com.google.inject.PrivateModule; import com.google.inject.name.Names; +import jakarta.ejb.ApplicationException; import jakarta.transaction.TransactionManager; import java.util.Properties; -import javax.ejb.ApplicationException; import javax.naming.Context; import javax.naming.InitialContext;