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

---
 Jenkinsfile | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d043ded..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) {
@@ -166,9 +167,9 @@ def SetVersion( v ) {
       version = branch_name_base + "." + build_number + "-RELEASE";
       //version = branch_name.substring('release/'.length()) + "." + build_number
       currentBuild.displayName = version
-    } else if (v == 'develop') {
+    } else if (v == 'develop') {
       version = branch_name_base + "." + build_number + "-SNAPSHOT";
-      currentBuild.displayName = version      
+      currentBuild.displayName = version      
     } else {
       // for all other branches the version number is 0 with an appended build number
       // and for the display name use the jenkins default #n and add the branch name
@@ -182,4 +183,4 @@ def SetVersion( v ) {
   }
 }
 
-return this
+return this
\ No newline at end of file