From 6213aa5970085ef782906bf554b60bfa9cebdd61 Mon Sep 17 00:00:00 2001
From: "Michael N. Lipp" <mnl@mnl.de>
Date: Mon, 10 Jun 2024 23:09:48 +0200
Subject: [PATCH] Use better version descriptors.

---
 ....vmoperator.java-common-conventions.gradle | 10 +++++--
 ...s.vmoperator.versioning-conventions.gradle | 28 ++++++++++---------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle b/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle
index 5185041..c7419fa 100644
--- a/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle
+++ b/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,
         ])
     }
diff --git a/buildSrc/src/org.jdrupes.vmoperator.versioning-conventions.gradle b/buildSrc/src/org.jdrupes.vmoperator.versioning-conventions.gradle
index 40ced48..a9e8dfe 100644
--- a/buildSrc/src/org.jdrupes.vmoperator.versioning-conventions.gradle
+++ b/buildSrc/src/org.jdrupes.vmoperator.versioning-conventions.gradle
@@ -11,22 +11,24 @@ plugins {
     id 'pl.allegro.tech.build.axion-release'
 }
 
+def shortened = project.name.startsWith(project.group + ".") ?
+    project.name.substring(project.group.length() + 1) : project.name
+if (shortened == "manager") {
+    shortened = "manager-app";
+}
+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")) {
+    tagName = tagName + grgit.branch.current.name.replace('/', '-') + "-"
+}
+project.ext.tagName = tagName
+
 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('.', '-') + "-"
-        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('/', '-') + "-"
-        }
-        prefix = p
+        prefix = project.tagName
     }
 }
 project.version = scmVersion.version