From b175b03ff500699882cce7ec270f36d3f1660b1f Mon Sep 17 00:00:00 2001
From: John-Wiens <jwiens3141@gmail.com>
Date: Tue, 26 Nov 2024 15:50:49 -0700
Subject: [PATCH 1/3] Adding Github Workflow to ConflictVisualizer

---
 .github/workflows/artifact-publish.yml      | 47 +++++++++++++++++++++
 api/jpo-conflictvisualizer-api/settings.xml | 19 +++++++--
 2 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/artifact-publish.yml

diff --git a/.github/workflows/artifact-publish.yml b/.github/workflows/artifact-publish.yml
new file mode 100644
index 00000000..7984e520
--- /dev/null
+++ b/.github/workflows/artifact-publish.yml
@@ -0,0 +1,47 @@
+name: Publish Java Package
+
+on:
+  # push:
+  #   tags:
+  #     - 'jpo-conflictvisualizer-*'
+  pull_request:
+    branches: [ "develop" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+
+    - name: Remove snapshot from version
+      run: |
+        cd api/jpo-conflictvisualizer-api
+        mvn versions:set -DremoveSnapshot
+
+    - name: Build with Maven
+      env:
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        MAVEN_GITHUB_TOKEN_NAME: ${{ vars.MAVEN_GITHUB_TOKEN_NAME }}
+        MAVEN_GITHUB_TOKEN: ${{ secrets.MAVEN_GITHUB_TOKEN }}
+        MAVEN_GITHUB_ORG: ${{ github.repository_owner }}
+      run: |
+        cd api/jpo-conflictvisualizer-api
+        mvn -s settings.xml -B package --file pom.xml -DskipTests -Ppackage-jar
+
+    - name: Publish to GitHub Packages
+      run: |
+        cd api/jpo-conflictvisualizer-api
+        mvn -s settings.xml --batch-mode -Dgithub_organization=${{ github.repository_owner }} deploy -DskipTests -Ppackage-jar
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        MAVEN_GITHUB_TOKEN_NAME: ${{ vars.MAVEN_GITHUB_TOKEN_NAME }}
+        MAVEN_GITHUB_TOKEN: ${{ secrets.MAVEN_GITHUB_TOKEN }}
+        MAVEN_GITHUB_ORG: ${{ github.repository_owner }}
\ No newline at end of file
diff --git a/api/jpo-conflictvisualizer-api/settings.xml b/api/jpo-conflictvisualizer-api/settings.xml
index 9972e620..20f55c32 100644
--- a/api/jpo-conflictvisualizer-api/settings.xml
+++ b/api/jpo-conflictvisualizer-api/settings.xml
@@ -4,19 +4,24 @@
         <activeProfile>default</activeProfile>
     </activeProfiles>
     <servers>
+        <server>
+            <id>github</id>
+            <username>jpo_conflictvisualizer</username>
+            <password>${env.MAVEN_GITHUB_TOKEN}</password>
+        </server>
         <server>
             <id>github_jpo_ode</id>
-            <username>jpo_conflictmonitor</username>
+            <username>jpo_conflictvisualizer</username>
             <password>${env.MAVEN_GITHUB_TOKEN}</password>
         </server>
         <server>
             <id>github_jpo_geojsonconverter</id>
-            <username>jpo_conflictmonitor</username>
+            <username>jpo_conflictvisualizer</username>
             <password>${env.MAVEN_GITHUB_TOKEN}</password>
         </server>
         <server>
             <id>github_jpo_conflictmonitor</id>
-            <username>jpo_conflictmonitor</username>
+            <username>jpo_conflictvisualizer</username>
             <password>${env.MAVEN_GITHUB_TOKEN}</password>
         </server>
     </servers>
@@ -24,6 +29,14 @@
         <profile>
             <id>default</id>
             <repositories>
+                <repository>
+                    <id>github</id>
+                    <name>GitHub Apache Maven Packages</name>
+                    <url>https://maven.pkg.github.com/${env.MAVEN_GITHUB_ORG}/jpo-ode</url>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </repository>
                 <repository>
                     <id>github_jpo_ode</id>
                     <name>GitHub JPO ODE</name>

From 57e4bff524f18cd2b67e65ee5da5b67795a13617 Mon Sep 17 00:00:00 2001
From: John-Wiens <jwiens3141@gmail.com>
Date: Tue, 26 Nov 2024 16:19:07 -0700
Subject: [PATCH 2/3] Switching POM to build for the Conflict Visualizer Repo

---
 api/jpo-conflictvisualizer-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/jpo-conflictvisualizer-api/pom.xml b/api/jpo-conflictvisualizer-api/pom.xml
index 16018516..b8b0362a 100644
--- a/api/jpo-conflictvisualizer-api/pom.xml
+++ b/api/jpo-conflictvisualizer-api/pom.xml
@@ -348,7 +348,7 @@
 		<repository>
 		<id>github</id>
 		<name>GitHub Packages</name>
-		<url>https://maven.pkg.github.com/${github_organization}/jpo-conflictmonitor</url>
+		<url>https://maven.pkg.github.com/${github_organization}/jpo-conflictvisualizer</url>
 		</repository>
 	</distributionManagement>
 

From 71a61728dda7b2a72303e85675361b61c3df81e6 Mon Sep 17 00:00:00 2001
From: John-Wiens <jwiens3141@gmail.com>
Date: Tue, 26 Nov 2024 17:17:21 -0700
Subject: [PATCH 3/3] Switching Artifact Publish back to release

---
 .github/workflows/artifact-publish.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/artifact-publish.yml b/.github/workflows/artifact-publish.yml
index 7984e520..e9900af7 100644
--- a/.github/workflows/artifact-publish.yml
+++ b/.github/workflows/artifact-publish.yml
@@ -1,11 +1,10 @@
 name: Publish Java Package
 
 on:
-  # push:
-  #   tags:
-  #     - 'jpo-conflictvisualizer-*'
-  pull_request:
-    branches: [ "develop" ]
+  push:
+    tags:
+      - 'jpo-conflictvisualizer-*'
+
 
 jobs:
   build: