Fix release versions.

.github/workflows/release.yml

@@ -18,10 +18,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-        ref: main
     - name: Install graphviz
       run: sudo apt-get install graphviz
     - name: Install podman

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

@@ -5,6 +5,11 @@
  */
 
 plugins {
+    // Apply the common versioning conventions.
+    // Put this at the start, because accessing project.version before
+    // this is applied makes things fail.
+    id 'org.jdrupes.vmoperator.versioning-conventions'
+
     // Apply the java Plugin to add support for Java.
     id 'java'
     
@@ -13,9 +18,6 @@ plugins {
     
     // Access to git information
     id 'org.ajoberstar.grgit'
-    
-    // Apply the common versioning conventions.
-    id 'org.jdrupes.vmoperator.versioning-conventions'
 }
 
 repositories {

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

@@ -21,11 +21,13 @@ scmVersion {
         }
         var p = shortened.replace('.', '-') + "-"
         if (grgit.branch.current.name != "main"
-            && !grgit.branch.current.name.startsWith("release")) {
+            && 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
     }
 }
-version = scmVersion.version
+project.version = scmVersion.version
 ext.isSnapshot = version.endsWith('-SNAPSHOT')