From e4ebb0e156b29ebbab1f10c417c6877692daea37 Mon Sep 17 00:00:00 2001
From: Stein Desmet <stein.desmet@lin-k.net>
Date: Fri, 14 Jul 2023 10:00:23 +0200
Subject: [PATCH 1/3] Guice 7 & jakarta migration

---
 pom.xml                                       |  8 ++--
 .../org/mybatis/guice/MyBatisJtaModule.java   | 11 +++--
 .../java/org/mybatis/guice/MyBatisModule.java |  5 ++-
 .../configuration/ConfigurationProvider.java  |  9 ++--
 ...terceptorConfigurationSettingProvider.java |  6 +--
 ...ndHandlerConfigurationSettingProvider.java |  6 +--
 .../ObjectFactoryConfigurationSetting.java    |  6 +--
 ...ectWrapperFactoryConfigurationSetting.java |  6 +--
 ...peHandlerConfigurationSettingProvider.java |  6 +--
 .../builtin/JndiDataSourceProvider.java       |  9 ++--
 .../builtin/PooledDataSourceProvider.java     |  9 ++--
 .../builtin/UnpooledDataSourceProvider.java   |  9 ++--
 .../c3p0/C3p0DataSourceProvider.java          |  9 ++--
 .../dbcp/BasicDataSourceProvider.java         |  9 ++--
 .../dbcp/DriverAdapterCPDSProvider.java       |  9 ++--
 .../dbcp/PerUserPoolDataSourceModule.java     |  6 +--
 .../dbcp/PerUserPoolDataSourceProvider.java   |  7 ++--
 .../dbcp/SharedPoolDataSourceProvider.java    |  7 ++--
 .../druid/DruidDataSourceProvider.java        |  7 ++--
 .../helper/JdbcUrlAntFormatter.java           |  8 ++--
 .../guice/datasource/helper/KeyResolver.java  |  6 +--
 .../datasource/hikaricp/HikariCPProvider.java |  9 ++--
 .../environment/EnvironmentProvider.java      | 11 ++---
 .../mybatis/guice/mappers/MapperProvider.java |  8 ++--
 ...onfigurationProviderProvisionListener.java |  4 +-
 .../session/SqlSessionFactoryProvider.java    |  8 ++--
 .../session/SqlSessionManagerProvider.java    |  8 ++--
 .../transactional/MyBatisXAException.java     |  2 +-
 .../transactional/TransactionAttribute.java   | 20 ++++-----
 .../guice/transactional/TransactionToken.java |  4 +-
 .../TransactionalMethodInterceptor.java       |  6 +--
 .../TxTransactionalMethodInterceptor.java     |  9 ++--
 .../transactional/XASqlSessionManager.java    |  2 +-
 .../XASqlSessionManagerProvider.java          |  7 ++--
 .../guice/type/TypeHandlerProvider.java       |  8 ++--
 .../guice/AbstractMyBatisModuleTestCase.java  |  6 +--
 .../org/mybatis/guice/AddressTypeHandler.java |  6 +--
 .../org/mybatis/guice/CleanDatabaseRule.java  |  8 ++--
 .../mybatis/guice/ContactIdTypeHandler.java   |  6 +--
 .../mybatis/guice/ContactMapperClient.java    |  8 ++--
 .../mybatis/guice/ContactNameTypeHandler.java |  6 +--
 .../mybatis/guice/CountUpdateInterceptor.java |  6 +--
 .../MyBatisModulePackageTestCaseTest.java     |  6 +--
 .../org/mybatis/guice/MyBatisModuleTest.java  | 42 +++++--------------
 .../guice/MyBatisModuleTestCaseTest.java      |  8 ++--
 ...eEnvironmentMyBatisModuleTestCaseTest.java |  4 +-
 .../XMLMyBatisModulePackageTestCaseTest.java  |  6 +--
 .../guice/XMLMyBatisModuleTestCaseTest.java   |  6 +--
 .../MyConfigurationProvider.java              |  4 +-
 .../CustomSqlSessionFactoryTest.java          |  4 +-
 .../MySqlSessionFactory.java                  |  4 +-
 .../MySqlSessionFactoryProvider.java          |  6 +--
 .../dbcp/PerUserPoolDataSourceModuleTest.java |  5 ++-
 .../GenericCustomObjectTypeHandler.java       |  6 +--
 .../guice/jta/CustomXaResourceProvider.java   |  2 +-
 .../org/mybatis/guice/jta/JtaProcess.java     |  6 +--
 .../mybatis/guice/jta/JtaService1Impl.java    |  6 +--
 .../mybatis/guice/jta/JtaService2Impl.java    |  6 +--
 .../guice/jta/simple/CombinedService.java     |  6 +--
 .../guice/jta/simple/Schema1Service.java      |  6 +--
 .../guice/jta/simple/Schema2Service.java      |  6 +--
 .../guice/jta/simple/SimpleJTATest.java       |  5 ++-
 .../guice/multidstest/Schema1Service.java     |  4 +-
 .../guice/multidstest/Schema2Service.java     |  4 +-
 .../guice/nestedtx/NestedTxService.java       |  6 +--
 .../objectfactory/CustomObjectFactory.java    |  4 +-
 .../CustomObjectWrapperFactory.java           |  4 +-
 .../resolver/typehandler/UserTypeHandler.java |  6 +--
 .../mybatis/guice/sample/dao/UserDaoImpl.java |  4 +-
 .../sample/service/FooServiceDaoImpl.java     |  4 +-
 .../sample/service/FooServiceMapperImpl.java  |  4 +-
 71 files changed, 245 insertions(+), 249 deletions(-)

diff --git a/pom.xml b/pom.xml
index 34816ae2..0a486b87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2022 the original author or authors.
+       Copyright 2009-2023 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -90,10 +90,10 @@
     <clirr.comparisonVersion>3.10</clirr.comparisonVersion>
     <spotbugs.onlyAnalyze>org.mybatis.guice.*</spotbugs.onlyAnalyze>
     <gcu.product>Guice</gcu.product>
-    <guice.version>5.1.0</guice.version>
+    <guice.version>7.0.0</guice.version>
     <annotation-api.version>1.3.5</annotation-api.version>
     <ejb-api.version>3.2.6</ejb-api.version>
-    <inject-api.version>1.0.5</inject-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>
     <module.name>org.mybatis.guice</module.name>
@@ -221,7 +221,7 @@
     <dependency>
       <groupId>jakarta.transaction</groupId>
       <artifactId>jakarta.transaction-api</artifactId>
-      <version>1.3.3</version>
+      <version>2.0.1</version>
       <optional>true</optional>
     </dependency>
 
diff --git a/src/main/java/org/mybatis/guice/MyBatisJtaModule.java b/src/main/java/org/mybatis/guice/MyBatisJtaModule.java
index d5d81e33..4a0e9291 100644
--- a/src/main/java/org/mybatis/guice/MyBatisJtaModule.java
+++ b/src/main/java/org/mybatis/guice/MyBatisJtaModule.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,13 +15,12 @@
  */
 package org.mybatis.guice;
 
-import static com.google.inject.matcher.Matchers.annotatedWith;
-import static com.google.inject.matcher.Matchers.any;
-import static com.google.inject.matcher.Matchers.not;
+import static com.google.inject.matcher.Matchers.*;
 import static org.mybatis.guice.Preconditions.checkArgument;
 
-import javax.inject.Provider;
-import javax.transaction.TransactionManager;
+import jakarta.inject.Provider;
+import jakarta.transaction.TransactionManager;
+
 import javax.transaction.xa.XAResource;
 
 import org.apache.ibatis.logging.Log;
diff --git a/src/main/java/org/mybatis/guice/MyBatisModule.java b/src/main/java/org/mybatis/guice/MyBatisModule.java
index 59d15b61..a146f84b 100644
--- a/src/main/java/org/mybatis/guice/MyBatisModule.java
+++ b/src/main/java/org/mybatis/guice/MyBatisModule.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -23,10 +23,11 @@
 import com.google.inject.Scopes;
 import com.google.inject.TypeLiteral;
 
+import jakarta.inject.Provider;
+
 import java.util.Collection;
 import java.util.Set;
 
-import javax.inject.Provider;
 import javax.sql.DataSource;
 
 import org.apache.ibatis.io.ResolverUtil;
diff --git a/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java b/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java
index 95bacc3c..7c3ce96c 100644
--- a/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java
+++ b/src/main/java/org/mybatis/guice/configuration/ConfigurationProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,12 +17,13 @@
 
 import com.google.inject.ProvisionException;
 
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
+
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
 import javax.sql.DataSource;
 
 import org.apache.ibatis.executor.ErrorContext;
diff --git a/src/main/java/org/mybatis/guice/configuration/settings/InterceptorConfigurationSettingProvider.java b/src/main/java/org/mybatis/guice/configuration/settings/InterceptorConfigurationSettingProvider.java
index 2d6863dc..78866639 100644
--- a/src/main/java/org/mybatis/guice/configuration/settings/InterceptorConfigurationSettingProvider.java
+++ b/src/main/java/org/mybatis/guice/configuration/settings/InterceptorConfigurationSettingProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 
 import com.google.inject.Injector;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.Configuration;
diff --git a/src/main/java/org/mybatis/guice/configuration/settings/JavaTypeAndHandlerConfigurationSettingProvider.java b/src/main/java/org/mybatis/guice/configuration/settings/JavaTypeAndHandlerConfigurationSettingProvider.java
index 9519bd9b..2036543c 100644
--- a/src/main/java/org/mybatis/guice/configuration/settings/JavaTypeAndHandlerConfigurationSettingProvider.java
+++ b/src/main/java/org/mybatis/guice/configuration/settings/JavaTypeAndHandlerConfigurationSettingProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
 import com.google.inject.Injector;
 import com.google.inject.Key;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.type.TypeHandler;
