OZG-6988 do not use commit id for dependency track

Jenkinsfile

@@ -177,13 +177,13 @@ pipeline {
          stage ('Deploy SBOM to DependencyTrack') {
             steps {
                 script {
-                    IMAGE_TAG = buildVersionName()
+                    IMAGE_TAG_WO_COMMIT = buildVersionNameWithoutCommidId()
 
                     configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                         withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
 
                             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"
+                                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_WO_COMMIT} -Ddependency-track.dependencyTrackBaseUrl=https://dependency-track.ozg-sh.de"
                             }
                         }
                     }
@@ -242,6 +242,12 @@ String buildVersionName() {
     }
     return "${getPomVersion()}-${validateBranchName(env.BRANCH_NAME)}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
 }
+String buildVersionNameWithoutCommidId() {
+	if (isReleaseBranch()) {
+        return getPomVersion()
+    }
+    return "${getPomVersion()}-${validateBranchName(env.BRANCH_NAME)}}".replaceAll("_", "-")
+}
 
 String getPomVersion() {
     def pom = readMavenPom file: 'pom.xml'