fix(mvn) Correctly apply -SNAPSHOT suffix

olivergondza · Apr 29, 2024 · 8faccf7 · 8faccf7
1 parent 13bd7a2
commit 8faccf7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.6.6</version>
+        <version>9.8.0</version>
     </extension>
 </extensions>
diff --git a/.mvn/maven-git-versioning-extension.xml b/.mvn/maven-git-versioning-extension.xml
@@ -2,15 +2,17 @@
                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                xsi:schemaLocation="https://github.com/qoomon/maven-git-versioning-extension https://qoomon.github.io/maven-git-versioning-extension/configuration-9.4.0.xsd">
 
-    <refs>
-        <ref type="branch">
-            <pattern>main</pattern>
-            <version>${describe.tag}.${describe.distance}${dirty}</version>
+    <refs considerTagsOnBranches="true"> <!-- Prefer tags if tip of the branch is tagged -->
+        <!-- Release - tagged commit -->
+        <ref type="tag">
+            <pattern>\d+\.\d+</pattern>
+            <version>${describe.tag}</version>
         </ref>
 
+        <!-- Snapshot - untagged commit -->
         <ref type="branch">
             <pattern>.*</pattern>
-            <version>${ref}-${describe.tag}.${describe.distance}-${commit.short}-SNAPSHOT</version>
+            <version>${ref}-${describe.tag}+${describe.distance}-git${commit.short}-SNAPSHOT</version>
         </ref>
     </refs>
 </configuration>