diff --git a/Jenkinsfile b/Jenkinsfile index c6bd32fddbf7079dc0589fd7e2da3e4742078fac..6d1d654d2b9d74c90f81043299a17d6f5398b187 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,15 +58,9 @@ pipeline { script { FAILED_STAGE=env.STAGE_NAME 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") - - updateDependencyVersions(BESCHEID_MANAGER_TAG, VORGANG_MANAGER_TAG) } configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { 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} -X" - } } } } @@ -302,19 +296,6 @@ String getPomVersion(String pomFile){ return pom.version } -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'] = 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' - } -} - Void configureGit() { final email = "jenkins@ozg-sh.de" final name = "jenkins"