Merge pull request 'develop' (#1) from develop into master

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}"
+  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) {

pom.xml

@@ -20,8 +20,9 @@
 		<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>
@@ -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>