adjust JenkinsFile#buildImageTag

Jenkinsfile

@@ -373,15 +373,29 @@ String getPomVersion(String pomFile){
 }
 
 String generateImageTag() {
-    def imageTag = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
+	if (isReleaseBranch()) {
+        return getPomVersion()
+    }
 
-    if (env.BRANCH_NAME == 'main') {
-        imageTag += "-${env.GIT_COMMIT.take(7)}"
+    return "${getPomVersion()}-${validateBranchName(env.BRANCH_NAME)}${getCommitHash()}".replaceAll("_", "-")
 }
 
-    return imageTag
+String validateBranchName(branchName) {
+    int maxLength = 20
+    if (branchName.length() > maxLength) {
+        String originalBranchName = branchName
+        branchName = branchName.substring(0, maxLength)
+        echo "WARNING: Branch name '${originalBranchName}' exceeded ${maxLength} characters. " +
+             "It has been truncated to '${branchName}' for deployment purposes."
+    }
+    return branchName
 }
 
+String getCommitHash() {
+    return "-${env.GIT_COMMIT.take(7)}";
+}
+
+
 String getParentPomVersion(String filePath) {
     def pom = readMavenPom file: filePath
     return pom.parent.version