Merge pull request #629 from hazendaz/master

Drop geronimo connector as not used / Sort ejb with other EE apis as required and not for reason stated

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
     -->
@@ -324,13 +319,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>

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.