From 6abe9a8b14218a00d4aa5a64846f9954a5c75101 Mon Sep 17 00:00:00 2001
From: Phil Calouche <philip.calouche@energyhub.net>
Date: Fri, 2 Aug 2024 22:21:44 -0400
Subject: [PATCH] deploy fixes

---
 .github/dependabot.yml                       |  3 ++-
 .github/workflows/continuous-delivery.yml    |  4 +++-
 .github/workflows/continuous-integration.yml |  2 +-
 .mvn/maven.config                            |  3 ++-
 .mvn/settings.xml                            | 15 +++++++++++++++
 Makefile                                     |  2 +-
 pom.xml                                      | 14 --------------
 7 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 .mvn/settings.xml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4e2b546..c32894f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,7 +6,8 @@ registries:
 updates:
   - package-ecosystem: "maven"
     directory: "/"
-    registries: "*"
+    registries:
+      - central
     schedule:
       interval: "monthly"
     target-branch: "main"
diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml
index 5621eda..500943f 100644
--- a/.github/workflows/continuous-delivery.yml
+++ b/.github/workflows/continuous-delivery.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - temp
 
 permissions:
   contents: read
@@ -28,6 +29,7 @@ jobs:
           distribution: 'temurin'
           cache: maven
       - name: Run Maven
-        run: mvn -T 4 -B clean deploy
+        run: mvn -B -s ./.mvn/settings.xml clean deploy
         env:
+          GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ github.token }}
\ No newline at end of file
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index e6b8f3e..58f2be0 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -28,4 +28,4 @@ jobs:
           distribution: 'temurin'
           cache: maven
       - name: Run Maven
-        run: mvn -T 4 -B clean verify
\ No newline at end of file
+        run: mvn -B -s ./.mvn/settings.xml clean verify
\ No newline at end of file
diff --git a/.mvn/maven.config b/.mvn/maven.config
index 6c10ee3..9348315 100644
--- a/.mvn/maven.config
+++ b/.mvn/maven.config
@@ -1,2 +1,3 @@
 -T4
--Pspring-forge-flatten
\ No newline at end of file
+-Pspring-forge-flatten
+--fail-at-end
\ No newline at end of file
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
new file mode 100644
index 0000000..a51680a
--- /dev/null
+++ b/.mvn/settings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd"
+  xmlns="http://maven.apache.org/SETTINGS/1.1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+  <servers>
+    <server>
+      <id>github-pcalouche-spring-forge</id>
+      <username>${env.GITHUB_ACTOR}</username>
+      <password>${env.GITHUB_TOKEN}</password>
+    </server>
+  </servers>
+
+</settings>
diff --git a/Makefile b/Makefile
index 20c6b9e..4ac9c6e 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ mvn-install-skip-tests: format
 # Check if version is a SNAPSHOT
 .PHONY: check-if-snapshot-version
 check-if-snapshot-version:
-	version="$(shell mvn help:evaluate -Dexpression=spring-enzymes.version -q -DforceStdout)" ; \
+	version="$(shell mvn help:evaluate -Dexpression=spring-forge.version -q -DforceStdout)" ; \
 	echo "version is $$version" ; \
 	if [[ $$version == *-SNAPSHOT ]]; then \
 		echo "Release version is a SNAPSHOT, so manual deploy can proceed." ; \
diff --git a/pom.xml b/pom.xml
index 4354ba7..4916771 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,20 +105,6 @@
     </dependencies>
   </dependencyManagement>
 
-  <repositories>
-    <repository>
-      <id>central</id>
-      <url>https://repo.maven.apache.org/maven2</url>
-    </repository>
-    <repository>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>github-pcalouche-spring-forge</id>
-      <url>https://maven.pkg.github.com/pcalouche/spring-forge</url>
-    </repository>
-  </repositories>
-
   <build>
     <!--
       Plugin management will not apply the plugin to a child POM. Rather it serves as a place to