From 8f7f6c8653def0d295f38efb796a99c7533b3d32 Mon Sep 17 00:00:00 2001
From: Isaac Parenteau <locus2k@gmail.com>
Date: Fri, 22 May 2020 22:59:23 -0500
Subject: [PATCH] Fixed Jenkinsfile

---
 Jenkinsfile | 17 +++++++++--------
 pom.xml     | 41 +++++++++++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3467d80..3b19af3 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',
+    globalMavenSettingsConfig: '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) {
diff --git a/pom.xml b/pom.xml
index 4f76df7..890f233 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 		<main.basedir>${project.basedir}</main.basedir>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
-		<nexus.repo>http://nexus.locusworks.net</nexus.repo>
+		<nexus.repo>https://nexus.locusworks.net</nexus.repo>
 	</properties>
 
 	<build>
@@ -48,19 +48,6 @@
 
 	</dependencies>
 
-	<repositories>
-		<repository>
-			<id>nexus-proxy-public</id>
-			<url>${nexus.repo}/repository/maven-public/</url>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>nexus-proxy-public</id>
-			<url>${nexus.repo}/repository/maven-public/</url>
-		</pluginRepository>
-	</pluginRepositories>
-
 	<distributionManagement>
 		<snapshotRepository>
 			<id>nexus-snapshot</id>
@@ -72,4 +59,30 @@
 		</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