From 3d1b1e8d42845d2ee5154d24a70224f4015fd04d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 27 Aug 2024 08:13:25 +0200
Subject: [PATCH] OZG-4833 dependency track

---
 Jenkinsfile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index acae784ea0..1c25a630ac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -250,15 +250,18 @@ 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()
 
-                        dir('alfa-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=' + generateImageTag() + ' -Ddependency-track.dependencyTrackBaseUrl=https://dependency-track.ozg-sh.de'
+                    configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+                        withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
+
+                            dir('alfa-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"
+                                }
                             }
                         }
-                    }
                 }
             }
         }
-- 
GitLab