better versioning

Author: gmethvin

.github/workflows/release.yml

@@ -26,17 +26,12 @@ jobs:
           java-version: 11
           distribution: "temurin"
           cache: maven
-          server-id: ossrh
-          server-username: OSSRH_USERNAME
-          server-password: OSSRH_PASSWORD
-          settings-path: ${{ github.workspace }}/.mvn/settings.xml
 
       - name: Install GPG key
         run: |
           echo "${{ secrets.GPG_PRIVATE_KEY }}" | base64 --decode | gpg --batch --import
           gpg --list-secret-keys --keyid-format LONG
 
-      # Determine if this is a tag push (release) or branch push (snapshot)
       - name: Set release type
         id: release_type
         run: |
@@ -49,34 +44,23 @@ jobs:
             echo "This is a snapshot build from branch ${GITHUB_REF#refs/heads/}"
           fi
 
-      # Build and test
-      - name: Build and test
+      - name: Build code
         run: mvn clean verify -DskipTests
 
-      # For releases
-      - name: Deploy release to Maven Central
-        if: env.IS_RELEASE == 'true'
+      - name: Deploy to Maven Central
         run: |
-          mvn deploy -P sonatype -DskipTests \
-            -s ${{ github.workspace }}/.github/settings.xml
-        env:
-          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
-          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-          VERSIONING_GIT_REF: ${{ github.ref }}
-          VERSIONING_EXTENSION_LOG: true
-
-      # For snapshots
-      - name: Deploy snapshot to Maven Central
-        if: env.IS_RELEASE == 'false'
-        run: |
-          mvn deploy -DskipTests \
-            -s ${{ github.workspace }}/.github/settings.xml
+          if [[ $IS_RELEASE == true ]]; then
+            echo "Deploying release to Maven Central"
+            mvn deploy -P sonatype -DskipTests \
+              -s ${{ github.workspace }}/.github/settings.xml
+          else
+            echo "Deploying snapshot to Maven Central"
+            mvn deploy -DskipTests \
+              -s ${{ github.workspace }}/.github/settings.xml
+          fi
         env:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
           GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-          VERSIONING_GIT_REF: ${{ github.ref }}
           VERSIONING_EXTENSION_LOG: true

.mvn/maven-git-versioning-extension.xml

@@ -1,13 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gitVersioning>
+  <verbose>true</verbose>
+  <updatePom>false</updatePom>
   <refs>
+    <!-- Handle tags first - exact tag matches will produce a release version -->
+    <ref type="tag">
+      <pattern>v([0-9]+)\.([0-9]+)\.([0-9]+)(-[a-zA-Z0-9]+)?</pattern>
+      <version>${1}.${2}.${3}${4}</version>
+    </ref>
+
+    <!-- For branches that are exactly on a tag -->
     <ref type="branch">
       <pattern>.*</pattern>
-      <version>${commit.short}-SNAPSHOT</version>
+      <version>${describe.tag.version}</version>
+      <!-- Filter for branches that are exactly on a tag; if there's distance, this won't match -->
+      <properties>
+        <describe.distance>0</describe.distance>
+      </properties>
     </ref>
-    <ref type="tag">
-      <pattern>v([0-9]+)\.([0-9]+)\.([0-9]+)</pattern>
-      <version>${1}.${2}.${3}</version>
+
+    <!-- For branches with commits after a tag -->
+    <ref type="branch">
+      <pattern>.*</pattern>
+      <version>${describe.tag.version}+${describe.distance}-${commit.short}-SNAPSHOT</version>
     </ref>
   </refs>
+  <rev>
+    <!-- Fallback version if no branch/tag match -->
+    <version>${commit.short}-SNAPSHOT</version>
+  </rev>
+  <preferTags>true</preferTags>
+  <disable>false</disable>
 </gitVersioning>