From 7aba39669582a3454908dafb5886079454383b23 Mon Sep 17 00:00:00 2001
From: Michael7371 <40476797+Michael7371@users.noreply.github.com>
Date: Mon, 23 Dec 2024 17:04:00 -0700
Subject: [PATCH 1/2] Combine GitHub Maven repositories to 1 wildcard
 repository to help with build times.

---
 .../jpo-deduplicator/settings.xml             | 28 +------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/jpo-deduplicator/jpo-deduplicator/settings.xml b/jpo-deduplicator/jpo-deduplicator/settings.xml
index eaee228..2a4f90b 100644
--- a/jpo-deduplicator/jpo-deduplicator/settings.xml
+++ b/jpo-deduplicator/jpo-deduplicator/settings.xml
@@ -9,16 +9,6 @@
             <username>jpo_deduplicator</username>
             <password>${env.MAVEN_GITHUB_TOKEN}</password>
         </server>
-        <server>
-            <id>github_jpo_ode</id>
-            <username>jpo_deduplicator</username>
-            <password>${env.MAVEN_GITHUB_TOKEN}</password>
-        </server>
-        <server>
-            <id>github_jpo_geojsonconverter</id>
-            <username>jpo_deduplicator</username>
-            <password>${env.MAVEN_GITHUB_TOKEN}</password>
-        </server>
     </servers>
     <profiles>
         <profile>
@@ -27,23 +17,7 @@
                 <repository>
                     <id>github</id>
                     <name>GitHub JPO Conflict Monitor</name>
-                    <url>https://maven.pkg.github.com/${env.MAVEN_GITHUB_ORG}/jpo-conflictmonitor</url>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </repository>
-                <repository>
-                    <id>github_jpo_ode</id>
-                    <name>GitHub JPO ODE</name>
-                    <url>https://maven.pkg.github.com/${env.MAVEN_GITHUB_ORG}/jpo-ode</url>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </repository>
-                <repository>
-                    <id>github_jpo_geojsonconverter</id>
-                    <name>GitHub JPO GeojsonConverter</name>
-                    <url>https://maven.pkg.github.com/${env.MAVEN_GITHUB_ORG}/jpo-geojsonconverter</url>
+                    <url>https://maven.pkg.github.com/${env.MAVEN_GITHUB_ORG}/*</url>
                     <snapshots>
                         <enabled>false</enabled>
                     </snapshots>

From c546b0b0e5cd66c6133576e03c0861dbcb0ed1e0 Mon Sep 17 00:00:00 2001
From: Michael7371 <40476797+Michael7371@users.noreply.github.com>
Date: Mon, 23 Dec 2024 17:17:36 -0700
Subject: [PATCH 2/2] adding docker caching to github actions

---
 .github/workflows/docker.yml    | 4 +++-
 .github/workflows/dockerhub.yml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index fb020e7..2a76f66 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -21,4 +21,6 @@ jobs:
             MAVEN_GITHUB_TOKEN=${{ secrets.MAVEN_GITHUB_TOKEN }}
             MAVEN_GITHUB_ORG=${{ github.repository_owner }}
           secrets: |
-            MAVEN_GITHUB_TOKEN: ${{ secrets.MAVEN_GITHUB_TOKEN }}
\ No newline at end of file
+            MAVEN_GITHUB_TOKEN: ${{ secrets.MAVEN_GITHUB_TOKEN }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
\ No newline at end of file
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index 00e2704..0dea5d5 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -36,4 +36,6 @@ jobs:
             MAVEN_GITHUB_TOKEN=${{ secrets.MAVEN_GITHUB_TOKEN }}
             MAVEN_GITHUB_ORG=${{ github.repository_owner }}
           secrets: |
-            MAVEN_GITHUB_TOKEN: ${{ secrets.MAVEN_GITHUB_TOKEN }}
\ No newline at end of file
+            MAVEN_GITHUB_TOKEN: ${{ secrets.MAVEN_GITHUB_TOKEN }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
\ No newline at end of file