Merge branch 'main' into OZG-7426-Dateitransfer-Eingang

Jenkinsfile

@@ -270,7 +270,7 @@ void deployHelmChart(String helmChartName, String helmChartVersion) {
 }
 
 def validateBranchName(branchName) {
-    int maxLength = 30
+    int maxLength = 20
     if (branchName.length() > maxLength) {
         String originalBranchName = branchName
         branchName = branchName.substring(0, maxLength)
@@ -284,7 +284,7 @@ String buildVersionName(String pomFile) {
     if (isReleaseBranch()) {
         return getPomVersion(pomFile)
     }
-    return "${getPomVersion(pomFile)}-${validateBranchName(env.BRANCH_NAME)}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
+    return "${getPomVersion(pomFile)}-${validateBranchName(env.BRANCH_NAME)}-${env.BUILD_NUMBER}".replaceAll("_", "-")
 }
 
 Void tagAndPushDockerImage(String imageName, String newTag){