Merge pull request #866 from IETS3/merge/mps20222

Merge maintenance/mps20222 into maintenance/mps20223
IETS3 · Mar 20, 2024 · e554bd0 · e554bd0
2 parents 5a4af76 + 0d3e0b8
commit e554bd0
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -86,12 +86,10 @@ if (project.hasProperty('iets3OpenSourceVersion')) {
         def buildNumber = System.env.BUILD_NUMBER.toInteger()
         if (currentBranch.startsWith("maintenance-")) {
             version = "$major.$minor.$buildNumber.${GitBasedVersioning.gitShortCommitHash}"
-        } else if (currentBranch.startsWith("datev-loon-staging-") || currentBranch.startsWith("datev-steuer-staging-")){
-            // branch name will be part of the version
-            version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber)
         } else {
-            version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber) + "-SNAPSHOT"
-        }
+            def isSnapshot = !(currentBranch.equals("master") || currentBranch.startsWith("datev-loon-staging-") || currentBranch.startsWith("datev-steuer-staging-"))
+            version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber) + (isSnapshot ? "-SNAPSHOT" : "")
+        } 
         println "##teamcity[buildNumber '${version}']"
     } else {
         version = "$major.$minor-SNAPSHOT"