diff --git a/build/Jenkinsfile b/build/Jenkinsfile index 4beea255c..f442af6a9 100644 --- a/build/Jenkinsfile +++ b/build/Jenkinsfile @@ -26,7 +26,7 @@ pipeline { steps { script { withCredentials([file(credentialsId: 'ngx', variable: 'ROOT_CERT'),file(credentialsId:'m2', variable: 'SETTINGS')]) { - docker.image('maven:3.8.1-jdk-8').inside("-u root --network=jenkins_default") { + docker.image('maven:3.8.1-jdk-8').inside("-u root --network=circle_net") { sh 'cp $ROOT_CERT /usr/local/share/ca-certificates/ && update-ca-certificates && cp $SETTINGS /root/.m2' sh 'mvn -B clean package' } diff --git a/pom.xml b/pom.xml index 22294ac85..16bc929e3 100644 --- a/pom.xml +++ b/pom.xml @@ -353,7 +353,7 @@ maven-central maven-central - https://web + https://webnginx false diff --git a/precommit/Jenkinsfile b/precommit/Jenkinsfile index 1dd738125..a4d739c46 100644 --- a/precommit/Jenkinsfile +++ b/precommit/Jenkinsfile @@ -26,7 +26,7 @@ pipeline { steps { script { withCredentials([file(credentialsId: 'ngx', variable: 'ROOT_CERT'),file(credentialsId:'m2', variable: 'SETTINGS')]) { - docker.image('maven:3.8.1-jdk-8').inside("-u root --network=jenkins_default") { + docker.image('maven:3.8.1-jdk-8').inside("-u root --network=circle_net") { sh 'cp $ROOT_CERT /usr/local/share/ca-certificates/ && update-ca-certificates && cp $SETTINGS /root/.m2' sh 'mvn -B clean package' } diff --git a/promotion/Jenkinsfile b/promotion/Jenkinsfile index 85247b5e6..da9b496b8 100644 --- a/promotion/Jenkinsfile +++ b/promotion/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { steps { script { withCredentials([file(credentialsId: 'ngx', variable: 'ROOT_CERT'),file(credentialsId:'m2', variable: 'SETTINGS')]) { - docker.image('maven:3.8.1-jdk-8').inside("-u root --network=jenkins_default") { + docker.image('maven:3.8.1-jdk-8').inside("-u root --network=circle_net") { sh 'cp $ROOT_CERT /usr/local/share/ca-certificates/ && update-ca-certificates && cp $SETTINGS /root/.m2' sh 'mvn release:perform' } @@ -25,12 +25,21 @@ pipeline { } } stage('version') {//change version number + steps { + script { + pom = readMavenPom file: "pom.xml"; + echo: "***version ${pom.version}"; + String xStr=${pom.version}; + String remv_last = xStr.substring(xStr.indexOf("/") + 1); + int new_version=remv_last.toInteger()+1; + } script { - pom = readMavenPom file: "pom.xml"; - VERSION_NUMBER = VersionNumber(versionNumberString: "${pom.version}") + VERSION_NUMBER = VersionNumber(versionNumberString: "${new_version}") currentBuild.displayName = "${VERSION_NUMBER}" sh "ant -Dversion=${VERSION_NUMBER} build" } + } + } stage('publish to nexus') { steps { @@ -82,7 +91,7 @@ pipeline { stage('image build and load') { steps { script {} - docker.build registry + ":$BUILD_NUMBER"//change version number + docker.build registry + ":${VERSION_NUMBER}"//change version number } script { docker.withRegistry( '', REGISTRY_CREDENTIAL ) {