From 74c5be70df8c832fac6343cecbc6627f4e62cb21 Mon Sep 17 00:00:00 2001
From: Isaac Parenteau <locus2k@gmail.com>
Date: Fri, 22 May 2020 18:54:22 +0100
Subject: [PATCH 1/3] updated pom.xml

---
 pom.xml | 45 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index d9f2d26..9066d15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,13 +20,14 @@
 		<main.basedir>${project.basedir}</main.basedir>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
-		<log4j.version>2.12.0</log4j.version>
-		<slf4j.version>1.7.26</slf4j.version>
+		<log4j.version>2.13.0</log4j.version>
+		<slf4j.version>1.7.30</slf4j.version>
+		<nexus.repo>https://nexus.locusworks.net</nexus.repo>
 	</properties>
 
 	<build>
 		<plugins>
-        	<plugin>
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.20.1</version>
@@ -74,4 +75,42 @@
 		</dependency>
 	</dependencies>
 
+	<distributionManagement>
+		<snapshotRepository>
+			<id>nexus-snapshot</id>
+			<url>${nexus.repo}/repository/locusworks-snapshot/</url>
+		</snapshotRepository>
+		<repository>
+			<id>nexus-release</id>
+			<url>${nexus.repo}/repository/locusworks-release/</url>
+		</repository>
+	</distributionManagement>
+
+	<repositories>
+		<repository>
+			<id>locusworks-public</id>
+			<name>locusworks-public</name>
+			<url>${nexus.repo}/repository/locusworks-public/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<pluginRepositories>
+		<pluginRepository>
+			<id>locusworks-public</id>
+			<url>${nexus.repo}/repository/locusworks-public/</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
+
 </project>
\ No newline at end of file

From f1baf6cbc91e6ec6b28bed93272ff6a874c5fcf7 Mon Sep 17 00:00:00 2001
From: Isaac Parenteau <locus2k@gmail.com>
Date: Fri, 22 May 2020 19:35:27 +0100
Subject: [PATCH 2/3] Fixed jenkins issue

---
 Jenkinsfile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3467d80..31db53b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -108,17 +108,18 @@ def getSha1() {
 }
 
 def mvn(args) {
-  // add node and maven tools to path before calling maven
-  def mvnHome = tool name: 'maven-3.6.1'
-  env.PATH = "${mvnHome}/bin:${env.PATH}"
-  sh "mvn ${args}"
+  withMaven(
+    maven: 'maven-3.6.1',
+    mavenSettingsConfig: 'locusworks-settings'
+  ) {
+  
+  	sh "mvn ${args}"
+  
+  }
 }
 
 def mvn_initial(args) {
-  // add node and maven tools to path before calling maven
-  def mvnHome = tool name: 'maven-3.6.1'
-  env.PATH = "${mvnHome}/bin:${env.PATH}"
-  sh "mvn ${args}"
+  mvn(args)
 }
 
 def set_result(status) {

From 5f0eb71d350ebd413e18611bb35b7160414f0e1b Mon Sep 17 00:00:00 2001
From: Isaac Parenteau <locus2k@gmail.com>
Date: Fri, 22 May 2020 19:47:50 +0100
Subject: [PATCH 3/3] referenced global maven settings

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 31db53b..3b19af3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -110,7 +110,7 @@ def getSha1() {
 def mvn(args) {
   withMaven(
     maven: 'maven-3.6.1',
-    mavenSettingsConfig: 'locusworks-settings'
+    globalMavenSettingsConfig: 'locusworks-settings'
   ) {
   
   	sh "mvn ${args}"