From c1ec298e1c3bfbbc52161156cb19d2669c3a5d6c Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Nov 2023 20:01:12 -0400
Subject: [PATCH 1/4] [pom] Prepare for new site distro

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 25d857e0..a1fbd2d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,9 +27,9 @@
     <relativePath />
   </parent>
 
+  <groupId>org.mybatis</groupId>
   <artifactId>mybatis-guice</artifactId>
   <version>3.19-SNAPSHOT</version>
-  <packaging>jar</packaging>
 
   <name>mybatis-guice</name>
   <description>The MyBatis Guice module is easy-to-use Google Guice bridge for MyBatis sql mapping framework.</description>
@@ -66,7 +66,7 @@
 
   <scm>
     <url>http://github.com/mybatis/guice</url>
-    <connection>scm:git:ssh://github.com/mybatis/guice.git</connection>
+    <connection>scm:git:ssh://git@github.com/mybatis/guice.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/mybatis/guice.git</developerConnection>
     <tag>HEAD</tag>
   </scm>
@@ -80,9 +80,9 @@
   </ciManagement>
   <distributionManagement>
     <site>
-      <id>gh-pages</id>
+      <id>gh-pages-scm</id>
       <name>Mybatis GitHub Pages</name>
-      <url>git:ssh://git@github.com/mybatis/guice.git?gh-pages#</url>
+      <url>scm:git:ssh://git@github.com/mybatis/guice.git</url>
     </site>
   </distributionManagement>
 

From 3f6fd4070ba99f9222d375ec83f4d9565923a7cf Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Nov 2023 20:42:58 -0400
Subject: [PATCH 2/4] [pom] Remove snapshots usage as noted reason addressed

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

diff --git a/pom.xml b/pom.xml
index a1fbd2d0..1c0e731d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -394,20 +394,6 @@
     </dependency>
   </dependencies>
 
-  <!-- TODO: Allow pull from snapshots while on mybatis parent snapshot, remove once finalized -->
-  <repositories>
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>oss.sonatype.org-snapshot</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </repository>
-  </repositories>
-
   <build>
     <plugins>
       <plugin>

From 8c7370752885eb19a2fbaf5e6388aa915f4e1433 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Nov 2023 20:45:21 -0400
Subject: [PATCH 3/4] [pom] Bump geronimo connector to 4.0.0 and remove
 exclusions for jakarta

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

diff --git a/pom.xml b/pom.xml
index 1c0e731d..5a663ebc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -343,20 +343,6 @@
       <artifactId>geronimo-connector</artifactId>
       <version>4.0.0</version>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.geronimo.components</groupId>
-          <artifactId>geronimo-transaction</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-validation_1.0_spec</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>

From a87f4eaa7eb2cc355ae1842bbf04565edb291516 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Fri, 3 Nov 2023 20:45:34 -0400
Subject: [PATCH 4/4] [pom] Remove legacy exclusions from guice

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

diff --git a/pom.xml b/pom.xml
index 5a663ebc..f5b09603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,16 +121,6 @@
       <artifactId>guice</artifactId>
       <version>${guice.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>javax.inject</groupId>
-          <artifactId>javax.inject</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.google.code.findbugs</groupId>
-          <artifactId>jsr305</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>jakarta.inject</groupId>