From ff21d41bb8389c98f2c8bb439efb79aca5177569 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Nov 2023 21:08:13 -0400
Subject: [PATCH 1/2] [pom] Bump ejb to 4.0.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9993e4df..f02664b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
     <gcu.product>Guice</gcu.product>
     <guice.version>7.0.0</guice.version>
     <annotation-api.version>2.1.1</annotation-api.version>
-    <ejb-api.version>3.2.6</ejb-api.version>
+    <ejb-api.version>4.0.1</ejb-api.version>
     <inject-api.version>2.0.1</inject-api.version>
     <osgi.import>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</osgi.import>
     <spotbugs.omitVisitors>UnreadFields</spotbugs.omitVisitors>

From 2e1a86c14eeb3272d058b24b5575153d1189007b Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Nov 2023 21:19:30 -0400
Subject: [PATCH 2/2] [jakarta] Move ejb to jakarta namespace

---
 .../guice/transactional/TxTransactionalMethodInterceptor.java | 4 ++--
 src/test/java/org/mybatis/guice/jta/simple/SimpleJTATest.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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;