diff --git a/Jenkinsfile b/Jenkinsfile index d043ded..3467d80 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -166,9 +166,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 +182,4 @@ def SetVersion( v ) { } } -return this +return this \ No newline at end of file diff --git a/pom.xml b/pom.xml index da01103..e922773 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ Logger library for applications - ssh://git@devops.locusworks.net:7999/lwc/application-logger.git + ssh://git@bitbucket.locusworks.net:7999/lwc/applogger.git locusworks @@ -22,14 +22,23 @@ 1.8 2.12.0 1.7.26 + http://nexus.locusworks.net + + org.apache.maven.plugins + maven-surefire-plugin + 2.20.1 + + always + + org.apache.maven.plugin maven-compiler-plugin - 3.6.1 + 3.7.0 1.8 1.8 @@ -69,25 +78,26 @@ nexus-proxy-public - http://devops.locusworks.net:8081/repository/maven-public/ + ${nexus.repo}/repository/maven-public/ nexus-proxy-public - http://devops.locusworks.net:8081/repository/maven-public/ + ${nexus.repo}/repository/maven-public/ nexus-snapshot - http://devops.locusworks.net:8081/repository/locusworks-snapshot/ + ${nexus.repo}/repository/locusworks-snapshot/ nexus-release - http://devops.locusworks.net:8081/repository/locusworks-release/ + ${nexus.repo}/repository/locusworks-release/ + \ No newline at end of file