diff --git a/src/main/java/org/mybatis/guice/configuration/settings/ObjectFactoryConfigurationSetting.java b/src/main/java/org/mybatis/guice/configuration/settings/ObjectFactoryConfigurationSetting.java
index 665a184d..79388de9 100644
--- a/src/main/java/org/mybatis/guice/configuration/settings/ObjectFactoryConfigurationSetting.java
+++ b/src/main/java/org/mybatis/guice/configuration/settings/ObjectFactoryConfigurationSetting.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 
 import com.google.inject.Injector;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 import org.apache.ibatis.reflection.factory.ObjectFactory;
 import org.apache.ibatis.session.Configuration;
diff --git a/src/main/java/org/mybatis/guice/configuration/settings/ObjectWrapperFactoryConfigurationSetting.java b/src/main/java/org/mybatis/guice/configuration/settings/ObjectWrapperFactoryConfigurationSetting.java
index 9891d1fa..3313bb70 100644
--- a/src/main/java/org/mybatis/guice/configuration/settings/ObjectWrapperFactoryConfigurationSetting.java
+++ b/src/main/java/org/mybatis/guice/configuration/settings/ObjectWrapperFactoryConfigurationSetting.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
 
 import com.google.inject.Injector;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 import org.apache.ibatis.reflection.wrapper.ObjectWrapperFactory;
 import org.apache.ibatis.session.Configuration;
diff --git a/src/main/java/org/mybatis/guice/configuration/settings/TypeHandlerConfigurationSettingProvider.java b/src/main/java/org/mybatis/guice/configuration/settings/TypeHandlerConfigurationSettingProvider.java
index 4a40a58e..098a312e 100644
--- a/src/main/java/org/mybatis/guice/configuration/settings/TypeHandlerConfigurationSettingProvider.java
+++ b/src/main/java/org/mybatis/guice/configuration/settings/TypeHandlerConfigurationSettingProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
 import com.google.inject.Injector;
 import com.google.inject.Key;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.type.TypeHandler;
diff --git a/src/main/java/org/mybatis/guice/datasource/builtin/JndiDataSourceProvider.java b/src/main/java/org/mybatis/guice/datasource/builtin/JndiDataSourceProvider.java
index af043964..b7c6ebc9 100644
--- a/src/main/java/org/mybatis/guice/datasource/builtin/JndiDataSourceProvider.java
+++ b/src/main/java/org/mybatis/guice/datasource/builtin/JndiDataSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,11 +15,12 @@
  */
 package org.mybatis.guice.datasource.builtin;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+
 import java.util.Properties;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
 import javax.naming.Context;
 import javax.sql.DataSource;
 
diff --git a/src/main/java/org/mybatis/guice/datasource/builtin/PooledDataSourceProvider.java b/src/main/java/org/mybatis/guice/datasource/builtin/PooledDataSourceProvider.java
index 86c74611..13d05a88 100644
--- a/src/main/java/org/mybatis/guice/datasource/builtin/PooledDataSourceProvider.java
+++ b/src/main/java/org/mybatis/guice/datasource/builtin/PooledDataSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,11 +15,12 @@
  */
 package org.mybatis.guice.datasource.builtin;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+
 import java.util.Properties;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
 import javax.sql.DataSource;
 
 import org.apache.ibatis.datasource.pooled.PooledDataSource;
diff --git a/src/main/java/org/mybatis/guice/datasource/builtin/UnpooledDataSourceProvider.java b/src/main/java/org/mybatis/guice/datasource/builtin/UnpooledDataSourceProvider.java
index f9e4c253..5d4f1d7f 100644
--- a/src/main/java/org/mybatis/guice/datasource/builtin/UnpooledDataSourceProvider.java
+++ b/src/main/java/org/mybatis/guice/datasource/builtin/UnpooledDataSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,11 +15,12 @@
  */
 package org.mybatis.guice.datasource.builtin;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+
 import java.util.Properties;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
 import javax.sql.DataSource;
 
 import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
diff --git a/src/main/java/org/mybatis/guice/datasource/c3p0/C3p0DataSourceProvider.java b/src/main/java/org/mybatis/guice/datasource/c3p0/C3p0DataSourceProvider.java
index d513e8c5..c48a3bad 100644
--- a/src/main/java/org/mybatis/guice/datasource/c3p0/C3p0DataSourceProvider.java
+++ b/src/main/java/org/mybatis/guice/datasource/c3p0/C3p0DataSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,12 +17,13 @@
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+
 import java.beans.PropertyVetoException;
 import java.util.Properties;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
 import javax.sql.DataSource;
 
 /**
diff --git a/src/main/java/org/mybatis/guice/datasource/dbcp/BasicDataSourceProvider.java b/src/main/java/org/mybatis/guice/datasource/dbcp/BasicDataSourceProvider.java
index da6d77e6..0d3d1f89 100644
--- a/src/main/java/org/mybatis/guice/datasource/dbcp/BasicDataSourceProvider.java
+++ b/src/main/java/org/mybatis/guice/datasource/dbcp/BasicDataSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,12 +15,13 @@
  */
 package org.mybatis.guice.datasource.dbcp;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+
 import java.util.Map.Entry;
 import java.util.Properties;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
 import javax.sql.DataSource;
 
 import org.apache.commons.dbcp2.BasicDataSource;
diff --git a/src/main/java/org/mybatis/guice/datasource/dbcp/DriverAdapterCPDSProvider.java b/src/main/java/org/mybatis/guice/datasource/dbcp/DriverAdapterCPDSProvider.java
index ff6802b7..52ede901 100644
--- a/src/main/java/org/mybatis/guice/datasource/dbcp/DriverAdapterCPDSProvider.java
+++ b/src/main/java/org/mybatis/guice/datasource/dbcp/DriverAdapterCPDSProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,9 +15,10 @@
  */
 package org.mybatis.guice.datasource.dbcp;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+
 import javax.sql.ConnectionPoolDataSource;
 
 import org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS;
diff --git a/src/main/java/org/mybatis/guice/datasource/dbcp/PerUserPoolDataSourceModule.java b/src/main/java/org/mybatis/guice/datasource/dbcp/PerUserPoolDataSourceModule.java
index 0e532648..ab5251c8 100644
--- a/src/main/java/org/mybatis/guice/datasource/dbcp/PerUserPoolDataSourceModule.java
+++ b/src/main/java/org/mybatis/guice/datasource/dbcp/PerUserPoolDataSourceModule.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@
 import com.google.inject.Scopes;
 import com.google.inject.TypeLiteral;
 
+import jakarta.inject.Provider;
+
 import java.lang.annotation.Annotation;
 import java.util.Map;
 
