diff --git a/Jenkinsfile b/Jenkinsfile index 68d5ff909746390e066b0536415c8385e7c263c4..815fc700f7707a67eb5c60d2df53fe79e7347fbd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,15 +57,15 @@ pipeline { steps { script { FAILED_STAGE=env.STAGE_NAME - JAR_TAG = getPomVersion('pom.xml').replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT") + VORGANG_MANAGER_TAG = getPomVersion('pom.xml').replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT"); BESCHEID_MANAGER_TAG = getPomVersion('bescheid-manager/pom.xml').replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT") - updateBescheidManagerDependencyVersion(BESCHEID_MANAGER_TAG) + updateDependencyVersions(BESCHEID_MANAGER_TAG, VORGANG_MANAGER_TAG) } configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { - sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true" + sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${VORGANG_MANAGER_TAG} -DprocessAllModules=true -X" dir('bescheid-manager') { - sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${BESCHEID_MANAGER_TAG}" + sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${BESCHEID_MANAGER_TAG} -X" } } } @@ -297,11 +297,16 @@ String getPomVersion(String pomFile){ return pom.version } -void updateBescheidManagerDependencyVersion(String snapshotVersion) { +void updateDependencyVersions(String bescheidManagerSnapshotVersion, String vorgangManagerSnapshotVersion) { def vorgangManagerServerPom = readMavenPom file: 'vorgang-manager-server/pom.xml' if ( vorgangManagerServerPom.properties['bescheid-manager.version'] ==~ SNAPSHOT_REGEX ) { - vorgangManagerServerPom.properties['bescheid-manager.version'] = snapshotVersion + vorgangManagerServerPom.properties['bescheid-manager.version'] = bescheidManagerSnapshotVersion writeMavenPom model: vorgangManagerServerPom, file: 'vorgang-manager-server/pom.xml' + + def bescheidManagerServerPom = readMavenPom file: 'bescheid-manager/pom.xml' + if ( bescheidManagerServerPom.properties['vorgang-manager.version'] ==~ SNAPSHOT_REGEX ) { + bescheidManagerServerPom.properties['vorgang-manager.version'] = vorgangManagerSnapshotVersion + writeMavenPom model: bescheidManagerServerPom, file: 'bescheid-manager/pom.xml' } }