Use branch names in version.

2023-09-12 11:48:45 +02:00 · 2023-09-12 11:48:45 +02:00 · ffeaf31534
commit ffeaf31534
parent 72beccc8cd
1 changed files with 6 additions and 1 deletions
--- a/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle
+++ b/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle
@ -63,7 +63,12 @@ scmVersion {
    tag {
        def shortened = project.name.startsWith(project.group + ".") ?
            project.name.substring(project.group.length() + 1) : project.name
-        prefix = shortened.replace('.', '-') + "-"
+        var p = shortened.replace('.', '-') + "-"
+        if (grgit.branch.current.name != "main"
+            && !grgit.branch.current.name.startsWith("release")) {
+            p = p + grgit.branch.current.name.replace('/', '-') + "-"
+        }
+        prefix = p
    }
 }
 version = scmVersion.version