From 8afafce5f288d65c5deea7e8ffbbd0a41b5e0c00 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Nov 2023 22:17:18 -0400
Subject: [PATCH 1/3] [ci] formatting

---
 src/test/java/org/mybatis/guice/AddressConverter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/mybatis/guice/AddressConverter.java b/src/test/java/org/mybatis/guice/AddressConverter.java
index 85871fa7..3c5bdf30 100644
--- a/src/test/java/org/mybatis/guice/AddressConverter.java
+++ b/src/test/java/org/mybatis/guice/AddressConverter.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.

From 26f73926aad3143641ddc841f502e9b7a4b2d6dc Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Nov 2023 22:17:31 -0400
Subject: [PATCH 2/3] [pom] Remove geronimo connector as not used

---
 pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index ed0104b9..107b790f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -324,13 +324,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.geronimo.components</groupId>
-      <artifactId>geronimo-connector</artifactId>
-      <version>4.0.0</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-catalina</artifactId>

From c29312d6f13fde068041063cd80cbdc8e7cdc339 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Nov 2023 22:21:47 -0400
Subject: [PATCH 3/3] [pom] Sort ejb and remove comment that doesn't apply

---
 pom.xml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 107b790f..9a23a1b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,6 +125,12 @@
       <version>${guice.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.ejb</groupId>
+      <artifactId>jakarta.ejb-api</artifactId>
+      <version>${ejb-api.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>jakarta.inject</groupId>
       <artifactId>jakarta.inject-api</artifactId>
@@ -144,17 +150,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <!--
-     | https://github.com/brettwooldridge/HikariCP
-     | Java 8 thru 11 maven artifact:
-    -->
-    <dependency>
-      <groupId>jakarta.ejb</groupId>
-      <artifactId>jakarta.ejb-api</artifactId>
-      <version>${ejb-api.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
     <!--
      | Optional dependencies
     -->