From 64da48c5c44a2369f47a88399fccd1f732d3f94c Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 30 Aug 2024 16:19:57 +0200
Subject: [PATCH] OZG-5899 adjust Jenkinsfile to update vorgang-managar version
 as well

---
 Jenkinsfile | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 68d5ff909..815fc700f 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' 
     }
 }
 
-- 
GitLab