diff --git a/Jenkinsfile b/Jenkinsfile index 2bc7a8258c780f62608db6611c63f8899183a7a2..d70d4193a939c1b097d6c46db850fb1194a8367c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,13 +58,17 @@ pipeline { script { FAILED_STAGE=env.STAGE_NAME JAR_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) } configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true" - + dir('bescheid-manager') { + sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${BESCHEID_MANAGER_TAG}" + } } } - } + } stage('Build VorgangManager') { steps { @@ -284,6 +288,14 @@ String getPomVersion(String pomFile){ return pom.version } +void updateBescheidManagerDependencyVersion(String snapshotVersion) { + def vorgangManagerServerPom = readMavenPom file: 'vorgang-manager-server/pom.xml' + if ( vorgangManagerServerPom.properties['bescheid-manager.version'] ==~ SNAPSHOT_REGEX ) { + vorgangManagerServerPom.properties['bescheid-manager.version'] = snapshotVersion + writeMavenPom model: vorgangManagerServerPom, file: 'vorgang-manager-server/pom.xml' + } +} + String generateImageTag(String pomFile) { def imageTag = "${env.BRANCH_NAME}-${getPomVersion(pomFile)}"