-import javax.inject.Provider;
-
 public final class PerUserPoolDataSourceModule extends AbstractModule {
 
   private static final TypeLiteral<Map<String, Boolean>> STRING_BOOLEAN_MAP = new TypeLiteral<Map<String, Boolean>>() {
diff --git a/src/main/java/org/mybatis/guice/datasource/dbcp/PerUserPoolDataSourceProvider.java b/src/main/java/org/mybatis/guice/datasource/dbcp/PerUserPoolDataSourceProvider.java
index b0c4dfe2..561de92a 100644
--- a/src/main/java/org/mybatis/guice/datasource/dbcp/PerUserPoolDataSourceProvider.java
+++ b/src/main/java/org/mybatis/guice/datasource/dbcp/PerUserPoolDataSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,11 +15,12 @@
  */
 package org.mybatis.guice.datasource.dbcp;
 
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.inject.Named;
-import javax.inject.Provider;
 import javax.sql.ConnectionPoolDataSource;
 import javax.sql.DataSource;
 
diff --git a/src/main/java/org/mybatis/guice/datasource/dbcp/SharedPoolDataSourceProvider.java b/src/main/java/org/mybatis/guice/datasource/dbcp/SharedPoolDataSourceProvider.java
index 6d4c980e..9cd6ab95 100644
--- a/src/main/java/org/mybatis/guice/datasource/dbcp/SharedPoolDataSourceProvider.java
+++ b/src/main/java/org/mybatis/guice/datasource/dbcp/SharedPoolDataSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,8 +15,9 @@
  */
 package org.mybatis.guice.datasource.dbcp;
 
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+
 import javax.sql.ConnectionPoolDataSource;
 import javax.sql.DataSource;
 
diff --git a/src/main/java/org/mybatis/guice/datasource/druid/DruidDataSourceProvider.java b/src/main/java/org/mybatis/guice/datasource/druid/DruidDataSourceProvider.java
index f116a9b0..79883e68 100644
--- a/src/main/java/org/mybatis/guice/datasource/druid/DruidDataSourceProvider.java
+++ b/src/main/java/org/mybatis/guice/datasource/druid/DruidDataSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,11 +18,12 @@
 import com.alibaba.druid.pool.DruidDataSource;
 import com.google.inject.Inject;
 
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+
 import java.sql.SQLException;
 import java.util.Properties;
 
-import javax.inject.Named;
-import javax.inject.Provider;
 import javax.sql.DataSource;
 
 /**
diff --git a/src/main/java/org/mybatis/guice/datasource/helper/JdbcUrlAntFormatter.java b/src/main/java/org/mybatis/guice/datasource/helper/JdbcUrlAntFormatter.java
index dac10d39..17389cba 100644
--- a/src/main/java/org/mybatis/guice/datasource/helper/JdbcUrlAntFormatter.java
+++ b/src/main/java/org/mybatis/guice/datasource/helper/JdbcUrlAntFormatter.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,13 +18,13 @@
 import com.google.inject.Injector;
 import com.google.inject.util.Providers;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 public final class JdbcUrlAntFormatter implements Provider<String> {
 
   private static final String VAR_BEGIN = "$";
diff --git a/src/main/java/org/mybatis/guice/datasource/helper/KeyResolver.java b/src/main/java/org/mybatis/guice/datasource/helper/KeyResolver.java
index d11ae456..71e61083 100644
--- a/src/main/java/org/mybatis/guice/datasource/helper/KeyResolver.java
+++ b/src/main/java/org/mybatis/guice/datasource/helper/KeyResolver.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@
 import com.google.inject.Injector;
 import com.google.inject.Key;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 final class KeyResolver implements Provider<String> {
 
diff --git a/src/main/java/org/mybatis/guice/datasource/hikaricp/HikariCPProvider.java b/src/main/java/org/mybatis/guice/datasource/hikaricp/HikariCPProvider.java
index 66815739..336bd7ef 100644
--- a/src/main/java/org/mybatis/guice/datasource/hikaricp/HikariCPProvider.java
+++ b/src/main/java/org/mybatis/guice/datasource/hikaricp/HikariCPProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,13 +19,14 @@
 import com.zaxxer.hikari.HikariDataSource;
 import com.zaxxer.hikari.metrics.MetricsTrackerFactory;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+
 import java.util.Properties;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
 import javax.sql.DataSource;
 
 /**
diff --git a/src/main/java/org/mybatis/guice/environment/EnvironmentProvider.java b/src/main/java/org/mybatis/guice/environment/EnvironmentProvider.java
index 5e5d70fa..66202fd0 100644
--- a/src/main/java/org/mybatis/guice/environment/EnvironmentProvider.java
+++ b/src/main/java/org/mybatis/guice/environment/EnvironmentProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,10 +15,11 @@
  */
 package org.mybatis.guice.environment;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
+
 import javax.sql.DataSource;
 
 import org.apache.ibatis.mapping.Environment;
diff --git a/src/main/java/org/mybatis/guice/mappers/MapperProvider.java b/src/main/java/org/mybatis/guice/mappers/MapperProvider.java
index 12239073..a5e392c3 100644
--- a/src/main/java/org/mybatis/guice/mappers/MapperProvider.java
+++ b/src/main/java/org/mybatis/guice/mappers/MapperProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 package org.mybatis.guice.mappers;
 
-import java.util.Objects;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import java.util.Objects;
 
 import org.apache.ibatis.session.SqlSessionManager;
 
diff --git a/src/main/java/org/mybatis/guice/provision/ConfigurationProviderProvisionListener.java b/src/main/java/org/mybatis/guice/provision/ConfigurationProviderProvisionListener.java
index d515e063..48a6bce3 100644
--- a/src/main/java/org/mybatis/guice/provision/ConfigurationProviderProvisionListener.java
+++ b/src/main/java/org/mybatis/guice/provision/ConfigurationProviderProvisionListener.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 import com.google.inject.MembersInjector;
 import com.google.inject.spi.ProvisionListener;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 import org.mybatis.guice.configuration.ConfigurationSettingListener;
 import org.mybatis.guice.configuration.settings.ConfigurationSetting;
diff --git a/src/main/java/org/mybatis/guice/session/SqlSessionFactoryProvider.java b/src/main/java/org/mybatis/guice/session/SqlSessionFactoryProvider.java
index 5f4a51d0..64286b4a 100644
--- a/src/main/java/org/mybatis/guice/session/SqlSessionFactoryProvider.java
+++ b/src/main/java/org/mybatis/guice/session/SqlSessionFactoryProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  */
 package org.mybatis.guice.session;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSessionFactory;
diff --git a/src/main/java/org/mybatis/guice/session/SqlSessionManagerProvider.java b/src/main/java/org/mybatis/guice/session/SqlSessionManagerProvider.java
index 87daa9ce..b539797d 100644
--- a/src/main/java/org/mybatis/guice/session/SqlSessionManagerProvider.java
+++ b/src/main/java/org/mybatis/guice/session/SqlSessionManagerProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
 
 import static org.apache.ibatis.session.SqlSessionManager.newInstance;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
 
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionManager;
diff --git a/src/main/java/org/mybatis/guice/transactional/MyBatisXAException.java b/src/main/java/org/mybatis/guice/transactional/MyBatisXAException.java
index 2d45a853..068838a2 100644
--- a/src/main/java/org/mybatis/guice/transactional/MyBatisXAException.java
+++ b/src/main/java/org/mybatis/guice/transactional/MyBatisXAException.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/mybatis/guice/transactional/TransactionAttribute.java b/src/main/java/org/mybatis/guice/transactional/TransactionAttribute.java
index cdfed9b5..8bd6e024 100644
--- a/src/main/java/org/mybatis/guice/transactional/TransactionAttribute.java
+++ b/src/main/java/org/mybatis/guice/transactional/TransactionAttribute.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,15 +15,15 @@
  */
 package org.mybatis.guice.transactional;
 
-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;
 
 public enum TransactionAttribute {
   MANDATORY {
diff --git a/src/main/java/org/mybatis/guice/transactional/TransactionToken.java b/src/main/java/org/mybatis/guice/transactional/TransactionToken.java
index 9f0de17f..e191755c 100644
--- a/src/main/java/org/mybatis/guice/transactional/TransactionToken.java
+++ b/src/main/java/org/mybatis/guice/transactional/TransactionToken.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.mybatis.guice.transactional;
 
-import javax.transaction.Transaction;
+import jakarta.transaction.Transaction;
 
 public class TransactionToken {
   private Transaction activeTransaction;
diff --git a/src/main/java/org/mybatis/guice/transactional/TransactionalMethodInterceptor.java b/src/main/java/org/mybatis/guice/transactional/TransactionalMethodInterceptor.java
index f9d8b7e4..5da8294c 100644
--- a/src/main/java/org/mybatis/guice/transactional/TransactionalMethodInterceptor.java
+++ b/src/main/java/org/mybatis/guice/transactional/TransactionalMethodInterceptor.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,12 +18,12 @@
 import static java.lang.String.format;
 import static java.lang.Thread.currentThread;
 
+import jakarta.inject.Inject;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 
-import javax.inject.Inject;
-
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.apache.ibatis.logging.Log;
diff --git a/src/main/java/org/mybatis/guice/transactional/TxTransactionalMethodInterceptor.java b/src/main/java/org/mybatis/guice/transactional/TxTransactionalMethodInterceptor.java
index 4f20d813..4852f72f 100644
--- a/src/main/java/org/mybatis/guice/transactional/TxTransactionalMethodInterceptor.java
+++ b/src/main/java/org/mybatis/guice/transactional/TxTransactionalMethodInterceptor.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,13 +17,14 @@
 
 import static java.lang.String.format;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.transaction.TransactionManager;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 
 import javax.ejb.ApplicationException;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.transaction.TransactionManager;
 import javax.transaction.xa.XAResource;
 
 import org.aopalliance.intercept.MethodInterceptor;
diff --git a/src/main/java/org/mybatis/guice/transactional/XASqlSessionManager.java b/src/main/java/org/mybatis/guice/transactional/XASqlSessionManager.java
index 565f9698..168c0e8b 100644
--- a/src/main/java/org/mybatis/guice/transactional/XASqlSessionManager.java
+++ b/src/main/java/org/mybatis/guice/transactional/XASqlSessionManager.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/mybatis/guice/transactional/XASqlSessionManagerProvider.java b/src/main/java/org/mybatis/guice/transactional/XASqlSessionManagerProvider.java
index be180516..ee34d7f6 100644
--- a/src/main/java/org/mybatis/guice/transactional/XASqlSessionManagerProvider.java
+++ b/src/main/java/org/mybatis/guice/transactional/XASqlSessionManagerProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,8 +15,9 @@
  */
 package org.mybatis.guice.transactional;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+
 import javax.transaction.xa.XAResource;
 
 import org.apache.ibatis.session.SqlSessionManager;
diff --git a/src/main/java/org/mybatis/guice/type/TypeHandlerProvider.java b/src/main/java/org/mybatis/guice/type/TypeHandlerProvider.java
index 32a8cf20..fe01c4d3 100644
--- a/src/main/java/org/mybatis/guice/type/TypeHandlerProvider.java
+++ b/src/main/java/org/mybatis/guice/type/TypeHandlerProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -18,12 +18,12 @@
 import com.google.inject.Injector;
 import com.google.inject.TypeLiteral;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+
 import java.lang.reflect.Constructor;
 import java.util.Objects;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import org.apache.ibatis.type.TypeException;
 import org.apache.ibatis.type.TypeHandler;
 
diff --git a/src/test/java/org/mybatis/guice/AbstractMyBatisModuleTestCase.java b/src/test/java/org/mybatis/guice/AbstractMyBatisModuleTestCase.java
index e92ac110..6f8f7870 100644
--- a/src/test/java/org/mybatis/guice/AbstractMyBatisModuleTestCase.java
+++ b/src/test/java/org/mybatis/guice/AbstractMyBatisModuleTestCase.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import java.util.List;
+import jakarta.inject.Inject;
 
-import javax.inject.Inject;
+import java.util.List;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/mybatis/guice/AddressTypeHandler.java b/src/test/java/org/mybatis/guice/AddressTypeHandler.java
index 2b8eb03b..a8772fed 100644
--- a/src/test/java/org/mybatis/guice/AddressTypeHandler.java
+++ b/src/test/java/org/mybatis/guice/AddressTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,14 +15,14 @@
  */
 package org.mybatis.guice;
 
+import jakarta.inject.Inject;
+
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.ParseException;
 
-import javax.inject.Inject;
-
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.MappedTypes;
 import org.apache.ibatis.type.TypeHandler;
diff --git a/src/test/java/org/mybatis/guice/CleanDatabaseRule.java b/src/test/java/org/mybatis/guice/CleanDatabaseRule.java
index 90c6d8ad..e250ec85 100644
--- a/src/test/java/org/mybatis/guice/CleanDatabaseRule.java
+++ b/src/test/java/org/mybatis/guice/CleanDatabaseRule.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  */
 package org.mybatis.guice;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 import java.io.StringReader;
 import java.sql.Timestamp;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.apache.ibatis.jdbc.ScriptRunner;
 import org.apache.ibatis.session.SqlSession;
 
diff --git a/src/test/java/org/mybatis/guice/ContactIdTypeHandler.java b/src/test/java/org/mybatis/guice/ContactIdTypeHandler.java
index 9d161e4c..be2907df 100644
--- a/src/test/java/org/mybatis/guice/ContactIdTypeHandler.java
+++ b/src/test/java/org/mybatis/guice/ContactIdTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package org.mybatis.guice;
 
+import jakarta.inject.Inject;
+
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import javax.inject.Inject;
-
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.TypeHandler;
 
diff --git a/src/test/java/org/mybatis/guice/ContactMapperClient.java b/src/test/java/org/mybatis/guice/ContactMapperClient.java
index c151003b..b2b0b3c2 100644
--- a/src/test/java/org/mybatis/guice/ContactMapperClient.java
+++ b/src/test/java/org/mybatis/guice/ContactMapperClient.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 package org.mybatis.guice;
 
-import java.util.List;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import java.util.List;
 
 import org.mybatis.guice.transactional.Isolation;
 import org.mybatis.guice.transactional.Transactional;
diff --git a/src/test/java/org/mybatis/guice/ContactNameTypeHandler.java b/src/test/java/org/mybatis/guice/ContactNameTypeHandler.java
index fc88237d..730303a7 100644
--- a/src/test/java/org/mybatis/guice/ContactNameTypeHandler.java
+++ b/src/test/java/org/mybatis/guice/ContactNameTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package org.mybatis.guice;
 
+import jakarta.inject.Inject;
+
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import javax.inject.Inject;
-
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.TypeHandler;
 
diff --git a/src/test/java/org/mybatis/guice/CountUpdateInterceptor.java b/src/test/java/org/mybatis/guice/CountUpdateInterceptor.java
index a4b091a5..97a2d117 100644
--- a/src/test/java/org/mybatis/guice/CountUpdateInterceptor.java
+++ b/src/test/java/org/mybatis/guice/CountUpdateInterceptor.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  */
 package org.mybatis.guice;
 
-import java.util.Properties;
+import jakarta.inject.Inject;
 
-import javax.inject.Inject;
+import java.util.Properties;
 
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.MappedStatement;
diff --git a/src/test/java/org/mybatis/guice/MyBatisModulePackageTestCaseTest.java b/src/test/java/org/mybatis/guice/MyBatisModulePackageTestCaseTest.java
index 09443846..44ed9488 100644
--- a/src/test/java/org/mybatis/guice/MyBatisModulePackageTestCaseTest.java
+++ b/src/test/java/org/mybatis/guice/MyBatisModulePackageTestCaseTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.mybatis.guice;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/org/mybatis/guice/MyBatisModuleTest.java b/src/test/java/org/mybatis/guice/MyBatisModuleTest.java
index fdb3adaf..e7623459 100644
--- a/src/test/java/org/mybatis/guice/MyBatisModuleTest.java
+++ b/src/test/java/org/mybatis/guice/MyBatisModuleTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,32 +15,17 @@
  */
 package org.mybatis.guice;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
-import com.google.inject.CreationException;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.TypeLiteral;
+import com.google.inject.*;
+
+import jakarta.inject.Provider;
 
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-
-import javax.inject.Provider;
+import java.util.*;
+
 import javax.sql.DataSource;
 
 import org.apache.ibatis.io.ResolverUtil;
@@ -50,12 +35,7 @@
 import org.apache.ibatis.reflection.factory.DefaultObjectFactory;
 import org.apache.ibatis.reflection.wrapper.DefaultObjectWrapperFactory;
 import org.apache.ibatis.scripting.defaults.RawLanguageDriver;
-import org.apache.ibatis.session.AutoMappingBehavior;
-import org.apache.ibatis.session.Configuration;
-import org.apache.ibatis.session.ExecutorType;
-import org.apache.ibatis.session.LocalCacheScope;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.*;
 import org.apache.ibatis.transaction.TransactionFactory;
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.apache.ibatis.type.Alias;
@@ -95,13 +75,13 @@ class MyBatisModuleTest {
   @Mock
   private Provider<DataSource> dataSourceProvider;
   @Mock
-  private javax.inject.Provider<DataSource> javaDataSourceProvider;
+  private jakarta.inject.Provider<DataSource> javaDataSourceProvider;
   @Mock
   private DataSource dataSource;
   @Mock
   private Provider<TransactionFactory> transactionFactoryProvider;
   @Mock
-  private javax.inject.Provider<TransactionFactory> javaTransactionFactoryProvider;
+  private jakarta.inject.Provider<TransactionFactory> javaTransactionFactoryProvider;
   @Mock
   private TransactionFactory transactionFactory;
   @Mock
diff --git a/src/test/java/org/mybatis/guice/MyBatisModuleTestCaseTest.java b/src/test/java/org/mybatis/guice/MyBatisModuleTestCaseTest.java
index 500bc5ca..06d7d483 100644
--- a/src/test/java/org/mybatis/guice/MyBatisModuleTestCaseTest.java
+++ b/src/test/java/org/mybatis/guice/MyBatisModuleTestCaseTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 package org.mybatis.guice;
 
-import java.util.List;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/src/test/java/org/mybatis/guice/XMLAlternateEnvironmentMyBatisModuleTestCaseTest.java b/src/test/java/org/mybatis/guice/XMLAlternateEnvironmentMyBatisModuleTestCaseTest.java
index b6008931..c65f522c 100644
--- a/src/test/java/org/mybatis/guice/XMLAlternateEnvironmentMyBatisModuleTestCaseTest.java
+++ b/src/test/java/org/mybatis/guice/XMLAlternateEnvironmentMyBatisModuleTestCaseTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.mybatis.guice;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/mybatis/guice/XMLMyBatisModulePackageTestCaseTest.java b/src/test/java/org/mybatis/guice/XMLMyBatisModulePackageTestCaseTest.java
index f12210c1..31503f69 100644
--- a/src/test/java/org/mybatis/guice/XMLMyBatisModulePackageTestCaseTest.java
+++ b/src/test/java/org/mybatis/guice/XMLMyBatisModulePackageTestCaseTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.mybatis.guice;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/mybatis/guice/XMLMyBatisModuleTestCaseTest.java b/src/test/java/org/mybatis/guice/XMLMyBatisModuleTestCaseTest.java
index 4eecff03..219090b4 100644
--- a/src/test/java/org/mybatis/guice/XMLMyBatisModuleTestCaseTest.java
+++ b/src/test/java/org/mybatis/guice/XMLMyBatisModuleTestCaseTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.mybatis.guice;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/mybatis/guice/customconfiguration/MyConfigurationProvider.java b/src/test/java/org/mybatis/guice/customconfiguration/MyConfigurationProvider.java
index ea98f5ce..37c80558 100644
--- a/src/test/java/org/mybatis/guice/customconfiguration/MyConfigurationProvider.java
+++ b/src/test/java/org/mybatis/guice/customconfiguration/MyConfigurationProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.mybatis.guice.customconfiguration;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.session.Configuration;
diff --git a/src/test/java/org/mybatis/guice/customsqlsessionfactory/CustomSqlSessionFactoryTest.java b/src/test/java/org/mybatis/guice/customsqlsessionfactory/CustomSqlSessionFactoryTest.java
index ca51caa5..9b14694c 100644
--- a/src/test/java/org/mybatis/guice/customsqlsessionfactory/CustomSqlSessionFactoryTest.java
+++ b/src/test/java/org/mybatis/guice/customsqlsessionfactory/CustomSqlSessionFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package org.mybatis.guice.customsqlsessionfactory;
 
 import static com.google.inject.name.Names.bindProperties;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
diff --git a/src/test/java/org/mybatis/guice/customsqlsessionfactory/MySqlSessionFactory.java b/src/test/java/org/mybatis/guice/customsqlsessionfactory/MySqlSessionFactory.java
index 4920d12b..d8e930a6 100644
--- a/src/test/java/org/mybatis/guice/customsqlsessionfactory/MySqlSessionFactory.java
+++ b/src/test/java/org/mybatis/guice/customsqlsessionfactory/MySqlSessionFactory.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.mybatis.guice.customsqlsessionfactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.defaults.DefaultSqlSessionFactory;
diff --git a/src/test/java/org/mybatis/guice/customsqlsessionfactory/MySqlSessionFactoryProvider.java b/src/test/java/org/mybatis/guice/customsqlsessionfactory/MySqlSessionFactoryProvider.java
index 08505559..3b4c4a2c 100644
--- a/src/test/java/org/mybatis/guice/customsqlsessionfactory/MySqlSessionFactoryProvider.java
+++ b/src/test/java/org/mybatis/guice/customsqlsessionfactory/MySqlSessionFactoryProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.mybatis.guice.customsqlsessionfactory;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSessionFactory;
diff --git a/src/test/java/org/mybatis/guice/datasource/dbcp/PerUserPoolDataSourceModuleTest.java b/src/test/java/org/mybatis/guice/datasource/dbcp/PerUserPoolDataSourceModuleTest.java
index f4ae2d97..d337d422 100644
--- a/src/test/java/org/mybatis/guice/datasource/dbcp/PerUserPoolDataSourceModuleTest.java
+++ b/src/test/java/org/mybatis/guice/datasource/dbcp/PerUserPoolDataSourceModuleTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -20,11 +20,12 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
+import jakarta.inject.Provider;
+
 import java.sql.Connection;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.inject.Provider;
 import javax.sql.ConnectionPoolDataSource;
 
 import org.apache.commons.dbcp2.datasources.PerUserPoolDataSource;
diff --git a/src/test/java/org/mybatis/guice/generictypehandler/GenericCustomObjectTypeHandler.java b/src/test/java/org/mybatis/guice/generictypehandler/GenericCustomObjectTypeHandler.java
index a7dc8ce1..d55ec87d 100644
--- a/src/test/java/org/mybatis/guice/generictypehandler/GenericCustomObjectTypeHandler.java
+++ b/src/test/java/org/mybatis/guice/generictypehandler/GenericCustomObjectTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package org.mybatis.guice.generictypehandler;
 
+import jakarta.inject.Inject;
+
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import javax.inject.Inject;
-
 import org.apache.ibatis.exceptions.PersistenceException;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
diff --git a/src/test/java/org/mybatis/guice/jta/CustomXaResourceProvider.java b/src/test/java/org/mybatis/guice/jta/CustomXaResourceProvider.java
index 51d60ea3..769ea92b 100644
--- a/src/test/java/org/mybatis/guice/jta/CustomXaResourceProvider.java
+++ b/src/test/java/org/mybatis/guice/jta/CustomXaResourceProvider.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/mybatis/guice/jta/JtaProcess.java b/src/test/java/org/mybatis/guice/jta/JtaProcess.java
index 69367a47..acea0a04 100644
--- a/src/test/java/org/mybatis/guice/jta/JtaProcess.java
+++ b/src/test/java/org/mybatis/guice/jta/JtaProcess.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.mybatis.guice.jta;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 import org.mybatis.guice.transactional.Transactional;
 import org.slf4j.Logger;
diff --git a/src/test/java/org/mybatis/guice/jta/JtaService1Impl.java b/src/test/java/org/mybatis/guice/jta/JtaService1Impl.java
index 68c7d05c..a375b80d 100644
--- a/src/test/java/org/mybatis/guice/jta/JtaService1Impl.java
+++ b/src/test/java/org/mybatis/guice/jta/JtaService1Impl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  */
 package org.mybatis.guice.jta;
 
-import java.util.List;
+import jakarta.inject.Inject;
 
-import javax.inject.Inject;
+import java.util.List;
 
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
diff --git a/src/test/java/org/mybatis/guice/jta/JtaService2Impl.java b/src/test/java/org/mybatis/guice/jta/JtaService2Impl.java
index 9d91d33b..0904b2aa 100644
--- a/src/test/java/org/mybatis/guice/jta/JtaService2Impl.java
+++ b/src/test/java/org/mybatis/guice/jta/JtaService2Impl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  */
 package org.mybatis.guice.jta;
 
-import java.util.List;
+import jakarta.inject.Inject;
 
-import javax.inject.Inject;
+import java.util.List;
 
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
diff --git a/src/test/java/org/mybatis/guice/jta/simple/CombinedService.java b/src/test/java/org/mybatis/guice/jta/simple/CombinedService.java
index dbec5e64..c94222ac 100644
--- a/src/test/java/org/mybatis/guice/jta/simple/CombinedService.java
+++ b/src/test/java/org/mybatis/guice/jta/simple/CombinedService.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  */
 package org.mybatis.guice.jta.simple;
 
-import java.util.List;
+import jakarta.inject.Inject;
 
-import javax.inject.Inject;
+import java.util.List;
 
 import org.mybatis.guice.transactional.Transactional;
 
diff --git a/src/test/java/org/mybatis/guice/jta/simple/Schema1Service.java b/src/test/java/org/mybatis/guice/jta/simple/Schema1Service.java
index c84b113e..504fd949 100644
--- a/src/test/java/org/mybatis/guice/jta/simple/Schema1Service.java
+++ b/src/test/java/org/mybatis/guice/jta/simple/Schema1Service.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  */
 package org.mybatis.guice.jta.simple;
 
-import java.util.List;
+import jakarta.inject.Inject;
 
-import javax.inject.Inject;
+import java.util.List;
 
 import org.mybatis.guice.transactional.Transactional;
 import org.mybatis.guice.transactional.Transactional.TxType;
diff --git a/src/test/java/org/mybatis/guice/jta/simple/Schema2Service.java b/src/test/java/org/mybatis/guice/jta/simple/Schema2Service.java
index 566e76c9..2e025897 100644
--- a/src/test/java/org/mybatis/guice/jta/simple/Schema2Service.java
+++ b/src/test/java/org/mybatis/guice/jta/simple/Schema2Service.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  */
 package org.mybatis.guice.jta.simple;
 
-import java.util.List;
+import jakarta.inject.Inject;
 
-import javax.inject.Inject;
+import java.util.List;
 
 import org.mybatis.guice.transactional.Transactional;
 
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 9ec38e28..e58e9444 100644
--- a/src/test/java/org/mybatis/guice/jta/simple/SimpleJTATest.java
+++ b/src/test/java/org/mybatis/guice/jta/simple/SimpleJTATest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -23,12 +23,13 @@
 import com.google.inject.PrivateModule;
 import com.google.inject.name.Names;
 
+import jakarta.transaction.TransactionManager;
+
 import java.util.Properties;
 
 import javax.ejb.ApplicationException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import javax.transaction.TransactionManager;
 
 import org.apache.ibatis.transaction.managed.ManagedTransactionFactory;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/org/mybatis/guice/multidstest/Schema1Service.java b/src/test/java/org/mybatis/guice/multidstest/Schema1Service.java
index 3d42b9cd..3765914e 100644
--- a/src/test/java/org/mybatis/guice/multidstest/Schema1Service.java
+++ b/src/test/java/org/mybatis/guice/multidstest/Schema1Service.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.mybatis.guice.multidstest;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.mybatis.guice.transactional.Transactional;
 
diff --git a/src/test/java/org/mybatis/guice/multidstest/Schema2Service.java b/src/test/java/org/mybatis/guice/multidstest/Schema2Service.java
index c02b3db7..78796e85 100644
--- a/src/test/java/org/mybatis/guice/multidstest/Schema2Service.java
+++ b/src/test/java/org/mybatis/guice/multidstest/Schema2Service.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.mybatis.guice.multidstest;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.mybatis.guice.transactional.Transactional;
 
diff --git a/src/test/java/org/mybatis/guice/nestedtx/NestedTxService.java b/src/test/java/org/mybatis/guice/nestedtx/NestedTxService.java
index b7247274..393f1fc2 100644
--- a/src/test/java/org/mybatis/guice/nestedtx/NestedTxService.java
+++ b/src/test/java/org/mybatis/guice/nestedtx/NestedTxService.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  */
 package org.mybatis.guice.nestedtx;
 
-import java.util.List;
+import jakarta.inject.Inject;
 
-import javax.inject.Inject;
+import java.util.List;
 
 import org.mybatis.guice.transactional.Transactional;
 
diff --git a/src/test/java/org/mybatis/guice/objectfactory/CustomObjectFactory.java b/src/test/java/org/mybatis/guice/objectfactory/CustomObjectFactory.java
index a054876f..d17a5715 100644
--- a/src/test/java/org/mybatis/guice/objectfactory/CustomObjectFactory.java
+++ b/src/test/java/org/mybatis/guice/objectfactory/CustomObjectFactory.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.mybatis.guice.objectfactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.ibatis.reflection.factory.DefaultObjectFactory;
 
diff --git a/src/test/java/org/mybatis/guice/objectfactory/CustomObjectWrapperFactory.java b/src/test/java/org/mybatis/guice/objectfactory/CustomObjectWrapperFactory.java
index 92256b7a..d13458f9 100644
--- a/src/test/java/org/mybatis/guice/objectfactory/CustomObjectWrapperFactory.java
+++ b/src/test/java/org/mybatis/guice/objectfactory/CustomObjectWrapperFactory.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.mybatis.guice.objectfactory;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.ibatis.reflection.wrapper.DefaultObjectWrapperFactory;
 
diff --git a/src/test/java/org/mybatis/guice/resolver/typehandler/UserTypeHandler.java b/src/test/java/org/mybatis/guice/resolver/typehandler/UserTypeHandler.java
index 842f48f5..eecf6e74 100644
--- a/src/test/java/org/mybatis/guice/resolver/typehandler/UserTypeHandler.java
+++ b/src/test/java/org/mybatis/guice/resolver/typehandler/UserTypeHandler.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,13 +15,13 @@
  */
 package org.mybatis.guice.resolver.typehandler;
 
+import jakarta.inject.Inject;
+
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import javax.inject.Inject;
-
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 import org.mybatis.guice.resolver.alias.User;
diff --git a/src/test/java/org/mybatis/guice/sample/dao/UserDaoImpl.java b/src/test/java/org/mybatis/guice/sample/dao/UserDaoImpl.java
index babb22e9..5ef57099 100644
--- a/src/test/java/org/mybatis/guice/sample/dao/UserDaoImpl.java
+++ b/src/test/java/org/mybatis/guice/sample/dao/UserDaoImpl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.mybatis.guice.sample.dao;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.ibatis.session.SqlSession;
 import org.mybatis.guice.sample.domain.User;
diff --git a/src/test/java/org/mybatis/guice/sample/service/FooServiceDaoImpl.java b/src/test/java/org/mybatis/guice/sample/service/FooServiceDaoImpl.java
index 6442af60..3d737611 100644
--- a/src/test/java/org/mybatis/guice/sample/service/FooServiceDaoImpl.java
+++ b/src/test/java/org/mybatis/guice/sample/service/FooServiceDaoImpl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.mybatis.guice.sample.service;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.mybatis.guice.CustomException;
 import org.mybatis.guice.sample.dao.UserDao;
diff --git a/src/test/java/org/mybatis/guice/sample/service/FooServiceMapperImpl.java b/src/test/java/org/mybatis/guice/sample/service/FooServiceMapperImpl.java
index 91a3f517..d7a99803 100644
--- a/src/test/java/org/mybatis/guice/sample/service/FooServiceMapperImpl.java
+++ b/src/test/java/org/mybatis/guice/sample/service/FooServiceMapperImpl.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.mybatis.guice.sample.service;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.mybatis.guice.CustomException;
 import org.mybatis.guice.sample.domain.User;

From fa031858f7e1487e1fb2194f061d35f6978d908f Mon Sep 17 00:00:00 2001
From: Stein Desmet <stein.desmet@lin-k.net>
Date: Mon, 24 Jul 2023 11:01:37 +0200
Subject: [PATCH 2/3] Replace Aries with Agroal + Narayana JTA for tests

---
 pom.xml                                       | 31 +++++--
 .../java/org/mybatis/guice/jta/BaseDB.java    | 79 ++++++++----------
 .../guice/jta/JtaCustomXaResourceTest.java    | 13 +--
 .../guice/jta/JtaLocalRollbackTest.java       | 25 +++---
 .../org/mybatis/guice/jta/JtaLocalTest.java   | 34 ++++----
 .../mybatis/guice/jta/JtaXaRollbackTest.java  | 24 +++---
 .../java/org/mybatis/guice/jta/JtaXaTest.java | 21 ++---
 .../org/mybatis/guice/jta/simple/Utils.java   | 80 ++++++++++---------
 8 files changed, 153 insertions(+), 154 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0a486b87..55f31322 100644
--- a/pom.xml
+++ b/pom.xml
@@ -289,16 +289,33 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.aries.transaction</groupId>
-      <artifactId>org.apache.aries.transaction.jdbc</artifactId>
-      <version>2.1.3</version>
+      <groupId>org.jboss.narayana.jta</groupId>
+      <artifactId>narayana-jta</artifactId>
+      <version>7.0.0.Final</version>
       <scope>test</scope>
     </dependency>
-
     <dependency>
-      <groupId>org.apache.aries.transaction</groupId>
-      <artifactId>org.apache.aries.transaction.blueprint</artifactId>
-      <version>2.3.1</version>
+      <groupId>org.wildfly.core</groupId>
+      <artifactId>wildfly-logging</artifactId>
+      <version>21.1.0.Final</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.agroal</groupId>
+      <artifactId>agroal-api</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.agroal</groupId>
+      <artifactId>agroal-pool</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.agroal</groupId>
+      <artifactId>agroal-narayana</artifactId>
+      <version>2.2</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/src/test/java/org/mybatis/guice/jta/BaseDB.java b/src/test/java/org/mybatis/guice/jta/BaseDB.java
index c845a0c4..0b966d6b 100644
--- a/src/test/java/org/mybatis/guice/jta/BaseDB.java
+++ b/src/test/java/org/mybatis/guice/jta/BaseDB.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,23 +15,21 @@
  */
 package org.mybatis.guice.jta;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.sql.DataSource;
-
-import org.apache.aries.transaction.AriesTransactionManager;
-import org.apache.aries.transaction.jdbc.RecoverableDataSource;
-import org.apache.derby.jdbc.EmbeddedDataSource;
-import org.apache.derby.jdbc.EmbeddedXADataSource;
+import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple;
+import io.agroal.api.AgroalDataSource;
+import io.agroal.api.configuration.supplier.AgroalDataSourceConfigurationSupplier;
+import io.agroal.api.security.NamePrincipal;
+import io.agroal.api.security.SimplePassword;
+import io.agroal.narayana.NarayanaTransactionIntegration;
+import jakarta.transaction.TransactionManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.sql.DataSource;
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+
 public class BaseDB {
   private static final Logger LOGGER = LoggerFactory.getLogger(BaseDB.class);
 
@@ -49,47 +47,40 @@ public class BaseDB {
   static final String QUERY_SELECT = "select id from table1";
   static final String QUERY_DELETE = "delete from table1";
 
-  public static DataSource createLocalDataSource(String dataSourceName, String dataSourceURL,
-      AriesTransactionManager manager) throws Exception {
+  public static DataSource createLocalDataSource(String dataSourceURL,
+                                                 TransactionManager manager) throws Exception {
     executeScript(dataSourceURL + ";create=true", QUERY_CREATE_TABLE);
 
-    EmbeddedDataSource localDataSource = new EmbeddedDataSource();
-    localDataSource.setDatabaseName(dataSourceName);
-    localDataSource.setUser(USER);
-    localDataSource.setPassword(PASSWORD);
+    DataSource recoverableDataSource = AgroalDataSource
+            .from( new AgroalDataSourceConfigurationSupplier().connectionPoolConfiguration(
+                    cp -> cp.maxSize( 10 )
+                            .connectionFactoryConfiguration( cf -> cf.jdbcUrl( dataSourceURL )
+                                                                     .principal( new NamePrincipal( USER ) ).credential(
+                                            new SimplePassword( PASSWORD ) ) )
+                            .transactionIntegration(
+                                    new NarayanaTransactionIntegration(
+                                            manager, new TransactionSynchronizationRegistryImple() ) ) ) );
 
-    RecoverableDataSource recoverableDataSource = new RecoverableDataSource();
-
-    recoverableDataSource.setDataSource(localDataSource);
-    recoverableDataSource.setUsername(USER);
-    recoverableDataSource.setPassword(PASSWORD);
-    recoverableDataSource.setTransactionManager(manager);
-    recoverableDataSource.setTransaction("local");
-    recoverableDataSource.start();
 
     return recoverableDataSource;
   }
 
-  public static DataSource createXADataSource(String dataSourceName, String dataSourceURL,
-      AriesTransactionManager manager) throws Exception {
+  public static DataSource createXADataSource(String dataSourceURL, TransactionManager manager)
+      throws Exception {
     String className = "org.apache.derby.jdbc.EmbeddedDriver";
     Class.forName(className).newInstance();
 
     executeScript(dataSourceURL + ";create=true", QUERY_CREATE_TABLE);
 
-    EmbeddedXADataSource xaDataSource = new EmbeddedXADataSource();
-    xaDataSource.setDatabaseName(dataSourceName);
-    xaDataSource.setUser(USER);
-    xaDataSource.setPassword(PASSWORD);
-
-    RecoverableDataSource recoverableDataSource = new RecoverableDataSource();
-
-    recoverableDataSource.setDataSource(xaDataSource);
-    recoverableDataSource.setUsername(USER);
-    recoverableDataSource.setPassword(PASSWORD);
-    recoverableDataSource.setTransactionManager(manager);
-    recoverableDataSource.setTransaction("xa");
-    recoverableDataSource.start();
+    DataSource recoverableDataSource = AgroalDataSource
+            .from( new AgroalDataSourceConfigurationSupplier().connectionPoolConfiguration(
+                    cp -> cp.maxSize( 10 )
+                            .connectionFactoryConfiguration( cf -> cf.jdbcUrl( dataSourceURL )
+                                                                     .principal( new NamePrincipal( USER ) ).credential(
+                                            new SimplePassword( PASSWORD ) ) )
+                            .transactionIntegration(
+                                    new NarayanaTransactionIntegration(
+                                            manager, new TransactionSynchronizationRegistryImple() ) ) ) );
 
     return recoverableDataSource;
   }
diff --git a/src/test/java/org/mybatis/guice/jta/JtaCustomXaResourceTest.java b/src/test/java/org/mybatis/guice/jta/JtaCustomXaResourceTest.java
index 637e2266..34859f49 100644
--- a/src/test/java/org/mybatis/guice/jta/JtaCustomXaResourceTest.java
+++ b/src/test/java/org/mybatis/guice/jta/JtaCustomXaResourceTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@
 import com.google.inject.Injector;
 import com.google.inject.PrivateModule;
 
+import jakarta.transaction.TransactionManager;
+
 import javax.sql.DataSource;
 
-import org.apache.aries.transaction.AriesTransactionManager;
-import org.apache.aries.transaction.internal.AriesTransactionManagerImpl;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.mapping.VendorDatabaseIdProvider;
 import org.junit.jupiter.api.AfterAll;
@@ -40,7 +40,7 @@
 public class JtaCustomXaResourceTest {
   private static final Logger LOGGER = LoggerFactory.getLogger(JtaCustomXaResourceTest.class);
 
-  static AriesTransactionManager manager;
+  static TransactionManager manager;
   static DataSource dataSource2;
 
   @BeforeAll
@@ -48,9 +48,10 @@ static void setUpBeforeClass() throws Exception {
     Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
     LogFactory.useSlf4jLogging();
 
-    manager = new AriesTransactionManagerImpl();
+    manager = com.arjuna.ats.jta.TransactionManager.transactionManager();
 
-    dataSource2 = BaseDB.createLocalDataSource(BaseDB.NAME_DB2, BaseDB.URL_DB2, manager);
+    dataSource2 = BaseDB.createLocalDataSource( BaseDB.URL_DB2, manager
+    );
   }
 
   @AfterAll
diff --git a/src/test/java/org/mybatis/guice/jta/JtaLocalRollbackTest.java b/src/test/java/org/mybatis/guice/jta/JtaLocalRollbackTest.java
index ec224d71..ee83ea85 100644
--- a/src/test/java/org/mybatis/guice/jta/JtaLocalRollbackTest.java
+++ b/src/test/java/org/mybatis/guice/jta/JtaLocalRollbackTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,15 +15,7 @@
  */
 package org.mybatis.guice.jta;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.sql.Connection;
-import java.util.List;
-
-import javax.sql.DataSource;
-
-import org.apache.aries.transaction.AriesTransactionManager;
-import org.apache.aries.transaction.internal.AriesTransactionManagerImpl;
+import jakarta.transaction.TransactionManager;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -31,6 +23,12 @@
 import org.mybatis.guice.transactional.TransactionAttribute;
 import org.mybatis.guice.transactional.TransactionToken;
 
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * Create Requerd transaction. Create internal RequiresNew transaction. Rollback first transaction. Warning: transaction
  * will roll back. XA error code: 100
@@ -38,18 +36,19 @@
 public class JtaLocalRollbackTest {
 
   private static DataSource dataSource;
-  private static AriesTransactionManager manager;
+  private static TransactionManager manager;
 
   @BeforeAll
   static void setUpBeforeClass() throws Exception {
     Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
 
-    manager = new AriesTransactionManagerImpl();
+    manager = com.arjuna.ats.jta.TransactionManager.transactionManager();
 
     String className = "org.apache.derby.jdbc.EmbeddedDriver";
     Class.forName(className).newInstance();
 
-    dataSource = BaseDB.createLocalDataSource(BaseDB.NAME_DB1, BaseDB.URL_DB1, manager);
+    dataSource = BaseDB.createLocalDataSource( BaseDB.URL_DB1, manager
+    );
   }
 
   @AfterAll
diff --git a/src/test/java/org/mybatis/guice/jta/JtaLocalTest.java b/src/test/java/org/mybatis/guice/jta/JtaLocalTest.java
index 45c94934..01dfe7db 100644
--- a/src/test/java/org/mybatis/guice/jta/JtaLocalTest.java
+++ b/src/test/java/org/mybatis/guice/jta/JtaLocalTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,34 +15,26 @@
  */
 package org.mybatis.guice.jta;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.PrivateModule;
-
-import java.util.List;
-
-import javax.sql.DataSource;
-
-import org.apache.aries.transaction.AriesTransactionManager;
-import org.apache.aries.transaction.internal.AriesTransactionManagerImpl;
+import jakarta.transaction.TransactionManager;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.mapping.VendorDatabaseIdProvider;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.*;
 import org.mybatis.guice.MyBatisJtaModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.sql.DataSource;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 class JtaLocalTest {
   private static final Logger LOGGER = LoggerFactory.getLogger(JtaLocalTest.class);
 
-  static AriesTransactionManager manager;
+  static TransactionManager manager;
   static DataSource dataSource1;
   static DataSource dataSource2;
 
@@ -51,10 +43,12 @@ static void setUpBeforeClass() throws Exception {
     Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
     LogFactory.useSlf4jLogging();
 
-    manager = new AriesTransactionManagerImpl();
+    manager = com.arjuna.ats.jta.TransactionManager.transactionManager();
 
-    dataSource1 = BaseDB.createLocalDataSource(BaseDB.NAME_DB1, BaseDB.URL_DB1, manager);
-    dataSource2 = BaseDB.createLocalDataSource(BaseDB.NAME_DB2, BaseDB.URL_DB2, manager);
+    dataSource1 = BaseDB.createLocalDataSource( BaseDB.URL_DB1, manager
+    );
+    dataSource2 = BaseDB.createLocalDataSource( BaseDB.URL_DB2, manager
+    );
   }
 
   @AfterAll
diff --git a/src/test/java/org/mybatis/guice/jta/JtaXaRollbackTest.java b/src/test/java/org/mybatis/guice/jta/JtaXaRollbackTest.java
index ce7e0170..28c77830 100644
--- a/src/test/java/org/mybatis/guice/jta/JtaXaRollbackTest.java
+++ b/src/test/java/org/mybatis/guice/jta/JtaXaRollbackTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,15 +15,7 @@
  */
 package org.mybatis.guice.jta;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.sql.Connection;
-import java.util.List;
-
-import javax.sql.DataSource;
-
-import org.apache.aries.transaction.AriesTransactionManager;
-import org.apache.aries.transaction.internal.AriesTransactionManagerImpl;
+import jakarta.transaction.TransactionManager;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -31,6 +23,12 @@
 import org.mybatis.guice.transactional.TransactionAttribute;
 import org.mybatis.guice.transactional.TransactionToken;
 
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 /**
  * Create Requerd transaction. Create internal RequiresNew transaction. Rollback first transaction. Warning: transaction
  * will roll back. XA error code: 100
@@ -38,18 +36,18 @@
 class JtaXaRollbackTest {
 
   private static DataSource dataSource;
-  private static AriesTransactionManager manager;
+  private static TransactionManager manager;
 
   @BeforeAll
   static void setUpBeforeClass() throws Exception {
     Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
 
-    manager = new AriesTransactionManagerImpl();
+    manager = com.arjuna.ats.jta.TransactionManager.transactionManager();
 
     String className = "org.apache.derby.jdbc.EmbeddedDriver";
     Class.forName(className).newInstance();
 
-    dataSource = BaseDB.createXADataSource(BaseDB.NAME_DB1, BaseDB.URL_DB1, manager);
+    dataSource = BaseDB.createXADataSource( BaseDB.URL_DB1, manager );
   }
 
   @AfterAll
diff --git a/src/test/java/org/mybatis/guice/jta/JtaXaTest.java b/src/test/java/org/mybatis/guice/jta/JtaXaTest.java
index ad72cb7a..288a65b9 100644
--- a/src/test/java/org/mybatis/guice/jta/JtaXaTest.java
+++ b/src/test/java/org/mybatis/guice/jta/JtaXaTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,20 +21,15 @@
 import com.google.inject.Injector;
 import com.google.inject.PrivateModule;
 
+import jakarta.transaction.TransactionManager;
+
 import java.util.List;
 
 import javax.sql.DataSource;
 
-import org.apache.aries.transaction.AriesTransactionManager;
-import org.apache.aries.transaction.internal.AriesTransactionManagerImpl;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.mapping.VendorDatabaseIdProvider;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.*;
 import org.mybatis.guice.MyBatisJtaModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,7 +37,7 @@
 class JtaXaTest {
   private static final Logger LOGGER = LoggerFactory.getLogger(JtaXaTest.class);
 
-  static AriesTransactionManager manager;
+  static TransactionManager manager;
   static DataSource dataSource1;
   static DataSource dataSource2;
 
@@ -50,10 +45,10 @@ class JtaXaTest {
   static void setUpBeforeClass() throws Exception {
     Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
 
-    manager = new AriesTransactionManagerImpl();
+    manager = com.arjuna.ats.jta.TransactionManager.transactionManager();
 
-    dataSource1 = BaseDB.createXADataSource(BaseDB.NAME_DB1, BaseDB.URL_DB1, manager);
-    dataSource2 = BaseDB.createXADataSource(BaseDB.NAME_DB2, BaseDB.URL_DB2, manager);
+    dataSource1 = BaseDB.createXADataSource( BaseDB.URL_DB1, manager );
+    dataSource2 = BaseDB.createXADataSource( BaseDB.URL_DB2, manager );
   }
 
   @AfterAll
diff --git a/src/test/java/org/mybatis/guice/jta/simple/Utils.java b/src/test/java/org/mybatis/guice/jta/simple/Utils.java
index 3c5d94f1..c4113dcb 100644
--- a/src/test/java/org/mybatis/guice/jta/simple/Utils.java
+++ b/src/test/java/org/mybatis/guice/jta/simple/Utils.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2023 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,16 +15,20 @@
  */
 package org.mybatis.guice.jta.simple;
 
-import java.util.Properties;
+import com.arjuna.ats.arjuna.recovery.RecoveryManager;
+import io.agroal.api.AgroalDataSource;
+import io.agroal.api.configuration.supplier.AgroalDataSourceConfigurationSupplier;
+import io.agroal.api.security.NamePrincipal;
+import io.agroal.api.security.SimplePassword;
+import io.agroal.narayana.NarayanaTransactionIntegration;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.TransactionSynchronizationRegistry;
+import org.mybatis.guice.multidstest.MockInitialContextFactory;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
-
-import org.apache.aries.transaction.AriesTransactionManager;
-import org.apache.aries.transaction.internal.AriesTransactionManagerImpl;
-import org.apache.aries.transaction.jdbc.RecoverableDataSource;
-import org.hsqldb.jdbc.pool.JDBCXADataSource;
-import org.mybatis.guice.multidstest.MockInitialContextFactory;
+import javax.sql.DataSource;
+import java.util.Properties;
 
 public class Utils {
 
@@ -38,41 +42,41 @@ public static void setupMockJNDI() throws Exception {
     properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, MockInitialContextFactory.class.getName());
     InitialContext ic = new InitialContext(properties);
 
-    AriesTransactionManager tm = new AriesTransactionManagerImpl();
-    ic.bind("javax.transaction.TransactionManager", tm);
+    TransactionManager tm = com.arjuna.ats.jta.TransactionManager.transactionManager();
+    TransactionSynchronizationRegistry transactionSynchronizationRegistry
+            = new com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionSynchronizationRegistryImple();
+    // intitialization of recovery manager
+    RecoveryManager recoveryManager
+            = com.arjuna.ats.arjuna.recovery.RecoveryManager.manager();
+    recoveryManager.initialize();
 
-    JDBCXADataSource ds1 = new JDBCXADataSource();
-    ds1.setDatabaseName("schema1");
-    ds1.setUser("sa");
-    ds1.setPassword("");
-    ds1.setUrl("jdbc:hsqldb:mem:schema1");
+    ic.bind("javax.transaction.TransactionManager", tm);
 
-    RecoverableDataSource rds1 = new RecoverableDataSource();
-    rds1.setDataSource(ds1);
-    rds1.setUsername("sa");
-    rds1.setPassword("");
-    rds1.setTransactionManager(tm);
-    rds1.setTransaction("xa");
-    rds1.setName("DS1");
-    rds1.start();
+    DataSource ads1 = AgroalDataSource
+            .from( new AgroalDataSourceConfigurationSupplier().connectionPoolConfiguration(
+                    cp -> cp.maxSize( 10 )
+                            .connectionFactoryConfiguration( cf -> cf.jdbcUrl( "jdbc:hsqldb:mem:schema1" )
+                                                                     .principal( new NamePrincipal( "sa" ) ).credential(
+                                            new SimplePassword( "" ) ) )
+                            .transactionIntegration(
+                                    new NarayanaTransactionIntegration(
+                                            tm, transactionSynchronizationRegistry,
+                                            "java:/agroalds1", false ) ) ) );
 
-    ic.bind("java:comp/env/jdbc/DS1", rds1);
+    ic.bind("java:comp/env/jdbc/DS1", ads1);
 
-    JDBCXADataSource ds2 = new JDBCXADataSource();
-    ds2.setDatabaseName("schema2");
-    ds2.setUser("sa");
-    ds2.setPassword("");
-    ds2.setUrl("jdbc:hsqldb:mem:schema2");
 
-    RecoverableDataSource rds2 = new RecoverableDataSource();
-    rds2.setDataSource(ds2);
-    rds2.setUsername("sa");
-    rds2.setPassword("");
-    rds2.setTransactionManager(tm);
-    rds2.setTransaction("xa");
-    rds2.setName("DS2");
-    rds2.start();
+    DataSource ads2 = AgroalDataSource
+            .from( new AgroalDataSourceConfigurationSupplier().connectionPoolConfiguration(
+                    cp -> cp.maxSize( 10 )
+                            .connectionFactoryConfiguration( cf -> cf.jdbcUrl( "jdbc:hsqldb:mem:schema2" )
+                                                                     .principal( new NamePrincipal( "sa" ) ).credential(
+                                            new SimplePassword( "" ) ) )
+                            .transactionIntegration(
+                                    new NarayanaTransactionIntegration(
+                                            tm, transactionSynchronizationRegistry,
+                                            "java:/agroalds2", false ) ) ) );
 
-    ic.bind("java:comp/env/jdbc/DS2", rds2);
+    ic.bind("java:comp/env/jdbc/DS2", ads2);
   }
 }

From 08f916d6bd9d027d169fa4d4653407b5add39a03 Mon Sep 17 00:00:00 2001
From: Stein Desmet <stein.desmet@lin-k.net>
Date: Mon, 28 Aug 2023 15:45:14 +0200
Subject: [PATCH 3/3] Replace wilcard imports

---
 .../org/mybatis/guice/MyBatisJtaModule.java   | 13 +++---
 .../org/mybatis/guice/MyBatisModuleTest.java  | 44 +++++++++++++------
 .../java/org/mybatis/guice/jta/BaseDB.java    |  6 ++-
 .../org/mybatis/guice/jta/JtaLocalTest.java   |  7 ++-
 .../java/org/mybatis/guice/jta/JtaXaTest.java | 20 +++++----
 5 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/src/main/java/org/mybatis/guice/MyBatisJtaModule.java b/src/main/java/org/mybatis/guice/MyBatisJtaModule.java
index 4a0e9291..8c3663c7 100644
--- a/src/main/java/org/mybatis/guice/MyBatisJtaModule.java
+++ b/src/main/java/org/mybatis/guice/MyBatisJtaModule.java
@@ -15,14 +15,8 @@
  */
 package org.mybatis.guice;
 
-import static com.google.inject.matcher.Matchers.*;
-import static org.mybatis.guice.Preconditions.checkArgument;
-
 import jakarta.inject.Provider;
 import jakarta.transaction.TransactionManager;
-
-import javax.transaction.xa.XAResource;
-
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.transaction.TransactionFactory;
@@ -33,6 +27,13 @@
 import org.mybatis.guice.transactional.TxTransactionalMethodInterceptor;
 import org.mybatis.guice.transactional.XASqlSessionManagerProvider;
 
+import javax.transaction.xa.XAResource;
+
+import static com.google.inject.matcher.Matchers.annotatedWith;
+import static com.google.inject.matcher.Matchers.any;
+import static com.google.inject.matcher.Matchers.not;
+import static org.mybatis.guice.Preconditions.checkArgument;
+
 public abstract class MyBatisJtaModule extends MyBatisModule {
   private final Log log = LogFactory.getLog(getClass());
 
diff --git a/src/test/java/org/mybatis/guice/MyBatisModuleTest.java b/src/test/java/org/mybatis/guice/MyBatisModuleTest.java
index e7623459..0b197486 100644
--- a/src/test/java/org/mybatis/guice/MyBatisModuleTest.java
+++ b/src/test/java/org/mybatis/guice/MyBatisModuleTest.java
@@ -15,19 +15,12 @@
  */
 package org.mybatis.guice;
 
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
-import com.google.inject.*;
-
+import com.google.inject.CreationException;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.TypeLiteral;
 import jakarta.inject.Provider;
-
-import java.sql.SQLException;
-import java.util.*;
-
-import javax.sql.DataSource;
-
 import org.apache.ibatis.io.ResolverUtil;
 import org.apache.ibatis.mapping.DatabaseIdProvider;
 import org.apache.ibatis.mapping.Environment;
@@ -35,7 +28,12 @@
 import org.apache.ibatis.reflection.factory.DefaultObjectFactory;
 import org.apache.ibatis.reflection.wrapper.DefaultObjectWrapperFactory;
 import org.apache.ibatis.scripting.defaults.RawLanguageDriver;
-import org.apache.ibatis.session.*;
+import org.apache.ibatis.session.AutoMappingBehavior;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.LocalCacheScope;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.transaction.TransactionFactory;
 import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
 import org.apache.ibatis.type.Alias;
@@ -64,6 +62,26 @@
 import org.mybatis.guice.resolver.typehandler.AddressTypeHandler;
 import org.mybatis.guice.resolver.typehandler.UserTypeHandler;
 
+import javax.sql.DataSource;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 @ExtendWith(MockitoExtension.class)
 class MyBatisModuleTest {
   @Mock
diff --git a/src/test/java/org/mybatis/guice/jta/BaseDB.java b/src/test/java/org/mybatis/guice/jta/BaseDB.java
index 0b966d6b..bdad68b5 100644
--- a/src/test/java/org/mybatis/guice/jta/BaseDB.java
+++ b/src/test/java/org/mybatis/guice/jta/BaseDB.java
@@ -26,7 +26,11 @@
 import org.slf4j.LoggerFactory;
 
 import javax.sql.DataSource;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/src/test/java/org/mybatis/guice/jta/JtaLocalTest.java b/src/test/java/org/mybatis/guice/jta/JtaLocalTest.java
index 01dfe7db..8406f089 100644
--- a/src/test/java/org/mybatis/guice/jta/JtaLocalTest.java
+++ b/src/test/java/org/mybatis/guice/jta/JtaLocalTest.java
@@ -21,7 +21,12 @@
 import jakarta.transaction.TransactionManager;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.mapping.VendorDatabaseIdProvider;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 import org.mybatis.guice.MyBatisJtaModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test/java/org/mybatis/guice/jta/JtaXaTest.java b/src/test/java/org/mybatis/guice/jta/JtaXaTest.java
index 288a65b9..75a3b5bb 100644
--- a/src/test/java/org/mybatis/guice/jta/JtaXaTest.java
+++ b/src/test/java/org/mybatis/guice/jta/JtaXaTest.java
@@ -15,25 +15,27 @@
  */
 package org.mybatis.guice.jta;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.PrivateModule;
-
 import jakarta.transaction.TransactionManager;
-
-import java.util.List;
-
-import javax.sql.DataSource;
-
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.mapping.VendorDatabaseIdProvider;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
 import org.mybatis.guice.MyBatisJtaModule;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.sql.DataSource;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 class JtaXaTest {
   private static final Logger LOGGER = LoggerFactory.getLogger(JtaXaTest.class);