Use better version descriptors.

buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle

@@ -61,15 +61,19 @@ java {
 
 jar {
     manifest {
-        inputs.property("gitDescriptor", { grgit.describe(always: true) })
+        def matchExpr = [ project.tagName + "*" ]
+        
+        inputs.property("gitDescriptor",
+            { grgit.describe(always: true, match: matchExpr) })
         
         // Set Git revision information in the manifests of built bundles
+        def gitDesc = grgit.describe(always: true, match: matchExpr)
         attributes([
             "Implementation-Title": project.name,
-            "Implementation-Version": "$project.version (built from ${grgit.describe(always: true)})",
+            "Implementation-Version": "$project.version (built from ${gitDesc})",
             "Implementation-Vendor": grgit.repository.jgit.repository.config.getString("user", null, "name")
                 + " (" + grgit.repository.jgit.repository.config.getString("user", null, "email") + ")",
-            "Git-Descriptor": grgit.describe(always: true),
+            "Git-Descriptor": gitDesc,
             "Git-SHA": grgit.head().id,
         ])
     }

buildSrc/src/org.jdrupes.vmoperator.versioning-conventions.gradle

@@ -11,22 +11,24 @@ plugins {
     id 'pl.allegro.tech.build.axion-release'
 }
 
-scmVersion {
-    versionIncrementer 'incrementMinor'
-    tag {
 def shortened = project.name.startsWith(project.group + ".") ?
     project.name.substring(project.group.length() + 1) : project.name
 if (shortened == "manager") {
     shortened = "manager-app";
 }
-        var p = shortened.replace('.', '-') + "-"
+var tagName = shortened.replace('.', '-') + "-"
 if (grgit.branch.current.name != "main"
     && grgit.branch.current.name != "HEAD"
     && !grgit.branch.current.name.startsWith("release")
     && !grgit.branch.current.name.startsWith("develop")) {
-            p = p + grgit.branch.current.name.replace('/', '-') + "-"
+    tagName = tagName + grgit.branch.current.name.replace('/', '-') + "-"
 }
-        prefix = p
+project.ext.tagName = tagName
+
+scmVersion {
+    versionIncrementer 'incrementMinor'
+    tag {
+        prefix = project.tagName
     }
 }
 project.version = scmVersion.version