Merge pull request 'OZG-5907 update jenkinsfile to upload jars from branches'...

Merge pull request 'OZG-5907 update jenkinsfile to upload jars from branches' (#6) from OZG-5907 into main

Jenkinsfile

@@ -43,32 +43,49 @@ pipeline {
             }
         }
 
-        stage('Build BayernIdProxy') {
+        stage('Set Version') {
+          when {
+            not {
+                anyOf {
+                    branch 'main'
+                    branch 'release'
+                }
+            }
+          }
           steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
+                    JAR_TAG = generateBranchPRJarTag('pom.xml')
                 }
+                configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+                    sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true"
                     
+                }
+          }
+        }   
+
+        stage('Build BayernIdProxy') {
+          steps {
+                script {
+                    FAILED_STAGE=env.STAGE_NAME
+                }
                 configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                     sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS clean install -Dmaven.wagon.http.retryHandler.count=3 -DelasticTests.disabled=true'
+                    
                 }
             }
         }
         
         stage('Deploy to Nexus'){
-            when {
-                anyOf {
-                    branch 'main'
-                    branch 'release'
-                }
-            }
             steps {
                 script {
                     FAILED_STAGE = env.STAGE_NAME
                 }
                 configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                     sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS -DskipTests deploy -Dmaven.wagon.http.retryHandler.count=3'
+                    sh "mvn -s $MAVEN_SETTINGS versions:revert"
                 }
+               
             }       
         }
 
@@ -109,6 +126,7 @@ pipeline {
             steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
+
                     HELM_CHART_VERSION_BAYERN_ID_PROXY = generateHelmChartVersion("pom.xml")
 
                     sh "./run_helm_test.sh"
@@ -271,6 +289,12 @@ String generateImageTag(String pomFile) {
     return imageTag
 }
 
+String generateBranchPRJarTag(String pomFile) {
+    def jarTag = getPomVersion(pomFile).replace("SNAPSHOT", "${env.BRANCH_NAME}-SNAPSHOT")
+
+    return jarTag
+}
+
 Void configureGit() {
     final email = "jenkins@ozg-sh.de"
     final name = "jenkins"