Merge branch 'master' of git.ozg-sh.de:ozgcloud-app/vorgang-manager

Jenkinsfile

@@ -60,6 +60,7 @@ pipeline {
                     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"
@@ -89,6 +90,7 @@ pipeline {
                 }
                 configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                     sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS -DskipTests deploy -Dmaven.wagon.http.retryHandler.count=3'
+                    
                 }
             }
         }
@@ -103,6 +105,7 @@ pipeline {
                     dir('vorgang-manager-server') {
                         sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3'
                     }
+                    sh 'mvn -s $MAVEN_SETTINGS versions:revert'
                 }
            }
         }
@@ -111,10 +114,11 @@ pipeline {
             steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
+                    
                     IMAGE_TAG = generateImageTag('pom.xml')
 
                     tagAndPushDockerImage('vorgang-manager', IMAGE_TAG)
-
+                    
                     if (env.BRANCH_NAME == 'master') {
                         tagAndPushDockerImage('vorgang-manager', 'snapshot-latest')
                         tagAndPushDockerImage('vorgang-manager', 'e2e-test')
@@ -179,12 +183,17 @@ pipeline {
         
         stage ('Deploy SBOM to DependencyTrack') {
             steps {
-                configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
-                    withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
+                script {
+                    IMAGE_TAG = generateImageTag('pom.xml')
+
+                    configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+                        withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
 
-                        dir('vorgang-manager-server') {
-                            
-                            sh 'mvn  --no-transfer-progress -s $MAVEN_SETTINGS io.github.pmckeown:dependency-track-maven-plugin:upload-bom -Ddependency-track.apiKey=$API_KEY -Ddependency-track.projectVersion=' + generateImageTag('pom.xml') + ' -Ddependency-track.dependencyTrackBaseUrl=https://dependency-track.ozg-sh.de'
+                            dir('vorgang-manager-server') {
+                                catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
+                                    sh "mvn  --no-transfer-progress -s $MAVEN_SETTINGS io.github.pmckeown:dependency-track-maven-plugin:upload-bom -Ddependency-track.apiKey=$API_KEY -Ddependency-track.projectVersion=${IMAGE_TAG} -Ddependency-track.dependencyTrackBaseUrl=https://dependency-track.ozg-sh.de"
+                                }
+                            }
                         }
                     }
                 }