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 d9f2d26..9066d15 100644 --- a/pom.xml +++ b/pom.xml @@ -20,13 +20,14 @@ ${project.basedir} 1.8 1.8 - 2.12.0 - 1.7.26 + 2.13.0 + 1.7.30 + https://nexus.locusworks.net - + org.apache.maven.plugins maven-surefire-plugin 2.20.1 @@ -74,4 +75,42 @@ + + + nexus-snapshot + ${nexus.repo}/repository/locusworks-snapshot/ + + + nexus-release + ${nexus.repo}/repository/locusworks-release/ + + + + + + locusworks-public + locusworks-public + ${nexus.repo}/repository/locusworks-public/ + + true + + + true + + + + + + + locusworks-public + ${nexus.repo}/repository/locusworks-public/ + + true + + + true + + + + \ No newline at end of file