From 8eee59051b739cd8d2c2bd33bb3b57399f3674ce Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Wed, 29 Jun 2022 14:07:29 +0200
Subject: [PATCH 001/140] feat: add projectVersionPattern to use for version
 format placholder

---
 CHANGELOG.md                                  |  8 +++++++
 README.md                                     | 22 ++++++++++++++++++-
 pom.xml                                       |  2 +-
 .../maven/gitversioning/Configuration.java    | 12 +++++++++-
 .../GitVersioningModelProcessor.java          | 20 ++++++++++++++---
 5 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae41af65..f0668b01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,14 @@
 
 # Changelog
 
+## 9.1.0
+
+##### Features
+- add config option for `<projectVersionPattern>` to use special parts of the project version as placeholders e.g. `${version.environment}`
+- add placeholder `${version.core}` the core version component of `${version}` e.g. '1.2.3'
+  - `${version.release}` is marked as deprecated
+
+
 ## 9.0.1
 
 ##### Fixes
diff --git a/README.md b/README.md
index c0ce1e0a..8e710f95 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,7 @@ You can configure the version and properties adjustments for specific branches a
 - `<disable>` global disable(`true`)/enable(`false`) extension, default is `false`.
     - Can be overridden by command option, see [Parameters & Environment Variables](#parameters--environment-variables).
 
+- `<projectVersionPattern>` An arbitrary regex to match project version, matching groups can be used as [Format Placeholders](#format-placeholders) (has to be a **full match pattern**)
 - `<describeTagPattern>` An arbitrary regex to match tag names for git describe command (has to be a **full match pattern** e.g. `v(.+)`, default is `.*`
 - `<updatePom>` Enable(`true`)/disable(`false`) version and properties update in original pom file, default is `false`
     - Can be overridden by command option, see [Parameters & Environment Variables](#parameters--environment-variables).
@@ -150,6 +151,7 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
       <br><br>
 
 - `${version}` `<version>` set in `pom.xml` e.g. '1.2.3-SNAPSHOT'
+  - `${version.core}` the core version component of `${version}` e.g. '1.2.3'
   - `${version.major}` the major version component of `${version}` e.g. '1'
     - `${version.major.next}` the `${version.major}` increased by 1 e.g. '2'
   - `${version.minor}` the minor version component of `${version}` e.g. '2'
@@ -158,9 +160,26 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
     - `${version.patch.next}` the `${version.patch}` increased by 1 e.g. '4'
   - `${version.label}` the version label of `${version}` e.g. 'SNAPSHOT'
     - `${version.label.prefixed}` like `${version.label}` with label separator e.g. '-SNAPSHOT'
-  - `${version.release}` like `${version}` without version labels like `-SNAPSHOT` e.g. '1.2.3'
         <br><br>
 
+- Project Version Pattern Groups
+  - Content of regex groups in `<projectVersionPattern>` can be addressed like this:
+  - `${version.GROUP_NAME}`
+  - `${version.GROUP_INDEX}`
+  - Named Group Example
+      ```xml
+      <configuration>
+        <projectVersionPattern><![CDATA[^.+-(?<environment>.+)-SNAPSHOT$]]></projectVersionPattern>
+    
+        <refs>
+          <ref type="branch">
+            <version>${version.environment}-SNAPSHOT</version>
+          </ref>
+        </refs>
+      </configuration>
+      ```
+      <br>
+
 - `${ref}` `${ref.slug}` ref name (branch or tag name or commit hash)
 - Ref Pattern Groups
     - Content of regex groups in `<ref><pattern>` can be addressed like this:
@@ -192,6 +211,7 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
 - `${describe.distance}` The distance count to last matching tag
 - `${describe.tag}` The matching tag of `git describe`
   - `${describe.tag.version}` the tag version determined by regex `\d+\.\d+\.\d+`
+    - `${describe.tag.version.core}` the core version component of `${describe.tag.version}` e.g. '1.2.3' 
     - `${describe.tag.version.major}` the major version component of `${describe.tag.version}` e.g. '1'
       - `${describe.tag.version.major.next}` the `${describe.tag.version.major}` increased by 1 e.g. '2'
     - `${describe.tag.version.minor}` the major version component of `${describe.tag.version}` e.g. '2'
diff --git a/pom.xml b/pom.xml
index ea5f0029..3febfa99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.0.1</version>
+    <version>9.1.0</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>
diff --git a/src/main/java/me/qoomon/maven/gitversioning/Configuration.java b/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
index 9a75343e..2c389385 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
@@ -34,7 +34,17 @@ public class Configuration {
     public Boolean disable = false;
 
     @JsonDeserialize(using = IgnoreWhitespaceDeserializer.class)
-    public String describeTagPattern = MATCH_ALL;
+    public String projectVersionPattern = null;
+
+    public Pattern projectVersionPattern() {
+        if(projectVersionPattern == null) {
+            return null;
+        }
+        return Pattern.compile(projectVersionPattern);
+    }
+
+    @JsonDeserialize(using = IgnoreWhitespaceDeserializer.class)
+    public String describeTagPattern = null;
 
     public Pattern describeTagPattern() {
         if(describeTagPattern == null) {
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 8a8fe826..cd466999 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -63,7 +63,7 @@
 @Singleton
 public class GitVersioningModelProcessor extends DefaultModelProcessor {
 
-    private static final Pattern VERSION_PATTERN = Pattern.compile("(:?(?<major>\\d+)(:?\\.(?<minor>\\d+)(:?\\.(?<patch>\\d+))?)?(:?-(?<label>.*))?)?");
+    private static final Pattern VERSION_PATTERN = Pattern.compile("(:?(?<core>(?<major>\\d+)(:?\\.(?<minor>\\d+)(:?\\.(?<patch>\\d+))?)?)(:?-(?<label>.*))?)?");
 
     private static final String OPTION_NAME_GIT_REF = "git.ref";
     private static final String OPTION_NAME_GIT_TAG = "git.tag";
@@ -723,6 +723,8 @@ private Map<String, Supplier<String>> generateFormatPlaceholderMap(String projec
             return matcher;
         });
 
+        placeholderMap.put("version.core", Lazy.by(() -> requireNonNullElse(versionComponents.get().group("core"), "0.0.0")));
+
         placeholderMap.put("version.major", Lazy.by(() -> requireNonNullElse(versionComponents.get().group("major"), "0")));
         placeholderMap.put("version.major.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("version.major").get())));
 
@@ -738,8 +740,18 @@ private Map<String, Supplier<String>> generateFormatPlaceholderMap(String projec
             return !label.isEmpty() ? "-" + label : "";
         }));
 
-        final Lazy<String> versionRelease = Lazy.by(() -> projectVersion.replaceFirst("-.*$", ""));
-        placeholderMap.put("version.release", versionRelease);
+        // deprecated
+        placeholderMap.put("version.release",  Lazy.by(() -> projectVersion.replaceFirst("-.*$", "")));
+
+        final Pattern projectVersionPattern = config.projectVersionPattern();
+        if (projectVersionPattern != null) {
+            // ref pattern groups
+            for (Entry<String, String> patternGroup : patternGroupValues(projectVersionPattern, projectVersion).entrySet()) {
+                final String groupName = patternGroup.getKey();
+                final String value = patternGroup.getValue() != null ? patternGroup.getValue() : "";
+                placeholderMap.put("version." + groupName, () -> value);
+            }
+        }
 
         return placeholderMap;
     }
@@ -811,6 +823,8 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
             return matcher;
         });
 
+        placeholderMap.put("describe.tag.version.core", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("core"), "0")));
+
         placeholderMap.put("describe.tag.version.major", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("major"), "0")));
         placeholderMap.put("describe.tag.version.major.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.major").get())));
 

From eae7c52bfd007f02f8ec0951cdb2954e00b9c040 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Thu, 30 Jun 2022 13:43:36 +0200
Subject: [PATCH 002/140] doc(readme): remove empty line

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 8e710f95..dae47614 100644
--- a/README.md
+++ b/README.md
@@ -160,8 +160,6 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
     - `${version.patch.next}` the `${version.patch}` increased by 1 e.g. '4'
   - `${version.label}` the version label of `${version}` e.g. 'SNAPSHOT'
     - `${version.label.prefixed}` like `${version.label}` with label separator e.g. '-SNAPSHOT'
-        <br><br>
-
 - Project Version Pattern Groups
   - Content of regex groups in `<projectVersionPattern>` can be addressed like this:
   - `${version.GROUP_NAME}`

From 87d73dbb8edbd8b337be8ef539ca0032099a1416 Mon Sep 17 00:00:00 2001
From: Florian Lindermaier <florianli@users.noreply.github.com>
Date: Fri, 8 Jul 2022 10:17:19 +0200
Subject: [PATCH 003/140] Provide maven-build-timestamp as
 "commit.timestamp"-like placeholder "build.timestamp"  (#207)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Implement format placeholder `build.timestamp` based on `MavenSession#getStartTime`. It´s implemented in the same way as `commit.timestamp`

* Simple IT testcase

* Update documentation
---
 README.md                                     | 11 +++++++
 .../GitVersioningModelProcessor.java          | 13 ++++++++
 .../GitVersioningExtensionIT.java             | 33 +++++++++++++++++--
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dae47614..db083f8d 100644
--- a/README.md
+++ b/README.md
@@ -205,6 +205,17 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
 - `${commit.timestamp.datetime}` commit timestamp formatted as `yyyyMMdd.HHmmss`e.g. '20190616.161442'
       <br><br>
 
+- `${build.timestamp}` maven-build-timestamp (epoch seconds) e.g. '1560694278'
+- `${build.timestamp.year}` maven-build-timestamp year e.g. '2021'
+- `${build.timestamp.year.2digit}` 2-digit maven-build-timestamp year.g. '21'
+- `${build.timestamp.month}` maven-build-timestamp month of year e.g. '12'
+- `${build.timestamp.day}` maven-build-timestamp day of month e.g. '23'
+- `${build.timestamp.hour}` maven-build-timestamp hour of day (24h)e.g. '13'
+- `${build.timestamp.minute}` maven-build-timestamp minute of hour e.g. '59'
+- `${build.timestamp.second}` maven-build-timestamp second of minute e.g. '30'
+- `${build.timestamp.datetime}` maven-build-timestamp formatted as `yyyyMMdd.HHmmss`e.g. '20190616.161442'
+     <br><br>
+
 - `${describe}` Will resolve to `git describe` output
 - `${describe.distance}` The distance count to last matching tag
 - `${describe.tag}` The matching tag of `git describe`
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index cd466999..6ef6c671 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -27,6 +27,7 @@
 import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -776,6 +777,18 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
         placeholderMap.put("commit.timestamp.datetime", Lazy.by(() -> headCommitDateTime.get().toEpochSecond() > 0
                 ? headCommitDateTime.get().format(DateTimeFormatter.ofPattern("yyyyMMdd.HHmmss")) : "00000000.000000"));
 
+        final Lazy<ZonedDateTime> buildCommitDateTime = Lazy.by(() -> mavenSession.getStartTime().toInstant().atZone(ZoneId.systemDefault()));
+        placeholderMap.put("build.timestamp", Lazy.by(() -> String.valueOf(buildCommitDateTime.get().toEpochSecond())));
+        placeholderMap.put("build.timestamp.year", Lazy.by(() -> String.valueOf(buildCommitDateTime.get().getYear())));
+        placeholderMap.put("build.timestamp.year.2digit", Lazy.by(() -> String.valueOf(buildCommitDateTime.get().getYear() % 100)));
+        placeholderMap.put("build.timestamp.month", Lazy.by(() -> leftPad(String.valueOf(buildCommitDateTime.get().getMonthValue()), 2, "0")));
+        placeholderMap.put("build.timestamp.day", Lazy.by(() -> leftPad(String.valueOf(buildCommitDateTime.get().getDayOfMonth()), 2, "0")));
+        placeholderMap.put("build.timestamp.hour", Lazy.by(() -> leftPad(String.valueOf(buildCommitDateTime.get().getHour()), 2, "0")));
+        placeholderMap.put("build.timestamp.minute", Lazy.by(() -> leftPad(String.valueOf(buildCommitDateTime.get().getMinute()), 2, "0")));
+        placeholderMap.put("build.timestamp.second", Lazy.by(() -> leftPad(String.valueOf(buildCommitDateTime.get().getSecond()), 2, "0")));
+        placeholderMap.put("build.timestamp.datetime", Lazy.by(() -> buildCommitDateTime.get().toEpochSecond() > 0
+                ? buildCommitDateTime.get().format(DateTimeFormatter.ofPattern("yyyyMMdd.HHmmss")) : "00000000.000000"));
+
         final String refName = gitVersionDetails.getRefName();
         final Lazy<String> refNameSlug = Lazy.by(() -> slugify(refName));
         placeholderMap.put("ref", () -> refName);
diff --git a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
index 4546976f..aca7bfbb 100644
--- a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
+++ b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
@@ -21,9 +21,11 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.regex.Pattern;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
-import static me.qoomon.gitversioning.commons.GitRefType.*;
+import static me.qoomon.gitversioning.commons.GitRefType.BRANCH;
+import static me.qoomon.gitversioning.commons.GitRefType.TAG;
 import static me.qoomon.maven.gitversioning.GitVersioningModelProcessor.GIT_VERSIONING_POM_NAME;
 import static me.qoomon.maven.gitversioning.MavenUtil.readModel;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -664,6 +666,33 @@ void dependencyUpdates_multiModuleProject() throws Exception {
         }
     }
 
+    @Test
+    void branchVersioning_WithBuildTime() throws Exception {
+
+        try (Git git = Git.init().setInitialBranch("feature/test").setDirectory(projectDir.toFile()).call()) {
+            // Given
+            git.commit().setMessage("initial commit").setAllowEmpty(true).call();
+
+            writeModel(projectDir.resolve("pom.xml").toFile(), pomModel);
+            writeExtensionsFile(projectDir);
+            writeExtensionConfigFile(projectDir, new Configuration() {{
+                refs.list.add(createVersionDescription(BRANCH, "${build.timestamp.year}${build.timestamp.month}${build.timestamp.day}-gitVersioning"));
+            }});
+
+            // When
+            Verifier verifier = getVerifier(projectDir);
+            verifier.executeGoal("verify");
+
+            // Then
+            verifier.verifyErrorFreeLog();
+            String expectedVersion = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + "-gitVersioning";
+            verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
+
+            Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
+            assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
+        }
+    }
+
     // TODO add tests for property updates
 
 

From d74ecfc4e60fe9bc347f1dc41cfeb62e70f1228e Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Fri, 8 Jul 2022 10:19:51 +0200
Subject: [PATCH 004/140] doc(changelog): add entry for 9.2.0

---
 CHANGELOG.md | 15 +++++++++++++++
 pom.xml      |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0668b01..7d9f120e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,21 @@
 
 # Changelog
 
+## 9.2.0
+
+##### Features
+- new placeholder
+  - `${build.timestamp}` maven-build-timestamp (epoch seconds) e.g. '1560694278'
+  - `${build.timestamp.year}` maven-build-timestamp year e.g. '2021'
+  - `${build.timestamp.year.2digit}` 2-digit maven-build-timestamp year.g. '21'
+  - `${build.timestamp.month}` maven-build-timestamp month of year e.g. '12'
+  - `${build.timestamp.day}` maven-build-timestamp day of month e.g. '23'
+  - `${build.timestamp.hour}` maven-build-timestamp hour of day (24h)e.g. '13'
+  - `${build.timestamp.minute}` maven-build-timestamp minute of hour e.g. '59'
+  - `${build.timestamp.second}` maven-build-timestamp second of minute e.g. '30'
+  - `${build.timestamp.datetime}` maven-build-timestamp formatted as `yyyyMMdd.HHmmss`e.g. '20190616.161442'
+
+  
 ## 9.1.0
 
 ##### Features
diff --git a/pom.xml b/pom.xml
index 3febfa99..d105ba49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.1.0</version>
+    <version>9.2.0</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>

From 363555af4412c9f6e5f618a1ec4fbf2391a2e7ce Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Mon, 11 Jul 2022 16:30:14 +0200
Subject: [PATCH 005/140] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index db083f8d..318c0093 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ This extension can virtually set project version and properties, based on curren
 
 ## Usage
 
+⚠️ minimal required java version is `11`
 ⚠️ minimal required maven version is `3.6.3`
 
 ⚠️ If you're using **IntelliJ** have a look at [IntelliJ Setup Instructions](#intellij---multi-modules-projects)

From dbedba8b080757afe7079fdbfdd0d36346ed08d6 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Mon, 11 Jul 2022 16:31:08 +0200
Subject: [PATCH 006/140] Update README.md

---
 README.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 318c0093..dc570f22 100644
--- a/README.md
+++ b/README.md
@@ -21,11 +21,13 @@ This extension can virtually set project version and properties, based on curren
 
 ## Usage
 
-⚠️ minimal required java version is `11`
-⚠️ minimal required maven version is `3.6.3`
-
 ⚠️ If you're using **IntelliJ** have a look at [IntelliJ Setup Instructions](#intellij---multi-modules-projects)
 
+#### Requirements
+* ⚠️ minimal required java version is `11`
+* ⚠️ minimal required maven version is `3.6.3`
+
+
 ### Add Extension to Maven Project
 
 create or update `${rootProjectDir}/.mvn/extensions.xml` file

From 8726e3b7349299cf5f7531fb06d47a65b1a123ba Mon Sep 17 00:00:00 2001
From: 107997599+JezP-trp <107997599+JezPrime-trp@users.noreply.github.com>
Date: Wed, 13 Jul 2022 14:58:28 +0100
Subject: [PATCH 007/140] Add properties for version label as number and also
 "next by distance for each version component"

The intent of these changes is to open up an effective build number (via version label and "next by distance" based on the number of commits since last tag matching the version pattern). In our model we wish to use the label for this (hence the addition of version label as number) but it is entirely reasonable to treat the patch number as auto-incrementing with each commit the same way.
---
 README.md                                     | 14 ++++++++---
 .../GitVersioningModelProcessor.java          | 24 +++++++++++++++++--
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c0ce1e0a..f4c0b488 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>7.4.0</version>
+        <version>9.0.0</version>
     </extension>
 
 </extensions>
@@ -158,6 +158,7 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
     - `${version.patch.next}` the `${version.patch}` increased by 1 e.g. '4'
   - `${version.label}` the version label of `${version}` e.g. 'SNAPSHOT'
     - `${version.label.prefixed}` like `${version.label}` with label separator e.g. '-SNAPSHOT'
+    - `${version.label.number}` used to extract the label as a number (build will fail if non-numeric label encountered for this)
   - `${version.release}` like `${version}` without version labels like `-SNAPSHOT` e.g. '1.2.3'
         <br><br>
 
@@ -194,10 +195,17 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
   - `${describe.tag.version}` the tag version determined by regex `\d+\.\d+\.\d+`
     - `${describe.tag.version.major}` the major version component of `${describe.tag.version}` e.g. '1'
       - `${describe.tag.version.major.next}` the `${describe.tag.version.major}` increased by 1 e.g. '2'
-    - `${describe.tag.version.minor}` the major version component of `${describe.tag.version}` e.g. '2'
+      - `${describe.tag.version.major.nextByDistance}` the `${describe.tag.version.major}` increased by `${describe.distance}` + 1 e.g. '2'
+    - `${describe.tag.version.minor}` the minor version component of `${describe.tag.version}` e.g. '2'
       - `${describe.tag.version.minor.next}` the `${describe.tag.version.minor}` increased by 1 e.g. '3'
-    - `${describe.tag.version.path}` the major version component of `${describe.tag.version}` e.g. '3'
+      - `${describe.tag.version.minor.nextByDistance}` the `${describe.tag.version.minor}` increased by `${describe.distance}` + 1 e.g. '2'
+    - `${describe.tag.version.patch}` the patch version component of `${describe.tag.version}` e.g. '3'
       - `${describe.tag.version.patch.next}` the `${describe.tag.version.patch}` increased by 1 e.g. '4'
+      - `${describe.tag.version.patch.nextByDistance}` the `${describe.tag.version.patch}` increased by `${describe.distance}` + 1 e.g. '2'
+    - `${describe.tag.version.label}` the label version component of `${describe.tag.version}` e.g. 'SNAPSHOT'
+    - `${describe.tag.version.label.number}` the `${describe.tag.version.label}` assuming numeric e,g, '5', will cause build failure if a non-numeric label is found
+      - `${describe.tag.version.label.number.next}` the `${describe.tag.version.label.number}` increased by 1 e.g. '6', will cause build failure if a non-numeric label is found
+      - `${describe.tag.version.label.number.nextByDistance}` the `${describe.tag.version.label.number}` increased by `${describe.distance}` + 1 e.g. '9', will cause build failure if a non-numeric label is found
 - Describe Tag Pattern Groups
     - Content of regex groups in `<describeTagPattern>` can be addressed like this:
     - `${describe.tag.GROUP_NAME}` `${describe.tag.GROUP_NAME.slug}`
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 7fc37c85..d760c072 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -716,6 +716,7 @@ private Map<String, Supplier<String>> generateFormatPlaceholderMap(String projec
         placeholderMap.put("version.patch.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("version.patch").get())));
 
         placeholderMap.put("version.label", Lazy.by(() -> requireNonNullElse(versionComponents.get().group("label"), "")));
+        placeholderMap.put("version.label.number", Lazy.by(() -> extractLabelNumber(versionComponents)));
 
         final Lazy<String> versionRelease = Lazy.by(() -> projectVersion.replaceFirst("-.*$", ""));
         placeholderMap.put("version.release", versionRelease);
@@ -778,6 +779,8 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
             placeholderMap.put("describe.tag." + groupName + ".slug", Lazy.by(() -> slugify(groupValue.get())));
         }
 
+        final Lazy<Integer> distance = Lazy.by(() -> description.get().getDistance());
+
         Supplier<String> descriptionTagVersion = placeholderMap.computeIfAbsent("describe.tag.version", key -> Lazy.by(() -> {
             Matcher matcher = VERSION_PATTERN.matcher(descriptionTag.get());
             return matcher.find() ? matcher.group() : "0.0.0";
@@ -792,14 +795,20 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
 
         placeholderMap.put("describe.tag.version.major", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("major"), "0")));
         placeholderMap.put("describe.tag.version.major.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.major").get())));
+        placeholderMap.put("describe.tag.version.major.nextByDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.major").get(), distance.get() + 1)));
 
         placeholderMap.put("describe.tag.version.minor", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("minor"), "0")));
         placeholderMap.put("describe.tag.version.minor.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.minor").get())));
+        placeholderMap.put("describe.tag.version.minor.nextByDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.minor").get(), distance.get() + 1)));
 
         placeholderMap.put("describe.tag.version.patch", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("patch"), "0")));
         placeholderMap.put("describe.tag.version.patch.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.patch").get())));
+        placeholderMap.put("describe.tag.version.patch.nextByDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.patch").get(), distance.get() + 1)));
 
-        placeholderMap.put("describe.tag.version.version.label", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("label"), "")));
+        placeholderMap.put("describe.tag.version.label", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("label"), "")));
+        placeholderMap.put("describe.tag.version.label.number", Lazy.by(() -> extractLabelNumber(descriptionTagVersionComponents)));
+        placeholderMap.put("describe.tag.version.label.number.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.label.number").get())));
+        placeholderMap.put("describe.tag.version.label.number.nextByDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.label.number").get(), distance.get() + 1)));
 
         placeholderMap.put("describe.distance", Lazy.by(() -> String.valueOf(description.get().getDistance())));
 
@@ -1251,6 +1260,17 @@ private static String slugify(String value) {
     }
 
     private static String increaseStringNumber(String majorVersion) {
-        return String.format("%0" + majorVersion.length() + "d", Long.parseLong(majorVersion) + 1);
+        return increaseStringNumberBy(majorVersion, 1);
+    }
+
+    private static String increaseStringNumberBy(String toIncrease, long by) {
+        return String.format("%0" + toIncrease.length() + "d", Long.parseLong(toIncrease) + by);
     }
+
+    private static String extractLabelNumber(Lazy<Matcher> versionComponents) {
+        String label = requireNonNullElse(versionComponents.get().group("label"), "0");
+        // This should throw a build-killing error if we are unparseable as a numeric
+        return String.valueOf(Integer.parseInt(label));
+    }
+
 }

From 97818b06ed45d5fee5e3830299d83d1a5889d369 Mon Sep 17 00:00:00 2001
From: 107997599+JezP-trp <107997599+JezPrime-trp@users.noreply.github.com>
Date: Thu, 14 Jul 2022 16:56:30 +0100
Subject: [PATCH 008/140] Update version of plugin referenced in README to
 latest

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f4c0b488..2f469077 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.0.0</version>
+        <version>9.2.0</version>
     </extension>
 
 </extensions>

From 7a2c7179c914bde51a49fb87379e817ab651188e Mon Sep 17 00:00:00 2001
From: 107997599+JezP-trp <107997599+JezPrime-trp@users.noreply.github.com>
Date: Fri, 15 Jul 2022 12:01:25 +0100
Subject: [PATCH 009/140] Accommodate PR comments and discussions from the
 equivalent PR on the gradle plugin

---
 README.md                                                 | 6 ++----
 .../maven/gitversioning/GitVersioningModelProcessor.java  | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index cdfe544f..66ed18c2 100644
--- a/README.md
+++ b/README.md
@@ -163,7 +163,6 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
     - `${version.patch.next}` the `${version.patch}` increased by 1 e.g. '4'
   - `${version.label}` the version label of `${version}` e.g. 'SNAPSHOT'
     - `${version.label.prefixed}` like `${version.label}` with label separator e.g. '-SNAPSHOT'
-    - `${version.label.number}` used to extract the label as a number (build will fail if non-numeric label encountered for this)
 - Project Version Pattern Groups
   - Content of regex groups in `<projectVersionPattern>` can be addressed like this:
   - `${version.GROUP_NAME}`
@@ -235,9 +234,8 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
       - `${describe.tag.version.patch.next}` the `${describe.tag.version.patch}` increased by 1 e.g. '4'
       - `${describe.tag.version.patch.nextByDistance}` the `${describe.tag.version.patch}` increased by `${describe.distance}` + 1 e.g. '2'
     - `${describe.tag.version.label}` the label version component of `${describe.tag.version}` e.g. 'SNAPSHOT'
-    - `${describe.tag.version.label.number}` the `${describe.tag.version.label}` assuming numeric e,g, '5', will cause build failure if a non-numeric label is found
-      - `${describe.tag.version.label.number.next}` the `${describe.tag.version.label.number}` increased by 1 e.g. '6', will cause build failure if a non-numeric label is found
-      - `${describe.tag.version.label.number.nextByDistance}` the `${describe.tag.version.label.number}` increased by `${describe.distance}` + 1 e.g. '9', will cause build failure if a non-numeric label is found
+      - `${describe.tag.version.label.asInt.next}` the `${describe.tag.version.label}` converted to an integer and increased by 1 e.g. '6'
+      - `${describe.tag.version.label.asInt.nextByDistance}` the `${describe.tag.version.label}` converted to an integer increased by `${describe.distance}` + 1 e.g. '9'
 - Describe Tag Pattern Groups
     - Content of regex groups in `<describeTagPattern>` can be addressed like this:
     - `${describe.tag.GROUP_NAME}` `${describe.tag.GROUP_NAME.slug}`
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 571745fe..bdc674fc 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -740,7 +740,6 @@ private Map<String, Supplier<String>> generateFormatPlaceholderMap(String projec
             String label = placeholderMap.get("version.label").get();
             return !label.isEmpty() ? "-" + label : "";
         }));
-        placeholderMap.put("version.label.number", Lazy.by(() -> extractLabelNumber(versionComponents)));
 
         // deprecated
         placeholderMap.put("version.release",  Lazy.by(() -> projectVersion.replaceFirst("-.*$", "")));
@@ -839,6 +838,8 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
             return matcher;
         });
 
+        final Lazy<String> labelAsInteger = Lazy.by(() -> extractLabelNumber(descriptionTagVersionComponents));
+
         placeholderMap.put("describe.tag.version.core", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("core"), "0")));
 
         placeholderMap.put("describe.tag.version.major", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("major"), "0")));
@@ -854,9 +855,8 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
         placeholderMap.put("describe.tag.version.patch.nextByDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.patch").get(), distance.get() + 1)));
 
         placeholderMap.put("describe.tag.version.label", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("label"), "")));
-        placeholderMap.put("describe.tag.version.label.number", Lazy.by(() -> extractLabelNumber(descriptionTagVersionComponents)));
-        placeholderMap.put("describe.tag.version.label.number.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.label.number").get())));
-        placeholderMap.put("describe.tag.version.label.number.nextByDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.label.number").get(), distance.get() + 1)));
+        placeholderMap.put("describe.tag.version.label.asInt.next", Lazy.by(() -> increaseStringNumber(labelAsInteger.get())));
+        placeholderMap.put("describe.tag.version.label.asInt.nextByDistance", Lazy.by(() -> increaseStringNumberBy(labelAsInteger.get(), distance.get() + 1)));
 
         placeholderMap.put("describe.distance", Lazy.by(() -> String.valueOf(description.get().getDistance())));
 

From d91bd9eff17fef2abea3583f14ff47a2f65f7c48 Mon Sep 17 00:00:00 2001
From: 107997599+JezP-trp <107997599+JezPrime-trp@users.noreply.github.com>
Date: Fri, 15 Jul 2022 14:18:13 +0100
Subject: [PATCH 010/140] Accommodate further PR comments and discussions from
 the equivalent PR on the gradle plugin - small placeholder name changes

---
 README.md                                              | 10 +++++-----
 .../gitversioning/GitVersioningModelProcessor.java     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 66ed18c2..4c3c16be 100644
--- a/README.md
+++ b/README.md
@@ -226,16 +226,16 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
     - `${describe.tag.version.core}` the core version component of `${describe.tag.version}` e.g. '1.2.3' 
     - `${describe.tag.version.major}` the major version component of `${describe.tag.version}` e.g. '1'
       - `${describe.tag.version.major.next}` the `${describe.tag.version.major}` increased by 1 e.g. '2'
-      - `${describe.tag.version.major.nextByDistance}` the `${describe.tag.version.major}` increased by `${describe.distance}` + 1 e.g. '2'
+      - `${describe.tag.version.major.nextPlusDistance}` the `${describe.tag.version.major}` increased by `${describe.distance}` + 1 e.g. '2'
     - `${describe.tag.version.minor}` the minor version component of `${describe.tag.version}` e.g. '2'
       - `${describe.tag.version.minor.next}` the `${describe.tag.version.minor}` increased by 1 e.g. '3'
-      - `${describe.tag.version.minor.nextByDistance}` the `${describe.tag.version.minor}` increased by `${describe.distance}` + 1 e.g. '2'
+      - `${describe.tag.version.minor.nextPlusDistance}` the `${describe.tag.version.minor}` increased by `${describe.distance}` + 1 e.g. '2'
     - `${describe.tag.version.patch}` the patch version component of `${describe.tag.version}` e.g. '3'
       - `${describe.tag.version.patch.next}` the `${describe.tag.version.patch}` increased by 1 e.g. '4'
-      - `${describe.tag.version.patch.nextByDistance}` the `${describe.tag.version.patch}` increased by `${describe.distance}` + 1 e.g. '2'
+      - `${describe.tag.version.patch.nextPlusDistance}` the `${describe.tag.version.patch}` increased by `${describe.distance}` + 1 e.g. '2'
     - `${describe.tag.version.label}` the label version component of `${describe.tag.version}` e.g. 'SNAPSHOT'
-      - `${describe.tag.version.label.asInt.next}` the `${describe.tag.version.label}` converted to an integer and increased by 1 e.g. '6'
-      - `${describe.tag.version.label.asInt.nextByDistance}` the `${describe.tag.version.label}` converted to an integer increased by `${describe.distance}` + 1 e.g. '9'
+      - `${describe.tag.version.label.next}` the `${describe.tag.version.label}` converted to an integer and increased by 1 e.g. '6'
+      - `${describe.tag.version.label.nextPlusDistance}` the `${describe.tag.version.label}` converted to an integer increased by `${describe.distance}` + 1 e.g. '9'
 - Describe Tag Pattern Groups
     - Content of regex groups in `<describeTagPattern>` can be addressed like this:
     - `${describe.tag.GROUP_NAME}` `${describe.tag.GROUP_NAME.slug}`
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index bdc674fc..19a74f2a 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -844,19 +844,19 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
 
         placeholderMap.put("describe.tag.version.major", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("major"), "0")));
         placeholderMap.put("describe.tag.version.major.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.major").get())));
-        placeholderMap.put("describe.tag.version.major.nextByDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.major").get(), distance.get() + 1)));
+        placeholderMap.put("describe.tag.version.major.nextPlusDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.major").get(), distance.get() + 1)));
 
         placeholderMap.put("describe.tag.version.minor", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("minor"), "0")));
         placeholderMap.put("describe.tag.version.minor.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.minor").get())));
-        placeholderMap.put("describe.tag.version.minor.nextByDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.minor").get(), distance.get() + 1)));
+        placeholderMap.put("describe.tag.version.minor.nextPlusDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.minor").get(), distance.get() + 1)));
 
         placeholderMap.put("describe.tag.version.patch", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("patch"), "0")));
         placeholderMap.put("describe.tag.version.patch.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.patch").get())));
-        placeholderMap.put("describe.tag.version.patch.nextByDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.patch").get(), distance.get() + 1)));
+        placeholderMap.put("describe.tag.version.patch.nextPlusDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.patch").get(), distance.get() + 1)));
 
         placeholderMap.put("describe.tag.version.label", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("label"), "")));
-        placeholderMap.put("describe.tag.version.label.asInt.next", Lazy.by(() -> increaseStringNumber(labelAsInteger.get())));
-        placeholderMap.put("describe.tag.version.label.asInt.nextByDistance", Lazy.by(() -> increaseStringNumberBy(labelAsInteger.get(), distance.get() + 1)));
+        placeholderMap.put("describe.tag.version.label.next", Lazy.by(() -> increaseStringNumber(labelAsInteger.get())));
+        placeholderMap.put("describe.tag.version.label.nextPlusDistance", Lazy.by(() -> increaseStringNumberBy(labelAsInteger.get(), distance.get() + 1)));
 
         placeholderMap.put("describe.distance", Lazy.by(() -> String.valueOf(description.get().getDistance())));
 

From 09af3809a65a59e786ad901b591ea3bdd295d695 Mon Sep 17 00:00:00 2001
From: 107997599+JezP-trp <107997599+JezPrime-trp@users.noreply.github.com>
Date: Mon, 25 Jul 2022 17:05:02 +0100
Subject: [PATCH 011/140] Naming updates following PR discussion. Also a
 correction to how we calculate distance where matching tag isn't present
 (existing algorithm undercounts by 1 for this scenario. Added some tests to
 validate the "plus distance" placeholder behaviour.

---
 README.md                                     |   8 +-
 .../qoomon/gitversioning/commons/GitUtil.java |   4 +-
 .../GitVersioningModelProcessor.java          |   8 +-
 .../GitVersioningExtensionIT.java             | 117 ++++++++++++++++++
 4 files changed, 128 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 4c3c16be..3d409428 100644
--- a/README.md
+++ b/README.md
@@ -226,16 +226,16 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
     - `${describe.tag.version.core}` the core version component of `${describe.tag.version}` e.g. '1.2.3' 
     - `${describe.tag.version.major}` the major version component of `${describe.tag.version}` e.g. '1'
       - `${describe.tag.version.major.next}` the `${describe.tag.version.major}` increased by 1 e.g. '2'
-      - `${describe.tag.version.major.nextPlusDistance}` the `${describe.tag.version.major}` increased by `${describe.distance}` + 1 e.g. '2'
     - `${describe.tag.version.minor}` the minor version component of `${describe.tag.version}` e.g. '2'
       - `${describe.tag.version.minor.next}` the `${describe.tag.version.minor}` increased by 1 e.g. '3'
-      - `${describe.tag.version.minor.nextPlusDistance}` the `${describe.tag.version.minor}` increased by `${describe.distance}` + 1 e.g. '2'
     - `${describe.tag.version.patch}` the patch version component of `${describe.tag.version}` e.g. '3'
       - `${describe.tag.version.patch.next}` the `${describe.tag.version.patch}` increased by 1 e.g. '4'
-      - `${describe.tag.version.patch.nextPlusDistance}` the `${describe.tag.version.patch}` increased by `${describe.distance}` + 1 e.g. '2'
+      - `${describe.tag.version.patch.plus.describe.distance}` the `${describe.tag.version.patch}` increased by `${describe.distance}` e.g. '2'
+      - `${describe.tag.version.patch.next.plus.describe.distance}` the `${describe.tag.version.patch.next}` increased by `${describe.distance}` e.g. '3'
     - `${describe.tag.version.label}` the label version component of `${describe.tag.version}` e.g. 'SNAPSHOT'
       - `${describe.tag.version.label.next}` the `${describe.tag.version.label}` converted to an integer and increased by 1 e.g. '6'
-      - `${describe.tag.version.label.nextPlusDistance}` the `${describe.tag.version.label}` converted to an integer increased by `${describe.distance}` + 1 e.g. '9'
+      - `${describe.tag.version.label.plus.describe.distance}` the `${describe.tag.version.label}` increased by `${describe.distance}` e.g. '2'
+      - `${describe.tag.version.label.next.plus.describe.distance}` the `${describe.tag.version.label.next}` increased by `${describe.distance}` e.g. '3'
 - Describe Tag Pattern Groups
     - Content of regex groups in `<describeTagPattern>` can be addressed like this:
     - `${describe.tag.GROUP_NAME}` `${describe.tag.GROUP_NAME.slug}`
diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
index 40cc5216..3e656664 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
@@ -77,7 +77,9 @@ public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern,
                 throw new IllegalStateException("couldn't find matching tag in shallow git repository");
             }
 
-            return new GitDescription(revObjectId.getName(), "root", depth);
+            // If no matching tag found, then we should presumably return the number of commits on the branch
+            // but we started from -1 so need to compensate here
+            return new GitDescription(revObjectId.getName(), "root", depth + 1);
         }
     }
 
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 19a74f2a..22c4e12a 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -844,19 +844,19 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
 
         placeholderMap.put("describe.tag.version.major", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("major"), "0")));
         placeholderMap.put("describe.tag.version.major.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.major").get())));
-        placeholderMap.put("describe.tag.version.major.nextPlusDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.major").get(), distance.get() + 1)));
 
         placeholderMap.put("describe.tag.version.minor", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("minor"), "0")));
         placeholderMap.put("describe.tag.version.minor.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.minor").get())));
-        placeholderMap.put("describe.tag.version.minor.nextPlusDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.minor").get(), distance.get() + 1)));
 
         placeholderMap.put("describe.tag.version.patch", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("patch"), "0")));
         placeholderMap.put("describe.tag.version.patch.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.patch").get())));
-        placeholderMap.put("describe.tag.version.patch.nextPlusDistance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.patch").get(), distance.get() + 1)));
+        placeholderMap.put("describe.tag.version.patch.plus.describe.distance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.patch").get(), distance.get())));
+        placeholderMap.put("describe.tag.version.patch.next.plus.describe.distance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.patch").get(), distance.get() + 1)));
 
         placeholderMap.put("describe.tag.version.label", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("label"), "")));
         placeholderMap.put("describe.tag.version.label.next", Lazy.by(() -> increaseStringNumber(labelAsInteger.get())));
-        placeholderMap.put("describe.tag.version.label.nextPlusDistance", Lazy.by(() -> increaseStringNumberBy(labelAsInteger.get(), distance.get() + 1)));
+        placeholderMap.put("describe.tag.version.label.plus.describe.distance", Lazy.by(() -> increaseStringNumberBy(labelAsInteger.get(), distance.get())));
+        placeholderMap.put("describe.tag.version.label.next.plus.describe.distance", Lazy.by(() -> increaseStringNumberBy(labelAsInteger.get(), distance.get() + 1)));
 
         placeholderMap.put("describe.distance", Lazy.by(() -> String.valueOf(description.get().getDistance())));
 
diff --git a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
index aca7bfbb..a3be0306 100644
--- a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
+++ b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
@@ -30,6 +30,7 @@
 import static me.qoomon.maven.gitversioning.MavenUtil.readModel;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
+import static org.eclipse.jgit.lib.Constants.MASTER;
 
 class GitVersioningExtensionIT {
 
@@ -693,6 +694,122 @@ void branchVersioning_WithBuildTime() throws Exception {
         }
     }
 
+    @Test
+    void apply_emptyRepoGivesExpectedPlusDistanceResult() throws Exception {
+        // This can only be a local build so the specifics of the build number don't really matter, but 0 makes reasonable sense
+        // given
+        try (Git git = Git.init().setInitialBranch(MASTER).setDirectory(projectDir.toFile()).call()) {
+            writeModel(projectDir.resolve("pom.xml").toFile(), pomModel);
+            writeExtensionsFile(projectDir);
+            writeExtensionConfigFile(projectDir, new Configuration() {{
+                refs.list.add(createVersionDescription(BRANCH, "${describe.tag.version.label.plus.describe.distance}"));
+            }});
+
+            // When
+            Verifier verifier = getVerifier(projectDir);
+            verifier.executeGoal("verify");
+
+            // Then
+            verifier.verifyErrorFreeLog();
+            String expectedVersion = "0";
+            verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
+
+            Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
+            assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
+        }
+
+     }
+
+    @Test
+    void apply_singleCommitUntaggedRepoGivesExpectedPlusDistanceResult() throws Exception {
+        // This can only be a local build so the specifics of the build number don't really matter, but 0 makes reasonable sense
+        // given
+        try (Git git = Git.init().setInitialBranch(MASTER).setDirectory(projectDir.toFile()).call()) {
+            git.commit().setMessage("initial commit").setAllowEmpty(true).call();
+            writeModel(projectDir.resolve("pom.xml").toFile(), pomModel);
+            writeExtensionsFile(projectDir);
+            writeExtensionConfigFile(projectDir, new Configuration() {{
+                refs.list.add(createVersionDescription(BRANCH, "${describe.tag.version.label.plus.describe.distance}"));
+            }});
+
+            // When
+            Verifier verifier = getVerifier(projectDir);
+            verifier.executeGoal("verify");
+
+            // Then
+            verifier.verifyErrorFreeLog();
+            String expectedVersion = "1";
+            verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
+
+            Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
+            assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
+        }
+
+     }
+
+    @Test
+    void apply_NoCommitsSinceLastTagGivesExpectedPlusDistanceResult() throws Exception {
+        // This can only be a local build so the specifics of the build number don't really matter, but 0 makes reasonable sense
+        // given
+        try (Git git = Git.init().setInitialBranch(MASTER).setDirectory(projectDir.toFile()).call()) {
+            git.commit().setMessage("initial commit").setAllowEmpty(true).call();
+            String givenTag = "2.0.4-677";
+            git.tag().setName(givenTag).call();
+
+            writeModel(projectDir.resolve("pom.xml").toFile(), pomModel);
+            writeExtensionsFile(projectDir);
+            writeExtensionConfigFile(projectDir, new Configuration() {{
+                refs.list.add(createVersionDescription(BRANCH, "${describe.tag.version.label.plus.describe.distance}"));
+            }});
+
+            // When
+            Verifier verifier = getVerifier(projectDir);
+            verifier.executeGoal("verify");
+
+            // Then
+            verifier.verifyErrorFreeLog();
+            String expectedVersion = "677";
+            verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
+
+            Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
+            assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
+        }
+
+     }
+
+    @Test
+    void apply_TwoCommitsSinceLastTagGivesExpectedPlusDistanceResult() throws Exception {
+        // This can only be a local build so the specifics of the build number don't really matter, but 0 makes reasonable sense
+        // given
+        try (Git git = Git.init().setInitialBranch(MASTER).setDirectory(projectDir.toFile()).call()) {
+            git.commit().setMessage("initial commit").setAllowEmpty(true).call();
+            String givenTag = "2.0.4-677";
+            git.tag().setName(givenTag).call();
+            git.commit().setMessage("commit two").setAllowEmpty(true).call();
+            git.commit().setMessage("commit three").setAllowEmpty(true).call();
+
+            writeModel(projectDir.resolve("pom.xml").toFile(), pomModel);
+            writeExtensionsFile(projectDir);
+            writeExtensionConfigFile(projectDir, new Configuration() {{
+                refs.list.add(createVersionDescription(BRANCH, "${describe.tag.version.label.plus.describe.distance}"));
+            }});
+
+            // When
+            Verifier verifier = getVerifier(projectDir);
+            verifier.executeGoal("verify");
+
+            // Then
+            verifier.verifyErrorFreeLog();
+            String expectedVersion = "679";
+            verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
+
+            Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
+            assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
+        }
+
+     }
+
+
     // TODO add tests for property updates
 
 

From 8cf13afe726adff4ee1a845b715e8a64e8c6280d Mon Sep 17 00:00:00 2001
From: 107997599+JezP-trp <107997599+JezPrime-trp@users.noreply.github.com>
Date: Tue, 26 Jul 2022 10:58:34 +0100
Subject: [PATCH 012/140] Further updates and tidy up following PR discussion

---
 .../qoomon/gitversioning/commons/GitUtil.java |  8 ++---
 .../GitVersioningModelProcessor.java          | 32 +++++++------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
index 3e656664..3d2d2f50 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
@@ -60,10 +60,9 @@ public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern,
             walk.setFirstParent(true);
             walk.markStart(walk.parseCommit(revObjectId));
             Iterator<RevCommit> walkIterator = walk.iterator();
-            int depth = -1;
+            int depth = 0;
             while (walkIterator.hasNext()) {
                 RevCommit rev = walkIterator.next();
-                depth++;
                 Optional<String> matchingTag = objectIdListMap.getOrDefault(rev, emptyList()).stream()
                         .filter(tag -> tagPattern.matcher(tag).matches())
                         .findFirst();
@@ -71,15 +70,14 @@ public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern,
                 if (matchingTag.isPresent()) {
                     return new GitDescription(revObjectId.getName(), matchingTag.get(), depth);
                 }
+                depth++;
             }
 
             if (isShallowRepository(repository)) {
                 throw new IllegalStateException("couldn't find matching tag in shallow git repository");
             }
 
-            // If no matching tag found, then we should presumably return the number of commits on the branch
-            // but we started from -1 so need to compensate here
-            return new GitDescription(revObjectId.getName(), "root", depth + 1);
+            return new GitDescription(revObjectId.getName(), "root", depth);
         }
     }
 
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 22c4e12a..50323459 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -824,8 +824,6 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
             placeholderMap.put("describe.tag." + groupName + ".slug", Lazy.by(() -> slugify(groupValue.get())));
         }
 
-        final Lazy<Integer> distance = Lazy.by(() -> description.get().getDistance());
-
         Supplier<String> descriptionTagVersion = placeholderMap.computeIfAbsent("describe.tag.version", key -> Lazy.by(() -> {
             Matcher matcher = VERSION_PATTERN.matcher(descriptionTag.get());
             return matcher.find() ? matcher.group() : "0.0.0";
@@ -838,8 +836,6 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
             return matcher;
         });
 
-        final Lazy<String> labelAsInteger = Lazy.by(() -> extractLabelNumber(descriptionTagVersionComponents));
-
         placeholderMap.put("describe.tag.version.core", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("core"), "0")));
 
         placeholderMap.put("describe.tag.version.major", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("major"), "0")));
@@ -850,15 +846,16 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
 
         placeholderMap.put("describe.tag.version.patch", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("patch"), "0")));
         placeholderMap.put("describe.tag.version.patch.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.patch").get())));
-        placeholderMap.put("describe.tag.version.patch.plus.describe.distance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.patch").get(), distance.get())));
-        placeholderMap.put("describe.tag.version.patch.next.plus.describe.distance", Lazy.by(() -> increaseStringNumberBy(placeholderMap.get("describe.tag.version.patch").get(), distance.get() + 1)));
 
-        placeholderMap.put("describe.tag.version.label", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("label"), "")));
-        placeholderMap.put("describe.tag.version.label.next", Lazy.by(() -> increaseStringNumber(labelAsInteger.get())));
-        placeholderMap.put("describe.tag.version.label.plus.describe.distance", Lazy.by(() -> increaseStringNumberBy(labelAsInteger.get(), distance.get())));
-        placeholderMap.put("describe.tag.version.label.next.plus.describe.distance", Lazy.by(() -> increaseStringNumberBy(labelAsInteger.get(), distance.get() + 1)));
+        placeholderMap.put("describe.tag.version.version.label", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("label"), "")));
+        placeholderMap.put("describe.tag.version.label.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.label").get())));
 
+        final Lazy<Integer> descriptionDistance = Lazy.by(() -> description.get().getDistance());
         placeholderMap.put("describe.distance", Lazy.by(() -> String.valueOf(description.get().getDistance())));
+        placeholderMap.put("describe.tag.version.patch.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch").get(), descriptionDistance.get() )));
+        placeholderMap.put("describe.tag.version.patch.next.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch").get(), descriptionDistance.get() + 1)));
+        placeholderMap.put("describe.tag.version.label.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.version.label").get(), descriptionDistance.get())));
+        placeholderMap.put("describe.tag.version.label.next.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.label.next").get(), descriptionDistance.get())));
 
         // command parameters e.g. mvn -Dfoo=123 will be available as ${property.foo}
         for (Entry<Object, Object> property : mavenSession.getUserProperties().entrySet()) {
@@ -1300,18 +1297,11 @@ private static String slugify(String value) {
     }
 
     private static String increaseStringNumber(String majorVersion) {
-        return increaseStringNumberBy(majorVersion, 1);
-    }
-
-    private static String increaseStringNumberBy(String toIncrease, long by) {
-        return String.format("%0" + toIncrease.length() + "d", Long.parseLong(toIncrease) + by);
+        return increase(majorVersion, 1);
     }
 
-    private static String extractLabelNumber(Lazy<Matcher> versionComponents) {
-        String label = requireNonNullElse(versionComponents.get().group("label"), "0");
-        // This should throw a build-killing error if we are unparseable as a numeric
-        return String.valueOf(Integer.parseInt(label));
+    private static String increase(String toIncrease, long by) {
+        String sanitized = toIncrease.isEmpty() ? "0" : toIncrease;
+        return String.format("%0" + sanitized.length() + "d", Long.parseLong(toIncrease.isEmpty() ? "0" : toIncrease) + by);
     }
-
-
 }

From 15f9f722ffe33b49a3af9efe40e001730a48eb8d Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Tue, 26 Jul 2022 20:39:43 +0200
Subject: [PATCH 013/140] refactor: cleanup

---
 .../GitVersioningModelProcessor.java          | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 50323459..754d93f9 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -727,13 +727,13 @@ private Map<String, Supplier<String>> generateFormatPlaceholderMap(String projec
         placeholderMap.put("version.core", Lazy.by(() -> requireNonNullElse(versionComponents.get().group("core"), "0.0.0")));
 
         placeholderMap.put("version.major", Lazy.by(() -> requireNonNullElse(versionComponents.get().group("major"), "0")));
-        placeholderMap.put("version.major.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("version.major").get())));
+        placeholderMap.put("version.major.next", Lazy.by(() -> increase(placeholderMap.get("version.major").get(), 1)));
 
         placeholderMap.put("version.minor", Lazy.by(() -> requireNonNullElse(versionComponents.get().group("minor"), "0")));
-        placeholderMap.put("version.minor.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("version.minor").get())));
+        placeholderMap.put("version.minor.next", Lazy.by(() -> increase(placeholderMap.get("version.minor").get(), 1)));
 
         placeholderMap.put("version.patch", Lazy.by(() -> requireNonNullElse(versionComponents.get().group("patch"), "0")));
-        placeholderMap.put("version.patch.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("version.patch").get())));
+        placeholderMap.put("version.patch.next", Lazy.by(() -> increase(placeholderMap.get("version.patch").get(), 1)));
 
         placeholderMap.put("version.label", Lazy.by(() -> requireNonNullElse(versionComponents.get().group("label"), "")));
         placeholderMap.put("version.label.prefixed", Lazy.by(() -> {
@@ -839,21 +839,23 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
         placeholderMap.put("describe.tag.version.core", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("core"), "0")));
 
         placeholderMap.put("describe.tag.version.major", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("major"), "0")));
-        placeholderMap.put("describe.tag.version.major.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.major").get())));
+        placeholderMap.put("describe.tag.version.major.next", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.major").get(), 1)));
 
         placeholderMap.put("describe.tag.version.minor", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("minor"), "0")));
-        placeholderMap.put("describe.tag.version.minor.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.minor").get())));
+        placeholderMap.put("describe.tag.version.minor.next", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.minor").get(), 1)));
 
         placeholderMap.put("describe.tag.version.patch", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("patch"), "0")));
-        placeholderMap.put("describe.tag.version.patch.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.patch").get())));
+        placeholderMap.put("describe.tag.version.patch.next", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch").get(), 1)));
 
         placeholderMap.put("describe.tag.version.version.label", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("label"), "")));
-        placeholderMap.put("describe.tag.version.label.next", Lazy.by(() -> increaseStringNumber(placeholderMap.get("describe.tag.version.label").get())));
+        placeholderMap.put("describe.tag.version.label.next", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.label").get(), 1)));
 
         final Lazy<Integer> descriptionDistance = Lazy.by(() -> description.get().getDistance());
-        placeholderMap.put("describe.distance", Lazy.by(() -> String.valueOf(description.get().getDistance())));
+        placeholderMap.put("describe.distance", Lazy.by(() -> String.valueOf(descriptionDistance.get())));
+
         placeholderMap.put("describe.tag.version.patch.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch").get(), descriptionDistance.get() )));
-        placeholderMap.put("describe.tag.version.patch.next.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch").get(), descriptionDistance.get() + 1)));
+        placeholderMap.put("describe.tag.version.patch.next.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch.next").get(), descriptionDistance.get())));
+
         placeholderMap.put("describe.tag.version.label.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.version.label").get(), descriptionDistance.get())));
         placeholderMap.put("describe.tag.version.label.next.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.label.next").get(), descriptionDistance.get())));
 
@@ -1296,12 +1298,9 @@ private static String slugify(String value) {
         return value.replace("/", "-");
     }
 
-    private static String increaseStringNumber(String majorVersion) {
-        return increase(majorVersion, 1);
-    }
 
-    private static String increase(String toIncrease, long by) {
-        String sanitized = toIncrease.isEmpty() ? "0" : toIncrease;
-        return String.format("%0" + sanitized.length() + "d", Long.parseLong(toIncrease.isEmpty() ? "0" : toIncrease) + by);
+    private static String increase(String number, long increment) {
+        String sanitized = number.isEmpty() ? "0" : number;
+        return String.format("%0" + sanitized.length() + "d", Long.parseLong(number.isEmpty() ? "0" : number) + increment);
     }
 }

From c40d5f80e299817b14c23a3a8b5c66e83333beae Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Tue, 26 Jul 2022 20:41:42 +0200
Subject: [PATCH 014/140] build(release): bump minor version

---
 CHANGELOG.md | 9 +++++++++
 README.md    | 2 +-
 pom.xml      | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d9f120e..1ba91259 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,15 @@
 
 # Changelog
 
+## 9.3.0
+
+##### Features
+- add new placeholders
+  - `${describe.tag.version.patch.plus.describe.distance}`
+  - `${describe.tag.version.patch.next.plus.describe.distance}`
+  - `${describe.tag.version.label.plus.describe.distance}`
+  - `${describe.tag.version.label.next.plus.describe.distance}`
+
 ## 9.2.0
 
 ##### Features
diff --git a/README.md b/README.md
index 3d409428..350c6179 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.2.0</version>
+        <version>9.3.0</version>
     </extension>
 
 </extensions>
diff --git a/pom.xml b/pom.xml
index d105ba49..c4d61f70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.2.0</version>
+    <version>9.3.0</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>

From bd93df8683a4b40e6651c4f0cc802ddb3b46c1ee Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Tue, 23 Aug 2022 21:35:33 +0200
Subject: [PATCH 015/140] Update README.md

---
 README.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 350c6179..c7d0d028 100644
--- a/README.md
+++ b/README.md
@@ -19,14 +19,13 @@ This extension can virtually set project version and properties, based on curren
     * managing project versions within files and Git tags
     * git merge conflicts
 
-## Usage
-
-⚠️ If you're using **IntelliJ** have a look at [IntelliJ Setup Instructions](#intellij---multi-modules-projects)
-
 #### Requirements
 * ⚠️ minimal required java version is `11`
 * ⚠️ minimal required maven version is `3.6.3`
 
+## Usage
+
+⚠️ If you're using **IntelliJ** have a look at [IntelliJ Setup Instructions](#intellij---multi-modules-projects)
 
 ### Add Extension to Maven Project
 
@@ -46,7 +45,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
 </extensions>
 ```
 
-## Configure Extension
+### Configure Extension
 
 ℹ Consider [CI/CD](#cicd-setup) section when running this extension in a CI/CD environment
 
@@ -57,7 +56,6 @@ You can configure the version and properties adjustments for specific branches a
 **Example:** `maven-git-versioning-extension.xml`
 
 ```xml
-
 <configuration xmlns="https://github.com/qoomon/maven-git-versioning-extension"
                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-7.0.0.xsd">

From 85009340e416c6226e11394f8303206a2eb2305c Mon Sep 17 00:00:00 2001
From: Antonino Grasso <antonino.grasso@device-insight.com>
Date: Tue, 27 Sep 2022 09:41:37 +0200
Subject: [PATCH 016/140] Add gitlab ci support for env var
 CI_MERGE_REQUEST_SOURCE_BRANCH_NAME

---
 .../maven/gitversioning/GitVersioningModelProcessor.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 754d93f9..492f5c2a 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -577,12 +577,14 @@ private GitSituation getGitSituation(File executionRootDirectory) throws IOExcep
                 if (overrideBranch == null && overrideTag == null) {
                     final String gitlabEnv = System.getenv("GITLAB_CI");
                     if (gitlabEnv != null && gitlabEnv.equals("true")) {
-                        logger.info("gather git situation from GitLab CI environment variables: CI_COMMIT_BRANCH and CI_COMMIT_TAG");
+                        logger.info("gather git situation from GitLab CI environment variables: CI_COMMIT_BRANCH, CI_COMMIT_TAG and CI_MERGE_REQUEST_SOURCE_BRANCH_NAME");
                         String commitBranch = System.getenv("CI_COMMIT_BRANCH");
                         String commitTag = System.getenv("CI_COMMIT_TAG");
+                        String mrSourceBranch = System.getenv("CI_MERGE_REQUEST_SOURCE_BRANCH_NAME");
                         logger.debug("  CI_COMMIT_BRANCH: " + commitBranch);
                         logger.debug("  CI_COMMIT_TAG: " + commitTag);
-                        overrideBranch = commitBranch;
+                        logger.debug("  CI_MERGE_REQUEST_SOURCE_BRANCH_NAME: " + mrSourceBranch);
+                        overrideBranch = commitBranch == null ? mrSourceBranch : commitBranch;
                         overrideTag = commitTag;
                     }
                 }

From c82e79b8299968544e2f777d96edbef3fb944700 Mon Sep 17 00:00:00 2001
From: Antonino Grasso <antonino.grasso@device-insight.com>
Date: Tue, 27 Sep 2022 15:34:24 +0200
Subject: [PATCH 017/140] Adjust readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c7d0d028..c98475b7 100644
--- a/README.md
+++ b/README.md
@@ -307,7 +307,7 @@ You can provide those, by using [Parameters & Environment Variables](#parameters
 ### Native Support
 
 * GitHub Actions: if `$GITHUB_ACTIONS == true`, `GITHUB_REF` is considered
-* GitLab CI: if `$GITLAB_CI == true`, `CI_COMMIT_BRANCH` and `CI_COMMIT_TAG` are considered
+* GitLab CI: if `$GITLAB_CI == true`, `CI_COMMIT_BRANCH`, `CI_COMMIT_TAG` and `CI_MERGE_REQUEST_SOURCE_BRANCH_NAME` are considered
 * Circle CI: if `$CIRCLECI == true`, `CIRCLE_BRANCH` and `CIRCLE_TAG` are considered
 * Jenkins: if `JENKINS_HOME` is set, `BRANCH_NAME` and `TAG_NAME` are considered
 

From 5e88200145292101ff17567cb992a1433349c5d6 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Tue, 27 Sep 2022 15:44:01 +0200
Subject: [PATCH 018/140] build(release): bump patch version

---
 CHANGELOG.md |  5 +++++
 pom.xml      | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ba91259..eac0a1db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 # Changelog
 
+## 9.3.1
+
+##### Fixes
+- Extend gitlab ci support for env var CI_MERGE_REQUEST_SOURCE_BRANCH_NAME #218
+
 ## 9.3.0
 
 ##### Features
diff --git a/pom.xml b/pom.xml
index c4d61f70..c9b6ebf5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.3.0</version>
+    <version>9.3.1</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit</artifactId>
-            <version>6.1.0.202203080745-r</version>
+            <version>6.3.0.202209071007-r</version>
         </dependency>
 
         <dependency>
@@ -91,14 +91,14 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.8.2</version>
+            <version>5.9.1</version>
             <scope>test</scope>
         </dependency>
 
@@ -172,7 +172,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-enforcer-plugin</artifactId>
-                        <version>3.0.0</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>enforce-no-snapshots</id>
@@ -207,7 +207,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.4.0</version>
+                        <version>3.4.1</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>

From 436f5920188fb65d2c60409dab508ee3c8a922cf Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Tue, 27 Sep 2022 15:46:05 +0200
Subject: [PATCH 019/140] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c98475b7..eccd15c1 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.3.0</version>
+        <version>9.3.1</version>
     </extension>
 
 </extensions>

From b751e1605ec0c14bb89e4d7bb2d7c95af65defc6 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Sat, 15 Oct 2022 17:35:51 +0200
Subject: [PATCH 020/140] Add files via upload

---
 docs/configuration-9.1.0.xsd | 90 ++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 docs/configuration-9.1.0.xsd

diff --git a/docs/configuration-9.1.0.xsd b/docs/configuration-9.1.0.xsd
new file mode 100644
index 00000000..998ebde9
--- /dev/null
+++ b/docs/configuration-9.1.0.xsd
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<xs:schema xmlns="https://github.com/qoomon/maven-git-versioning-extension"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="https://github.com/qoomon/maven-git-versioning-extension"
+           elementFormDefault="qualified">
+
+    <xs:element name="configuration">
+        <xs:complexType>
+            <xs:all>
+                <xs:element name="disable" type="xs:boolean" minOccurs="0"/>
+
+                <xs:element name="projectVersionPattern" type="xs:string" minOccurs="0"/>
+
+                <xs:element name="describeTagPattern" type="xs:string" minOccurs="0"/>
+                <xs:element name="updatePom" type="xs:boolean" minOccurs="0"/>
+
+                <xs:element name="refs" minOccurs="0">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="ref" type="RefPatchDescription" minOccurs="0" maxOccurs="unbounded"/>
+                        </xs:sequence>
+
+                        <xs:attribute name="considerTagsOnBranches" type="xs:boolean"/>
+                    </xs:complexType>
+                </xs:element>
+
+                <xs:element name="rev" type="PatchDescription" minOccurs="0"/>
+
+                <xs:element name="relatedProjects" minOccurs="0">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="project" type="RelatedProject" minOccurs="0" maxOccurs="unbounded"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:all>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:complexType name="PatchDescription">
+        <xs:all>
+            <xs:element name="describeTagPattern" type="xs:string" minOccurs="0"/>
+            <xs:element name="updatePom" type="xs:boolean" minOccurs="0"/>
+
+            <xs:element name="version" type="xs:string" minOccurs="0"/>
+            <xs:element name="properties" minOccurs="0">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:all>
+    </xs:complexType>
+
+    <xs:complexType name="RefPatchDescription">
+        <xs:all>
+            <xs:element name="pattern" type="xs:string" minOccurs="0"/>
+            <xs:element name="describeTagPattern" type="xs:string" minOccurs="0"/>
+            <xs:element name="updatePom" type="xs:boolean" minOccurs="0"/>
+
+            <xs:element name="version" type="xs:string" minOccurs="0"/>
+            <xs:element name="properties" minOccurs="0">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:all>
+
+        <xs:attribute name="type" use="required">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="tag"/>
+                    <xs:enumeration value="branch"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:complexType>
+
+    <xs:complexType name="RelatedProject">
+        <xs:all>
+            <xs:element name="groupId" type="xs:string"/>
+            <xs:element name="artifactId" type="xs:string"/>
+        </xs:all>
+    </xs:complexType>
+
+</xs:schema>
\ No newline at end of file

From 5e944368e83b5ad8f92fcb27ee93e802e962e1e0 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Sat, 15 Oct 2022 17:36:11 +0200
Subject: [PATCH 021/140] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eccd15c1..aaf075e1 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ You can configure the version and properties adjustments for specific branches a
 ```xml
 <configuration xmlns="https://github.com/qoomon/maven-git-versioning-extension"
                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-7.0.0.xsd">
+               xsi:schemaLocation="https://github.com/qoomon/maven-git-versioning-extension https://qoomon.github.io/maven-git-versioning-extension/configuration-9.1.0.xsd">
 
     <refs>
         <ref type="branch">

From 43da9e2a5379d343a5c4eb80f3664bdcd9643ca9 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Mon, 24 Oct 2022 09:51:44 +0200
Subject: [PATCH 022/140] refactor: simplify

---
 .../GitVersioningModelProcessor.java          | 39 ++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 492f5c2a..168c4951 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -64,7 +64,7 @@
 @Singleton
 public class GitVersioningModelProcessor extends DefaultModelProcessor {
 
-    private static final Pattern VERSION_PATTERN = Pattern.compile("(:?(?<core>(?<major>\\d+)(:?\\.(?<minor>\\d+)(:?\\.(?<patch>\\d+))?)?)(:?-(?<label>.*))?)?");
+    private static final Pattern VERSION_PATTERN = Pattern.compile(".*?(?<core>(?<major>\\d+)(?:\\.(?<minor>\\d+)(?:\\.(?<patch>\\d+))?)?)(?:-(?<label>.*))?|");
 
     private static final String OPTION_NAME_GIT_REF = "git.ref";
     private static final String OPTION_NAME_GIT_TAG = "git.tag";
@@ -719,12 +719,7 @@ private Map<String, Supplier<String>> generateFormatPlaceholderMap(String projec
 
         placeholderMap.put("version", Lazy.of(projectVersion));
 
-        final Lazy<Matcher> versionComponents = Lazy.by(() -> {
-            Matcher matcher = VERSION_PATTERN.matcher(projectVersion);
-            //noinspection ResultOfMethodCallIgnored
-            matcher.find();
-            return matcher;
-        });
+        final Lazy<Matcher> versionComponents = Lazy.by(() -> matchVersion(projectVersion));
 
         placeholderMap.put("version.core", Lazy.by(() -> requireNonNullElse(versionComponents.get().group("core"), "0.0.0")));
 
@@ -826,30 +821,22 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
             placeholderMap.put("describe.tag." + groupName + ".slug", Lazy.by(() -> slugify(groupValue.get())));
         }
 
-        Supplier<String> descriptionTagVersion = placeholderMap.computeIfAbsent("describe.tag.version", key -> Lazy.by(() -> {
-            Matcher matcher = VERSION_PATTERN.matcher(descriptionTag.get());
-            return matcher.find() ? matcher.group() : "0.0.0";
-        }));
+        final Lazy<Matcher> descriptionTagVersionMatcher = Lazy.by(() -> matchVersion(descriptionTag.get()));
 
-        final Lazy<Matcher> descriptionTagVersionComponents = Lazy.by(() -> {
-            Matcher matcher = VERSION_PATTERN.matcher(descriptionTagVersion.get());
-            //noinspection ResultOfMethodCallIgnored
-            matcher.find();
-            return matcher;
-        });
+        placeholderMap.put("describe.tag.version", Lazy.by(() -> requireNonNullElse(descriptionTagVersionMatcher.get().group(), "0.0.0")));
 
-        placeholderMap.put("describe.tag.version.core", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("core"), "0")));
+        placeholderMap.put("describe.tag.version.core", Lazy.by(() -> requireNonNullElse(descriptionTagVersionMatcher.get().group("core"), "0")));
 
-        placeholderMap.put("describe.tag.version.major", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("major"), "0")));
+        placeholderMap.put("describe.tag.version.major", Lazy.by(() -> requireNonNullElse(descriptionTagVersionMatcher.get().group("major"), "0")));
         placeholderMap.put("describe.tag.version.major.next", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.major").get(), 1)));
 
-        placeholderMap.put("describe.tag.version.minor", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("minor"), "0")));
+        placeholderMap.put("describe.tag.version.minor", Lazy.by(() -> requireNonNullElse(descriptionTagVersionMatcher.get().group("minor"), "0")));
         placeholderMap.put("describe.tag.version.minor.next", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.minor").get(), 1)));
 
-        placeholderMap.put("describe.tag.version.patch", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("patch"), "0")));
+        placeholderMap.put("describe.tag.version.patch", Lazy.by(() -> requireNonNullElse(descriptionTagVersionMatcher.get().group("patch"), "0")));
         placeholderMap.put("describe.tag.version.patch.next", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch").get(), 1)));
 
-        placeholderMap.put("describe.tag.version.version.label", Lazy.by(() -> requireNonNullElse(descriptionTagVersionComponents.get().group("label"), "")));
+        placeholderMap.put("describe.tag.version.version.label", Lazy.by(() -> requireNonNullElse(descriptionTagVersionMatcher.get().group("label"), "")));
         placeholderMap.put("describe.tag.version.label.next", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.label").get(), 1)));
 
         final Lazy<Integer> descriptionDistance = Lazy.by(() -> description.get().getDistance());
@@ -874,6 +861,14 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
         return placeholderMap;
     }
 
+    private Matcher matchVersion(String input) {
+        Matcher matcher = VERSION_PATTERN.matcher(input);
+        //noinspection ResultOfMethodCallIgnored
+        matcher.find();
+
+        return matcher;
+    }
+
     // ---- configuration -------------------------------------------------------------------------------------------------
 
     private static File findMvnDirectory(File baseDirectory) throws IOException {

From 83a015ef0b66dbfc4f0beaddb1b723a321353e0e Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Sat, 5 Nov 2022 21:53:04 +0100
Subject: [PATCH 023/140] fix: automatically add git version plugin to maven
 enforcer unCheckedPluginList #171

---
 CHANGELOG.md                                  |  5 ++
 README.md                                     |  2 +-
 pom.xml                                       |  2 +-
 .../GitVersioningModelProcessor.java          | 53 +++++++++++++++----
 .../testProjects/standardProject/pom.xml      | 36 ++++++-------
 5 files changed, 68 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eac0a1db..7f185cca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@
 
 ## 9.3.1
 
+##### Fixes
+- automatically add git version plugin to maven enforcer unCheckedPluginList #171
+
+## 9.3.1
+
 ##### Fixes
 - Extend gitlab ci support for env var CI_MERGE_REQUEST_SOURCE_BRANCH_NAME #218
 
diff --git a/README.md b/README.md
index aaf075e1..eee7bde0 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.3.1</version>
+        <version>9.3.2</version>
     </extension>
 
 </extensions>
diff --git a/pom.xml b/pom.xml
index c9b6ebf5..8ae04451 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.3.1</version>
+    <version>9.3.2</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 168c4951..787a83e9 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -17,6 +17,7 @@
 import org.apache.maven.model.building.DefaultModelProcessor;
 import org.apache.maven.model.building.ModelProcessor;
 import org.apache.maven.session.scope.internal.SessionScope;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.slf4j.Logger;
@@ -508,22 +509,54 @@ private void addProjectProperties(Model projectModel) {
     }
 
     private void addBuildPlugin(Model projectModel) {
-        logger.debug("add version build plugin");
-
-        Plugin plugin = asPlugin();
 
-        PluginExecution execution = new PluginExecution();
-        execution.setId(GitVersioningMojo.GOAL);
-        execution.getGoals().add(GitVersioningMojo.GOAL);
+        logger.debug("add version build plugin");
 
-        plugin.getExecutions().add(execution);
+        Plugin gitVersioningPlugin = asPlugin();
+        {
+            PluginExecution execution = new PluginExecution();
+            execution.setId(GitVersioningMojo.GOAL);
+            execution.getGoals().add(GitVersioningMojo.GOAL);
+            gitVersioningPlugin.getExecutions().add(execution);
+        }
 
         if (projectModel.getBuild() == null) {
             projectModel.setBuild(new Build());
         }
+
         // add at index 0 to be executed before any other project plugin,
         // to prevent malfunctions with other plugins
-        projectModel.getBuild().getPlugins().add(0, plugin);
+        projectModel.getBuild().getPlugins().add(0, gitVersioningPlugin);
+
+        // exclude this plugin from maven enforce plugin
+        {
+            LinkedList<Plugin> plugins = new LinkedList<>(projectModel.getBuild().getPlugins());
+            if (projectModel.getBuild().getPluginManagement() != null) {
+                plugins.addAll(projectModel.getBuild().getPluginManagement().getPlugins());
+            }
+            plugins.stream().filter(it -> it.getKey().equals("org.apache.maven.plugins:maven-enforcer-plugin")).forEach(plugin -> {
+                plugin.getExecutions().forEach(execution -> {
+                    Xpp3Dom configuration = (Xpp3Dom) execution.getConfiguration();
+                    if (configuration != null) {
+                        Xpp3Dom rules = configuration.getChild("rules");
+                        if (rules != null) {
+                            Xpp3Dom requirePluginVersions = rules.getChild("requirePluginVersions");
+                            if (requirePluginVersions != null) {
+                                Xpp3Dom unCheckedPluginList = requirePluginVersions.getChild("unCheckedPluginList");
+                                if (unCheckedPluginList == null) {
+                                    unCheckedPluginList = new Xpp3Dom("unCheckedPluginList");
+                                    requirePluginVersions.addChild(unCheckedPluginList);
+                                }
+                                // prepend git versioning plugin to unCheckedPluginList
+                                unCheckedPluginList.setValue(gitVersioningPlugin.getKey() + ","
+                                        + Objects.requireNonNullElse(unCheckedPluginList.getValue(), "")
+                                );
+                            }
+                        }
+                    }
+                });
+            });
+        }
     }
 
 
@@ -739,7 +772,7 @@ private Map<String, Supplier<String>> generateFormatPlaceholderMap(String projec
         }));
 
         // deprecated
-        placeholderMap.put("version.release",  Lazy.by(() -> projectVersion.replaceFirst("-.*$", "")));
+        placeholderMap.put("version.release", Lazy.by(() -> projectVersion.replaceFirst("-.*$", "")));
 
         final Pattern projectVersionPattern = config.projectVersionPattern();
         if (projectVersionPattern != null) {
@@ -842,7 +875,7 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
         final Lazy<Integer> descriptionDistance = Lazy.by(() -> description.get().getDistance());
         placeholderMap.put("describe.distance", Lazy.by(() -> String.valueOf(descriptionDistance.get())));
 
-        placeholderMap.put("describe.tag.version.patch.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch").get(), descriptionDistance.get() )));
+        placeholderMap.put("describe.tag.version.patch.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch").get(), descriptionDistance.get())));
         placeholderMap.put("describe.tag.version.patch.next.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch.next").get(), descriptionDistance.get())));
 
         placeholderMap.put("describe.tag.version.label.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.version.label").get(), descriptionDistance.get())));
diff --git a/src/test/resources/testProjects/standardProject/pom.xml b/src/test/resources/testProjects/standardProject/pom.xml
index 2efe57cf..804d19da 100644
--- a/src/test/resources/testProjects/standardProject/pom.xml
+++ b/src/test/resources/testProjects/standardProject/pom.xml
@@ -6,11 +6,11 @@
 
     <groupId>test</groupId>
     <artifactId>test-artifact</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
 
     <properties>
         <foo.bar>xxx</foo.bar>
-        <project.build.outputTimestamp>xxx</project.build.outputTimestamp>
+<!--        <project.build.outputTimestamp>xxx</project.build.outputTimestamp>-->
         <dep.dependency-management-plugin>0.4</dep.dependency-management-plugin>
         <dep.enforce-managed-deps-rule>1.3</dep.enforce-managed-deps-rule>
         <dep.extra-enforcer-rules>1.5.1</dep.extra-enforcer-rules>
@@ -36,22 +36,22 @@
 
     <build>
         <plugins>
-<!--            <plugin>-->
-<!--                <artifactId>maven-enforcer-plugin</artifactId>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>fail</id>-->
-<!--                        <goals>-->
-<!--                            <goal>enforce</goal>-->
-<!--                        </goals>-->
-<!--                        <configuration>-->
-<!--                            <rules>-->
-<!--                                <requirePluginVersions/>-->
-<!--                            </rules>-->
-<!--                        </configuration>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>fail</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requirePluginVersions/>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
 
         <pluginManagement>

From 7b756dd791e0d65b292f1ee95d88fcbf32aed319 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Wed, 9 Nov 2022 17:32:41 +0100
Subject: [PATCH 024/140] fix: fix value of describe.tag.version placeholder

---
 CHANGELOG.md                                              | 8 +++++++-
 README.md                                                 | 2 +-
 pom.xml                                                   | 2 +-
 .../maven/gitversioning/GitVersioningModelProcessor.java  | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f185cca..b8d686bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,13 @@
 
 # Changelog
 
-## 9.3.1
+## 9.3.3
+
+##### Fixes
+- fix value of describe.tag.version placeholder
+
+
+## 9.3.2
 
 ##### Fixes
 - automatically add git version plugin to maven enforcer unCheckedPluginList #171
diff --git a/README.md b/README.md
index eee7bde0..d1a3787c 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.3.2</version>
+        <version>9.3.3</version>
     </extension>
 
 </extensions>
diff --git a/pom.xml b/pom.xml
index 8ae04451..fa24c430 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.3.2</version>
+    <version>9.3.3</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 787a83e9..b9b7d1ad 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -65,7 +65,7 @@
 @Singleton
 public class GitVersioningModelProcessor extends DefaultModelProcessor {
 
-    private static final Pattern VERSION_PATTERN = Pattern.compile(".*?(?<core>(?<major>\\d+)(?:\\.(?<minor>\\d+)(?:\\.(?<patch>\\d+))?)?)(?:-(?<label>.*))?|");
+    private static final Pattern VERSION_PATTERN = Pattern.compile(".*?(?<version>(?<core>(?<major>\\d+)(?:\\.(?<minor>\\d+)(?:\\.(?<patch>\\d+))?)?)(?:-(?<label>.*))?)|");
 
     private static final String OPTION_NAME_GIT_REF = "git.ref";
     private static final String OPTION_NAME_GIT_TAG = "git.tag";
@@ -856,7 +856,7 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
 
         final Lazy<Matcher> descriptionTagVersionMatcher = Lazy.by(() -> matchVersion(descriptionTag.get()));
 
-        placeholderMap.put("describe.tag.version", Lazy.by(() -> requireNonNullElse(descriptionTagVersionMatcher.get().group(), "0.0.0")));
+        placeholderMap.put("describe.tag.version", Lazy.by(() -> requireNonNullElse(descriptionTagVersionMatcher.get().group("version"), "0.0.0")));
 
         placeholderMap.put("describe.tag.version.core", Lazy.by(() -> requireNonNullElse(descriptionTagVersionMatcher.get().group("core"), "0")));
 

From a481efe83a42314e5767bce9b2b667287d64badf Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Mon, 5 Dec 2022 15:44:42 +0100
Subject: [PATCH 025/140] fix: ignore ci/cd environment if head SHA hash is not
 matching environment variable commit hash

---
 CHANGELOG.md                                  |   5 +
 pom.xml                                       |   2 +-
 .../gitversioning/commons/GitSituation.java   |  52 +++-
 .../GitVersioningModelProcessor.java          | 249 ++++++++++--------
 4 files changed, 189 insertions(+), 119 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8d686bc..f4d6ce9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 # Changelog
 
+## 9.3.4
+
+##### Fixes
+- ignore ci/cd environment if head SHA hash is not matching environment variable commit hash
+
 ## 9.3.3
 
 ##### Fixes
diff --git a/pom.xml b/pom.xml
index fa24c430..e38676c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.3.3</version>
+    <version>9.3.4</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>
diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java b/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
index 6a0af702..93811058 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
@@ -9,14 +9,17 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.time.ZonedDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static java.time.Instant.EPOCH;
 import static java.time.ZoneOffset.UTC;
 import static java.util.Collections.emptyList;
 import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.toList;
 import static me.qoomon.gitversioning.commons.GitUtil.NO_COMMIT;
 import static org.eclipse.jgit.lib.Constants.HEAD;
 
@@ -80,8 +83,19 @@ public String getBranch() {
         return branch.get();
     }
 
-    public void setBranch(String branch) {
-        this.branch = () -> branch;
+    protected void setBranch(String branch) {
+        if (branch != null) {
+            if (branch.startsWith("refs/tags/")) {
+                throw new IllegalArgumentException("invalid branch ref" + branch);
+            }
+            branch = branch
+                    // support default branches (heads)
+                    .replaceFirst("^refs/heads/", "")
+                    // support other refs e.g. GitHub pull requests refs/pull/1000/head
+                    .replaceFirst("^refs/", "");
+        }
+        final String finalBranch = branch;
+        this.branch = () -> finalBranch;
     }
 
     public boolean isDetached() {
@@ -92,8 +106,38 @@ public List<String> getTags() {
         return tags.get();
     }
 
-    public void setTags(List<String> tags) {
-        this.tags = () -> requireNonNull(tags);
+    protected void addTag(String tag) {
+        requireNonNull(tag);
+
+        if (tag.startsWith("refs/") && !tag.startsWith("refs/tags/")) {
+            throw new IllegalArgumentException("invalid tag ref" + tag);
+        }
+
+        final String finalTag = tag.replaceFirst("^refs/tags/", "");
+
+        final Supplier<List<String>> currentTags = this.tags;
+        this.tags = Lazy.by(() -> {
+            List<String> tags = new ArrayList<>(currentTags.get());
+            tags.add(finalTag);
+            return tags;
+        });
+    }
+
+    protected void setTags(List<String> tags) {
+        requireNonNull(tags);
+        tags.forEach(tag -> {
+            requireNonNull(tag);
+            if (tag.startsWith("refs/") && !tag.startsWith("refs/tags/")) {
+                throw new IllegalArgumentException("invalid tag ref" + tag);
+            }
+        });
+
+        tags = tags.stream()
+                .map(tag -> tag.replaceFirst("^refs/tags/", ""))
+                .collect(toList());
+
+        final List<String> finalTags = tags;
+        this.tags = () -> finalTags;
     }
 
     public boolean isClean() {
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index b9b7d1ad..1210c4e5 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -534,28 +534,28 @@ private void addBuildPlugin(Model projectModel) {
             if (projectModel.getBuild().getPluginManagement() != null) {
                 plugins.addAll(projectModel.getBuild().getPluginManagement().getPlugins());
             }
-            plugins.stream().filter(it -> it.getKey().equals("org.apache.maven.plugins:maven-enforcer-plugin")).forEach(plugin -> {
-                plugin.getExecutions().forEach(execution -> {
-                    Xpp3Dom configuration = (Xpp3Dom) execution.getConfiguration();
-                    if (configuration != null) {
-                        Xpp3Dom rules = configuration.getChild("rules");
-                        if (rules != null) {
-                            Xpp3Dom requirePluginVersions = rules.getChild("requirePluginVersions");
-                            if (requirePluginVersions != null) {
-                                Xpp3Dom unCheckedPluginList = requirePluginVersions.getChild("unCheckedPluginList");
-                                if (unCheckedPluginList == null) {
-                                    unCheckedPluginList = new Xpp3Dom("unCheckedPluginList");
-                                    requirePluginVersions.addChild(unCheckedPluginList);
+            plugins.stream()
+                    .filter(it -> it.getKey().equals("org.apache.maven.plugins:maven-enforcer-plugin"))
+                    .forEach(plugin -> plugin.getExecutions().forEach(execution -> {
+                        Xpp3Dom configuration = (Xpp3Dom) execution.getConfiguration();
+                        if (configuration != null) {
+                            Xpp3Dom rules = configuration.getChild("rules");
+                            if (rules != null) {
+                                Xpp3Dom requirePluginVersions = rules.getChild("requirePluginVersions");
+                                if (requirePluginVersions != null) {
+                                    Xpp3Dom unCheckedPluginList = requirePluginVersions.getChild("unCheckedPluginList");
+                                    if (unCheckedPluginList == null) {
+                                        unCheckedPluginList = new Xpp3Dom("unCheckedPluginList");
+                                        requirePluginVersions.addChild(unCheckedPluginList);
+                                    }
+                                    // prepend git versioning plugin to unCheckedPluginList
+                                    unCheckedPluginList.setValue(gitVersioningPlugin.getKey() + ","
+                                            + Objects.requireNonNullElse(unCheckedPluginList.getValue(), "")
+                                    );
                                 }
-                                // prepend git versioning plugin to unCheckedPluginList
-                                unCheckedPluginList.setValue(gitVersioningPlugin.getKey() + ","
-                                        + Objects.requireNonNullElse(unCheckedPluginList.getValue(), "")
-                                );
                             }
                         }
-                    }
-                });
-            });
+                    }));
         }
     }
 
@@ -571,128 +571,150 @@ private GitSituation getGitSituation(File executionRootDirectory) throws IOExcep
         final Repository repository = repositoryBuilder.build();
         return new GitSituation(repository) {
             {
-                String overrideBranch = getCommandOption(OPTION_NAME_GIT_BRANCH);
-                String overrideTag = getCommandOption(OPTION_NAME_GIT_TAG);
-
-                if (overrideBranch == null && overrideTag == null) {
-                    final String providedRef = getCommandOption(OPTION_NAME_GIT_REF);
-                    if (providedRef != null) {
-                        if (!providedRef.startsWith("refs/")) {
-                            throw new IllegalArgumentException("invalid provided ref " + providedRef + " -  needs to start with refs/");
-                        }
+                handleEnvironment(repository);
+            }
 
-                        if (providedRef.startsWith("refs/tags/")) {
-                            overrideTag = providedRef;
-                        } else {
-                            overrideBranch = providedRef;
+            private void handleEnvironment(Repository repository) throws IOException {
+                // --- commandline arguments and environment variables
+                {
+                    {
+                        String overrideBranch = getCommandOption(OPTION_NAME_GIT_BRANCH);
+                        String overrideTag = getCommandOption(OPTION_NAME_GIT_TAG);
+                        if (overrideBranch != null || overrideTag != null) {
+                            overrideBranch = overrideBranch == null || overrideBranch.trim().isEmpty() ? null : overrideBranch.trim();
+                            setBranch(overrideBranch);
+
+                            overrideTag = overrideTag == null || overrideTag.trim().isEmpty() ? null : overrideTag.trim();
+                            setTags(overrideTag == null ? emptyList() : singletonList(overrideTag));
+                            return;
                         }
                     }
-                }
 
-                // GitHub Actions support
-                if (overrideBranch == null && overrideTag == null) {
-                    final String githubEnv = System.getenv("GITHUB_ACTIONS");
-                    if (githubEnv != null && githubEnv.equals("true")) {
-                        logger.info("gather git situation from GitHub Actions environment variable: GITHUB_REF");
-                        String githubRef = System.getenv("GITHUB_REF");
-                        logger.debug("  GITHUB_REF: " + githubRef);
-                        if (githubRef != null && githubRef.startsWith("refs/")) {
-                            if (githubRef.startsWith("refs/tags/")) {
-                                overrideTag = githubRef;
+                    {
+                        final String providedRef = getCommandOption(OPTION_NAME_GIT_REF);
+                        if (providedRef != null) {
+                            if (!providedRef.startsWith("refs/")) {
+                                throw new IllegalArgumentException("invalid provided ref " + providedRef + " -  needs to start with refs/");
+                            }
+
+                            if (providedRef.startsWith("refs/tags/")) {
+                                setBranch(null);
+                                setTags(singletonList(providedRef));
                             } else {
-                                overrideBranch = githubRef;
+                                setBranch(providedRef);
+                                setTags(emptyList());
                             }
+                            return;
                         }
                     }
                 }
 
-                // GitLab CI support
-                if (overrideBranch == null && overrideTag == null) {
-                    final String gitlabEnv = System.getenv("GITLAB_CI");
-                    if (gitlabEnv != null && gitlabEnv.equals("true")) {
-                        logger.info("gather git situation from GitLab CI environment variables: CI_COMMIT_BRANCH, CI_COMMIT_TAG and CI_MERGE_REQUEST_SOURCE_BRANCH_NAME");
-                        String commitBranch = System.getenv("CI_COMMIT_BRANCH");
-                        String commitTag = System.getenv("CI_COMMIT_TAG");
-                        String mrSourceBranch = System.getenv("CI_MERGE_REQUEST_SOURCE_BRANCH_NAME");
-                        logger.debug("  CI_COMMIT_BRANCH: " + commitBranch);
-                        logger.debug("  CI_COMMIT_TAG: " + commitTag);
-                        logger.debug("  CI_MERGE_REQUEST_SOURCE_BRANCH_NAME: " + mrSourceBranch);
-                        overrideBranch = commitBranch == null ? mrSourceBranch : commitBranch;
-                        overrideTag = commitTag;
-                    }
+                // --- try getting branch and tag situation from environment ---
+                // skip if we are on a branch
+                if (repository.getBranch() == null) {
+                    return;
                 }
 
-                // Circle CI support
-                if (overrideBranch == null && overrideTag == null) {
-                    final String circleciEnv = System.getenv("CIRCLECI");
-                    if (circleciEnv != null && circleciEnv.equals("true")) {
-                        logger.info("gather git situation from Circle CI environment variables: CIRCLE_BRANCH and CIRCLE_TAG");
-                        String commitBranch = System.getenv("CIRCLE_BRANCH");
-                        String commitTag = System.getenv("CIRCLE_TAG");
-                        logger.debug("  CIRCLE_BRANCH: " + commitBranch);
-                        logger.debug("  CIRCLE_TAG: " + commitTag);
-                        overrideBranch = System.getenv("CIRCLE_BRANCH");
-                        overrideTag = System.getenv("CIRCLE_TAG");
+                // GitHub Actions support
+                if ("true".equalsIgnoreCase(System.getenv("GITHUB_ACTIONS"))) {
+                    if (!System.getenv("GITHUB_SHA").equals(this.getRev())) {
+                        return;
                     }
-                }
 
-                // Jenkins support
-                if (overrideBranch == null && overrideTag == null) {
-                    final String jenkinsEnv = System.getenv("JENKINS_HOME");
-                    if (jenkinsEnv != null && !jenkinsEnv.trim().isEmpty()) {
-                        logger.info("gather git situation from jenkins environment variables: BRANCH_NAME and TAG_NAME");
-                        String branchName = System.getenv("BRANCH_NAME");
-                        String tagName = System.getenv("TAG_NAME");
-                        logger.debug("  BRANCH_NAME: " + branchName);
-                        logger.debug("  TAG_NAME: " + tagName);
-                        if (branchName == null || !branchName.equals(tagName)) {
-                            overrideBranch = branchName;
-                        }
-                        overrideTag = tagName;
+                    logger.info("gather git situation from GitHub Actions environment variable: GITHUB_REF");
+                    String githubRef = System.getenv("GITHUB_REF");
+                    logger.debug("  GITHUB_REF: " + githubRef);
+
+                    if (githubRef.startsWith("refs/tags/")) {
+                        addTag(githubRef);
+                    } else {
+                        setBranch(githubRef);
                     }
+                    return;
                 }
 
-                if (overrideBranch != null || overrideTag != null) {
-                    overrideBranch(overrideBranch);
-                    overrideTags(overrideTag);
-                }
-            }
+                // GitLab CI support
+                if ("true".equalsIgnoreCase(System.getenv("GITLAB_CI"))) {
+                    if (!System.getenv("CI_COMMIT_SHA").equals(this.getRev())) {
+                        return;
+                    }
 
-            void overrideBranch(String branch) {
-                if (branch != null && branch.trim().isEmpty()) {
-                    branch = null;
+                    logger.info("gather git situation from GitLab CI environment variables: CI_COMMIT_BRANCH, CI_MERGE_REQUEST_SOURCE_BRANCH_NAME and CI_COMMIT_TAG");
+                    String commitBranch = System.getenv("CI_COMMIT_BRANCH");
+                    String commitTag = System.getenv("CI_COMMIT_TAG");
+                    String mrSourceBranch = System.getenv("CI_MERGE_REQUEST_SOURCE_BRANCH_NAME");
+                    logger.debug("  CI_COMMIT_BRANCH: " + commitBranch);
+                    logger.debug("  CI_COMMIT_TAG: " + commitTag);
+                    logger.debug("  CI_MERGE_REQUEST_SOURCE_BRANCH_NAME: " + mrSourceBranch);
+
+                    if (commitBranch != null) {
+                        setBranch(commitBranch);
+                    } else if (mrSourceBranch != null) {
+                        setBranch(mrSourceBranch);
+                    } else if (commitTag != null) {
+                        addTag(commitTag);
+                    }
+                    return;
                 }
 
-                if (branch != null) {
-                    if (branch.startsWith("refs/tags/")) {
-                        throw new IllegalArgumentException("invalid branch ref" + branch);
+                // Circle CI support
+                if ("true".equalsIgnoreCase(System.getenv("CIRCLECI"))) {
+                    if (!System.getenv("CIRCLE_SHA1").equals(this.getRev())) {
+                        return;
                     }
 
-                    // two replacement steps to support default branches (heads)
-                    // and other refs e.g. GitHub pull requests refs/pull/1000/head
-                    branch = branch.replaceFirst("^refs/", "")
-                            .replaceFirst("^heads/", "");
+                    logger.info("gather git situation from Circle CI environment variables: CIRCLE_BRANCH and CIRCLE_TAG");
+                    String commitBranch = System.getenv("CIRCLE_BRANCH");
+                    String commitTag = System.getenv("CIRCLE_TAG");
+                    logger.debug("  CIRCLE_BRANCH: " + commitBranch);
+                    logger.debug("  CIRCLE_TAG: " + commitTag);
+
+                    if (commitBranch != null) {
+                        setBranch(commitBranch);
+                    } else if (commitTag != null) {
+                        addTag(commitTag);
+                    }
+                    return;
                 }
 
-                logger.debug("override git branch with: " + branch);
-                setBranch(branch);
+                // Jenkins support
+                if (System.getenv("JENKINS_HOME") != null && !System.getenv("JENKINS_HOME").trim().isEmpty()) {
+                    if (System.getenv("GIT_COMMIT").equals(this.getRev())) {
+                        return;
+                    }
+                    logger.info("gather git situation from jenkins environment variables: BRANCH_NAME and TAG_NAME");
+                    String commitBranch = System.getenv("BRANCH_NAME");
+                    String commitTag = System.getenv("TAG_NAME");
+                    logger.debug("  BRANCH_NAME: " + commitBranch);
+                    logger.debug("  TAG_NAME: " + commitTag);
+
+                    if (commitBranch != null) {
+                        if (commitBranch.equals(commitTag)) {
+                            addTag(commitBranch);
+                        } else {
+                            setBranch(commitBranch);
+                        }
+                    } else if (commitTag != null) {
+                        addTag(commitTag);
+                    }
+                    return;
+                }
             }
 
-            void overrideTags(String tag) {
-                if (tag != null && tag.trim().isEmpty()) {
-                    tag = null;
-                }
 
-                if (tag != null) {
-                    if (tag.startsWith("refs/") && !tag.startsWith("refs/tags/")) {
-                        throw new IllegalArgumentException("invalid tag ref" + tag);
-                    }
+            protected void setBranch(String branch) {
+                logger.debug("override git branch with " + branch);
+                super.setBranch(branch);
+            }
 
-                    tag = tag.replaceFirst("^refs/tags/", "");
-                }
+            protected void setTags(List<String> tags) {
+                logger.debug("override git tags with single tag " + tags);
+                super.setTags(tags);
+            }
 
-                logger.debug("override git tags with: " + tag);
-                setTags(tag == null ? emptyList() : singletonList(tag));
+            protected void addTag(String tag) {
+                logger.debug("add git tag " + tag);
+                super.addTag(tag);
             }
         };
     }
@@ -918,8 +940,7 @@ private static File findMvnDirectory(File baseDirectory) throws IOException {
     }
 
     private static Configuration readConfig(File configFile) throws IOException {
-        final XmlMapper xmlMapper = new XmlMapper();
-        xmlMapper.enable(ACCEPT_CASE_INSENSITIVE_ENUMS);
+        final XmlMapper xmlMapper = XmlMapper.builder().enable(ACCEPT_CASE_INSENSITIVE_ENUMS).build();
 
         final Configuration config = xmlMapper.readValue(configFile, Configuration.class);
 

From 9688826f341530a415277f868e44c33a9349420b Mon Sep 17 00:00:00 2001
From: jycr <jycr@users.noreply.github.com>
Date: Thu, 22 Dec 2022 22:46:51 +0100
Subject: [PATCH 026/140] fix: commit#a481efe : Condition has been inverted.

Also, takes consideration of missing GIT_COMMIT environment variable.
---
 .../qoomon/maven/gitversioning/GitVersioningModelProcessor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 1210c4e5..1dbf27ca 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -679,7 +679,7 @@ private void handleEnvironment(Repository repository) throws IOException {
 
                 // Jenkins support
                 if (System.getenv("JENKINS_HOME") != null && !System.getenv("JENKINS_HOME").trim().isEmpty()) {
-                    if (System.getenv("GIT_COMMIT").equals(this.getRev())) {
+                    if (!this.getRev().equals(System.getenv("GIT_COMMIT"))) {
                         return;
                     }
                     logger.info("gather git situation from jenkins environment variables: BRANCH_NAME and TAG_NAME");

From efe4eb2ece17e8dffb425994a1833ea114e4e6af Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Sun, 25 Dec 2022 16:06:28 +0100
Subject: [PATCH 027/140] Update GitVersioningModelProcessor.java

---
 .../maven/gitversioning/GitVersioningModelProcessor.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 1dbf27ca..19b4a12a 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -617,7 +617,7 @@ private void handleEnvironment(Repository repository) throws IOException {
 
                 // GitHub Actions support
                 if ("true".equalsIgnoreCase(System.getenv("GITHUB_ACTIONS"))) {
-                    if (!System.getenv("GITHUB_SHA").equals(this.getRev())) {
+                    if (!this.getRev().equals(System.getenv("GITHUB_SHA"))) {
                         return;
                     }
 
@@ -635,7 +635,7 @@ private void handleEnvironment(Repository repository) throws IOException {
 
                 // GitLab CI support
                 if ("true".equalsIgnoreCase(System.getenv("GITLAB_CI"))) {
-                    if (!System.getenv("CI_COMMIT_SHA").equals(this.getRev())) {
+                    if (!this.getRev().equals(System.getenv("CI_COMMIT_SHA"))) {
                         return;
                     }
 
@@ -659,7 +659,7 @@ private void handleEnvironment(Repository repository) throws IOException {
 
                 // Circle CI support
                 if ("true".equalsIgnoreCase(System.getenv("CIRCLECI"))) {
-                    if (!System.getenv("CIRCLE_SHA1").equals(this.getRev())) {
+                    if (!this.getRev().equals(System.getenv("CIRCLE_SHA1"))) {
                         return;
                     }
 

From 0caa0e18bb6c3af7e911b224365e5176c364cbdb Mon Sep 17 00:00:00 2001
From: Markus Heberling <markus.heberling@advanova.de>
Date: Thu, 29 Dec 2022 10:47:27 +0100
Subject: [PATCH 028/140] allow overriding of firstParent in git describe
 evaluation

---
 CHANGELOG.md                                  |  5 +
 README.md                                     |  7 +-
 docs/configuration-9.4.0.xsd                  | 92 +++++++++++++++++++
 pom.xml                                       |  8 +-
 .../gitversioning/commons/GitSituation.java   | 14 ++-
 .../qoomon/gitversioning/commons/GitUtil.java |  4 +-
 .../maven/gitversioning/Configuration.java    |  3 +
 .../GitVersioningModelProcessor.java          |  4 +
 .../gitversioning/commons/GitUtilTest.java    |  2 +-
 .../GitVersioningExtensionIT.java             | 49 +++++++++-
 10 files changed, 179 insertions(+), 9 deletions(-)
 create mode 100644 docs/configuration-9.4.0.xsd

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4d6ce9c..e9861762 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 # Changelog
 
+## 9.4.0
+
+##### Features
+- allow overriding of firstParent in git describe evaluation
+
 ## 9.3.4
 
 ##### Fixes
diff --git a/README.md b/README.md
index d1a3787c..fb34c256 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.3.3</version>
+        <version>9.4.0</version>
     </extension>
 
 </extensions>
@@ -58,7 +58,7 @@ You can configure the version and properties adjustments for specific branches a
 ```xml
 <configuration xmlns="https://github.com/qoomon/maven-git-versioning-extension"
                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.1.0.xsd">
+               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">
@@ -120,6 +120,9 @@ You can configure the version and properties adjustments for specific branches a
       - `<updatePom>` Enable(`true`) or disable(`false`) version and properties update in original pom file
         - will override global `<updatePom>` value
 
+      - `<firstParent>` Enable(`true`) or disable(`false`) following only the first parent in a merge commit
+        - default is `true`
+
 - `<rev>` Rev configuration will be used if no ref configuration is matching current git situation.
     - same as `<ref>` configuration, except `type` attribute and `<pattern>` element.
 
diff --git a/docs/configuration-9.4.0.xsd b/docs/configuration-9.4.0.xsd
new file mode 100644
index 00000000..48cd8ed0
--- /dev/null
+++ b/docs/configuration-9.4.0.xsd
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<xs:schema xmlns="https://github.com/qoomon/maven-git-versioning-extension"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="https://github.com/qoomon/maven-git-versioning-extension"
+           elementFormDefault="qualified">
+
+    <xs:element name="configuration">
+        <xs:complexType>
+            <xs:all>
+                <xs:element name="disable" type="xs:boolean" minOccurs="0"/>
+
+                <xs:element name="projectVersionPattern" type="xs:string" minOccurs="0"/>
+
+                <xs:element name="describeTagPattern" type="xs:string" minOccurs="0"/>
+                <xs:element name="updatePom" type="xs:boolean" minOccurs="0"/>
+
+                <xs:element name="refs" minOccurs="0">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="ref" type="RefPatchDescription" minOccurs="0" maxOccurs="unbounded"/>
+                        </xs:sequence>
+
+                        <xs:attribute name="considerTagsOnBranches" type="xs:boolean"/>
+                    </xs:complexType>
+                </xs:element>
+
+                <xs:element name="rev" type="PatchDescription" minOccurs="0"/>
+
+                <xs:element name="relatedProjects" minOccurs="0">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:element name="project" type="RelatedProject" minOccurs="0" maxOccurs="unbounded"/>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:all>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:complexType name="PatchDescription">
+        <xs:all>
+            <xs:element name="describeTagPattern" type="xs:string" minOccurs="0"/>
+            <xs:element name="updatePom" type="xs:boolean" minOccurs="0"/>
+            <xs:element name="firstParent" type="xs:boolean" minOccurs="0"/>
+
+            <xs:element name="version" type="xs:string" minOccurs="0"/>
+            <xs:element name="properties" minOccurs="0">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:all>
+    </xs:complexType>
+
+    <xs:complexType name="RefPatchDescription">
+        <xs:all>
+            <xs:element name="pattern" type="xs:string" minOccurs="0"/>
+            <xs:element name="describeTagPattern" type="xs:string" minOccurs="0"/>
+            <xs:element name="updatePom" type="xs:boolean" minOccurs="0"/>
+            <xs:element name="firstParent" type="xs:boolean" minOccurs="0"/>
+
+            <xs:element name="version" type="xs:string" minOccurs="0"/>
+            <xs:element name="properties" minOccurs="0">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+        </xs:all>
+
+        <xs:attribute name="type" use="required">
+            <xs:simpleType>
+                <xs:restriction base="xs:string">
+                    <xs:enumeration value="tag"/>
+                    <xs:enumeration value="branch"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
+    </xs:complexType>
+
+    <xs:complexType name="RelatedProject">
+        <xs:all>
+            <xs:element name="groupId" type="xs:string"/>
+            <xs:element name="artifactId" type="xs:string"/>
+        </xs:all>
+    </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e38676c4..957e8278 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.3.4</version>
+    <version>9.4.0</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>
@@ -116,6 +116,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.36</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java b/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
index 93811058..696c9c71 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
@@ -13,7 +13,6 @@
 import java.util.List;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import static java.time.Instant.EPOCH;
 import static java.time.ZoneOffset.UTC;
@@ -38,6 +37,9 @@ public class GitSituation {
     private final Supplier<Boolean> clean = Lazy.by(this::clean);
 
     private Pattern describeTagPattern = Pattern.compile(".*");
+
+    private boolean firstParent = true;
+
     private Supplier<GitDescription> description = Lazy.by(this::describe);
 
     public GitSituation(Repository repository) throws IOException {
@@ -153,6 +155,14 @@ public Pattern getDescribeTagPattern() {
         return describeTagPattern;
     }
 
+    public boolean isFirstParent() {
+        return firstParent;
+    }
+
+    public void setFirstParent(boolean firstParent) {
+        this.firstParent = firstParent;
+    }
+
     public GitDescription getDescription() {
         return description.get();
     }
@@ -178,6 +188,6 @@ private boolean clean() throws GitAPIException {
     }
 
     private GitDescription describe() throws IOException {
-        return GitUtil.describe(head, describeTagPattern, repository);
+        return GitUtil.describe(head, describeTagPattern, repository, firstParent);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
index 3d2d2f50..56ac40aa 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
@@ -47,7 +47,7 @@ public static List<String> tagsPointAt(ObjectId revObjectId, Repository reposito
         return reverseTagRefMap(repository).getOrDefault(revObjectId, emptyList());
     }
 
-    public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern, Repository repository) throws IOException {
+    public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern, Repository repository, boolean firstParent) throws IOException {
         if (revObjectId == null) {
             return new GitDescription(NO_COMMIT, "root", 0);
         }
@@ -57,7 +57,7 @@ public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern,
         // Walk back commit ancestors looking for tagged one
         try (RevWalk walk = new RevWalk(repository)) {
             walk.setRetainBody(false);
-            walk.setFirstParent(true);
+            walk.setFirstParent(firstParent);
             walk.markStart(walk.parseCommit(revObjectId));
             Iterator<RevCommit> walkIterator = walk.iterator();
             int depth = 0;
diff --git a/src/main/java/me/qoomon/maven/gitversioning/Configuration.java b/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
index 2c389385..b505780f 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
@@ -86,6 +86,8 @@ public Pattern describeTagPattern() {
         public Map<String, String> properties = new HashMap<>();
 
         public Boolean updatePom;
+
+        public Boolean firstParent;
     }
 
     @JsonInclude(NON_NULL)
@@ -112,6 +114,7 @@ public RefPatchDescription(GitRefType type, Pattern pattern, PatchDescription de
             this.pattern = pattern != null ? pattern.pattern() : null;
             this.describeTagPattern = description.describeTagPattern;
             this.updatePom = description.updatePom;
+            this.firstParent = description.firstParent;
             this.version = description.version;
             this.properties = new HashMap<>(description.properties);
         }
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 1210c4e5..999c4b15 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -199,6 +199,10 @@ private void init(Model projectModel) throws IOException {
             logger.info("  describeTagPattern: " + patchDescription.describeTagPattern);
             gitSituation.setDescribeTagPattern(patchDescription.describeTagPattern());
         }
+        if (patchDescription.firstParent != null) {
+            logger.info("  firstParent: " + patchDescription.firstParent);
+            gitSituation.setFirstParent(patchDescription.firstParent);
+        }
         if (patchDescription.version != null) {
             logger.info("  version: " + patchDescription.version);
         }
diff --git a/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java b/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
index 9c2a531d..5aed5d23 100644
--- a/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
+++ b/src/test/java/me/qoomon/gitversioning/commons/GitUtilTest.java
@@ -187,7 +187,7 @@ void describe() throws Exception {
         git.tag().setName(givenTagName).setAnnotated(true).setObjectId(givenCommit).setMessage(".").call();
 
         // when
-        GitDescription description = GitUtil.describe(head(git), Pattern.compile("v.+"), git.getRepository());
+        GitDescription description = GitUtil.describe(head(git), Pattern.compile("v.+"), git.getRepository(), true);
 
         // then
         assertThat(description).satisfies(it -> {
diff --git a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
index a3be0306..81160071 100644
--- a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
+++ b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
@@ -12,6 +12,7 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Parent;
 import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.MergeCommand;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.junit.jupiter.api.Test;
@@ -807,9 +808,55 @@ void apply_TwoCommitsSinceLastTagGivesExpectedPlusDistanceResult() throws Except
             assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
         }
 
-     }
+    }
+
+    @Test
+    void apply_TagOnMergedBranchWithFirstParent() throws Exception {
+        apply_TagOnMerged(true);
+    }
+
+    @Test
+    void apply_TagOnMergedBranchWithoutFirstParent() throws Exception {
+        apply_TagOnMerged(false);
+    }
+
+    private void apply_TagOnMerged(final boolean firstParent) throws Exception {
+        String tagOnMaster = "2.0.4-tag-on-master";
+        String tagOnBranch = "2.0.4-tag-on-branch";
+        try (Git git = Git.init().setInitialBranch(MASTER).setDirectory(projectDir.toFile()).call()) {
+            RevCommit initialCommit = git.commit().setMessage("initial commit").setAllowEmpty(true).call();
+            git.tag().setName("2.0.4-tag-on-initial").call();
+            git.commit().setMessage("commit on master").setAllowEmpty(true).call();
+            git.tag().setName(tagOnMaster).call();
+            git.checkout().setStartPoint(initialCommit).setCreateBranch(true).setName("branch").call();
+            // make sure the commit on the branch is newer
+            Thread.sleep(2000);
+            RevCommit branchCommit = git.commit().setMessage("commit on branch").setAllowEmpty(true).call();
+            git.tag().setName(tagOnBranch).call();
+            git.checkout().setName(MASTER).call();
+            git.merge().include(branchCommit).setFastForward(MergeCommand.FastForwardMode.NO_FF).setCommit(true).call();
+
+            writeModel(projectDir.resolve("pom.xml").toFile(), pomModel);
+            writeExtensionsFile(projectDir);
+            writeExtensionConfigFile(projectDir, new Configuration() {{
+                RefPatchDescription versionDescription = createVersionDescription(BRANCH, "${describe.tag.version}");
+                versionDescription.firstParent = firstParent;
+                refs.list.add(versionDescription);
+            }});
 
+            // When
+            Verifier verifier = getVerifier(projectDir);
+            verifier.executeGoal("verify");
 
+            // Then
+            verifier.verifyErrorFreeLog();
+            String expectedVersion = firstParent ? tagOnMaster : tagOnBranch;
+            verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
+
+            Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
+            assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
+        }
+    }
     // TODO add tests for property updates
 
 

From 999900d3c77e3ab035ecf7b4cc24c6fa38c7cac5 Mon Sep 17 00:00:00 2001
From: Markus Heberling <markus.heberling@advanova.de>
Date: Mon, 2 Jan 2023 07:13:46 +0100
Subject: [PATCH 029/140] renamed configuration option firstParent to
 describeTagFirstParent

---
 README.md                                                   | 2 +-
 docs/configuration-9.4.0.xsd                                | 4 ++--
 .../java/me/qoomon/maven/gitversioning/Configuration.java   | 4 ++--
 .../maven/gitversioning/GitVersioningModelProcessor.java    | 6 +++---
 .../maven/gitversioning/GitVersioningExtensionIT.java       | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index fb34c256..0cf6ebc6 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@ You can configure the version and properties adjustments for specific branches a
       - `<updatePom>` Enable(`true`) or disable(`false`) version and properties update in original pom file
         - will override global `<updatePom>` value
 
-      - `<firstParent>` Enable(`true`) or disable(`false`) following only the first parent in a merge commit
+      - `<describeTagFirstParent>` Enable(`true`) or disable(`false`) following only the first parent in a merge commit
         - default is `true`
 
 - `<rev>` Rev configuration will be used if no ref configuration is matching current git situation.
diff --git a/docs/configuration-9.4.0.xsd b/docs/configuration-9.4.0.xsd
index 48cd8ed0..eae6f7be 100644
--- a/docs/configuration-9.4.0.xsd
+++ b/docs/configuration-9.4.0.xsd
@@ -41,8 +41,8 @@
     <xs:complexType name="PatchDescription">
         <xs:all>
             <xs:element name="describeTagPattern" type="xs:string" minOccurs="0"/>
+            <xs:element name="describeTagFirstParent" type="xs:boolean" minOccurs="0"/>
             <xs:element name="updatePom" type="xs:boolean" minOccurs="0"/>
-            <xs:element name="firstParent" type="xs:boolean" minOccurs="0"/>
 
             <xs:element name="version" type="xs:string" minOccurs="0"/>
             <xs:element name="properties" minOccurs="0">
@@ -59,8 +59,8 @@
         <xs:all>
             <xs:element name="pattern" type="xs:string" minOccurs="0"/>
             <xs:element name="describeTagPattern" type="xs:string" minOccurs="0"/>
+            <xs:element name="describeTagFirstParent" type="xs:boolean" minOccurs="0"/>
             <xs:element name="updatePom" type="xs:boolean" minOccurs="0"/>
-            <xs:element name="firstParent" type="xs:boolean" minOccurs="0"/>
 
             <xs:element name="version" type="xs:string" minOccurs="0"/>
             <xs:element name="properties" minOccurs="0">
diff --git a/src/main/java/me/qoomon/maven/gitversioning/Configuration.java b/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
index b505780f..7dd8ea02 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
@@ -87,7 +87,7 @@ public Pattern describeTagPattern() {
 
         public Boolean updatePom;
 
-        public Boolean firstParent;
+        public Boolean describeTagFirstParent;
     }
 
     @JsonInclude(NON_NULL)
@@ -114,7 +114,7 @@ public RefPatchDescription(GitRefType type, Pattern pattern, PatchDescription de
             this.pattern = pattern != null ? pattern.pattern() : null;
             this.describeTagPattern = description.describeTagPattern;
             this.updatePom = description.updatePom;
-            this.firstParent = description.firstParent;
+            this.describeTagFirstParent = description.describeTagFirstParent;
             this.version = description.version;
             this.properties = new HashMap<>(description.properties);
         }
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 999c4b15..ba3f3191 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -199,9 +199,9 @@ private void init(Model projectModel) throws IOException {
             logger.info("  describeTagPattern: " + patchDescription.describeTagPattern);
             gitSituation.setDescribeTagPattern(patchDescription.describeTagPattern());
         }
-        if (patchDescription.firstParent != null) {
-            logger.info("  firstParent: " + patchDescription.firstParent);
-            gitSituation.setFirstParent(patchDescription.firstParent);
+        if (patchDescription.describeTagFirstParent != null) {
+            logger.info("  describeTagFirstParent: " + patchDescription.describeTagFirstParent);
+            gitSituation.setFirstParent(patchDescription.describeTagFirstParent);
         }
         if (patchDescription.version != null) {
             logger.info("  version: " + patchDescription.version);
diff --git a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
index 81160071..df320abe 100644
--- a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
+++ b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
@@ -840,7 +840,7 @@ private void apply_TagOnMerged(final boolean firstParent) throws Exception {
             writeExtensionsFile(projectDir);
             writeExtensionConfigFile(projectDir, new Configuration() {{
                 RefPatchDescription versionDescription = createVersionDescription(BRANCH, "${describe.tag.version}");
-                versionDescription.firstParent = firstParent;
+                versionDescription.describeTagFirstParent = firstParent;
                 refs.list.add(versionDescription);
             }});
 

From d02e67051a0a490ca9499c614e3d096968895a56 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <qoo@qoomon.me>
Date: Tue, 3 Jan 2023 18:46:03 +0100
Subject: [PATCH 030/140] build(release): bump patch version

---
 CHANGELOG.md | 6 ++++++
 README.md    | 2 +-
 pom.xml      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9861762..eebebd14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 # Changelog
 
+## 9.4.1
+
+##### Fixes
+- prevent null pointer exceptions if ci environment variables are missing (#225 kudos to @jycr)
+
+
 ## 9.4.0
 
 ##### Features
diff --git a/README.md b/README.md
index 0cf6ebc6..349319a4 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.4.0</version>
+        <version>9.4.1</version>
     </extension>
 
 </extensions>
diff --git a/pom.xml b/pom.xml
index 957e8278..1335a748 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.4.0</version>
+    <version>9.4.1</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>

From 6993d1cd57d8b4c2023180c5bc0c231b0cc26572 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <qoo@qoomon.me>
Date: Tue, 3 Jan 2023 19:26:45 +0100
Subject: [PATCH 031/140] build: update dependencies

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1335a748..1cba3dce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,14 +50,14 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.8.6</version>
+            <version>3.8.7</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.8.6</version>
+            <version>3.8.7</version>
             <scope>provided</scope>
         </dependency>
 
@@ -71,13 +71,13 @@
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit</artifactId>
-            <version>6.3.0.202209071007-r</version>
+            <version>6.4.0.202211300538-r</version>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
-            <version>2.13.3</version>
+            <version>2.14.1</version>
         </dependency>
 
         <dependency>
@@ -119,7 +119,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.36</version>
+            <version>2.0.5</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

From e6cfc6cbf45cf35bbbe07a45453d816466e0d511 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <qoo@qoomon.me>
Date: Wed, 11 Jan 2023 10:08:18 +0100
Subject: [PATCH 032/140] fix: handle situation if no pom.xml is available

---
 .../maven/gitversioning/GitVersioningModelProcessor.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 91423124..79878c9d 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -125,6 +125,12 @@ private void init(Model projectModel) throws IOException {
         logger.info("");
         logger.info(extensionLogHeader(BuildProperties.projectGAV()));
 
+        if(!projectModel.getPomFile().isFile()){
+            logger.debug("skip - pom is not part of executionRootDirectory");
+            disabled = true;
+            return;
+        }
+
         // check if session is available
         try {
             mavenSession = sessionScope.scope(Key.get(MavenSession.class), null).get();

From 4cd2dc8550f7140973cd8961cd06a1f75846e300 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Wed, 11 Jan 2023 16:08:39 +0100
Subject: [PATCH 033/140] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 349319a4..99513f8e 100644
--- a/README.md
+++ b/README.md
@@ -223,7 +223,7 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
 - `${describe}` Will resolve to `git describe` output
 - `${describe.distance}` The distance count to last matching tag
 - `${describe.tag}` The matching tag of `git describe`
-  - `${describe.tag.version}` the tag version determined by regex `\d+\.\d+\.\d+`
+  - `${describe.tag.version}` the tag version determined by regex `(?<version>(?<core>(?<major>\d+)(?:\.(?<minor>\d+)(?:\.(?<patch>\d+))?)?)(?:-(?<label>.*))?)`
     - `${describe.tag.version.core}` the core version component of `${describe.tag.version}` e.g. '1.2.3' 
     - `${describe.tag.version.major}` the major version component of `${describe.tag.version}` e.g. '1'
       - `${describe.tag.version.major.next}` the `${describe.tag.version.major}` increased by 1 e.g. '2'

From 48e773b0fe9a5923ca825279670cb95192f8bfbb Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <qoo@qoomon.me>
Date: Thu, 12 Jan 2023 12:01:18 +0100
Subject: [PATCH 034/140] fix: skip versioning if maven request base directory
 is null

---
 .../maven/gitversioning/GitVersioningModelProcessor.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 79878c9d..d8b3b644 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -139,8 +139,13 @@ private void init(Model projectModel) throws IOException {
             disabled = true;
             return;
         }
-
-        final File executionRootDirectory = new File(mavenSession.getRequest().getBaseDirectory());
+        String requestBaseDirectory = mavenSession.getRequest().getBaseDirectory();
+        if(requestBaseDirectory == null){
+            logger.warn("skip - maven base directory is not set");
+            disabled = true;
+            return;
+        }
+        final File executionRootDirectory = new File(requestBaseDirectory);
         logger.debug("execution root directory: " + executionRootDirectory);
 
         mvnDirectory = findMvnDirectory(executionRootDirectory);

From 414093db8776c3df7ee9674ca2607cdb26c4f5ae Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <qoo@qoomon.me>
Date: Thu, 12 Jan 2023 15:39:26 +0100
Subject: [PATCH 035/140] fix: skip versioning if model has no pom file

---
 .../GitVersioningModelProcessor.java          | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index d8b3b644..315e9693 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -125,8 +125,15 @@ private void init(Model projectModel) throws IOException {
         logger.info("");
         logger.info(extensionLogHeader(BuildProperties.projectGAV()));
 
-        if(!projectModel.getPomFile().isFile()){
-            logger.debug("skip - pom is not part of executionRootDirectory");
+        File pomFile = projectModel.getPomFile();
+        if(pomFile == null ){
+            logger.debug("skip - project model does not belong to a local project");
+            disabled = true;
+            return;
+        }
+
+        if(!pomFile.isFile()){
+            logger.debug("skip - pom file does not exist " + pomFile);
             disabled = true;
             return;
         }
@@ -139,18 +146,10 @@ private void init(Model projectModel) throws IOException {
             disabled = true;
             return;
         }
-        String requestBaseDirectory = mavenSession.getRequest().getBaseDirectory();
-        if(requestBaseDirectory == null){
-            logger.warn("skip - maven base directory is not set");
-            disabled = true;
-            return;
-        }
-        final File executionRootDirectory = new File(requestBaseDirectory);
-        logger.debug("execution root directory: " + executionRootDirectory);
 
-        mvnDirectory = findMvnDirectory(executionRootDirectory);
+        logger.debug("pom file: " + pomFile);
+        mvnDirectory = findMvnDirectory(pomFile);
         logger.debug(".mvn directory: " + mvnDirectory);
-
         final File configFile = new File(mvnDirectory, projectArtifactId() + ".xml");
         logger.debug("read config from " + configFile);
         config = readConfig(configFile);
@@ -173,7 +172,7 @@ private void init(Model projectModel) throws IOException {
         }
 
         // determine git situation
-        gitSituation = getGitSituation(executionRootDirectory);
+        gitSituation = getGitSituation(pomFile);
         if (gitSituation == null) {
             logger.warn("skip - project is not part of a git repository");
             disabled = true;
@@ -577,8 +576,9 @@ private void addBuildPlugin(Model projectModel) {
 
     // ---- versioning -------------------------------------------------------------------------------------------------
 
-    private GitSituation getGitSituation(File executionRootDirectory) throws IOException {
-        final FileRepositoryBuilder repositoryBuilder = new FileRepositoryBuilder().findGitDir(executionRootDirectory);
+    private GitSituation getGitSituation(File pomFile) throws IOException {
+        final File baseDirectory = pomFile.getParentFile();
+        final FileRepositoryBuilder repositoryBuilder = new FileRepositoryBuilder().findGitDir(baseDirectory);
         if (repositoryBuilder.getGitDir() == null) {
             return null;
         }
@@ -941,8 +941,8 @@ private Matcher matchVersion(String input) {
 
     // ---- configuration -------------------------------------------------------------------------------------------------
 
-    private static File findMvnDirectory(File baseDirectory) throws IOException {
-        File searchDirectory = baseDirectory;
+    private static File findMvnDirectory(File pomFile) throws IOException {
+        File searchDirectory = pomFile.getParentFile();
         while (searchDirectory != null) {
             File mvnDir = new File(searchDirectory, ".mvn");
             if (mvnDir.exists()) {
@@ -951,7 +951,7 @@ private static File findMvnDirectory(File baseDirectory) throws IOException {
             searchDirectory = searchDirectory.getParentFile();
         }
 
-        throw new FileNotFoundException("Can not find .mvn directory in hierarchy of " + baseDirectory);
+        throw new FileNotFoundException("Can not find .mvn directory in hierarchy of " + pomFile);
     }
 
     private static Configuration readConfig(File configFile) throws IOException {

From 258800e6e755627db74c875a64605cbd376e25ca Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <qoo@qoomon.me>
Date: Fri, 13 Jan 2023 10:37:33 +0100
Subject: [PATCH 036/140] build(release): bump patch version

---
 CHANGELOG.md | 7 +++++++
 pom.xml      | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eebebd14..49b6d00f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@
 
 # Changelog
 
+## 9.4.2
+
+##### Fixes
+- handel situations where no base directory is set
+- skip versioning if no pom.xml is available
+
+
 ## 9.4.1
 
 ##### Fixes
diff --git a/pom.xml b/pom.xml
index 1cba3dce..cfdeb9d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.4.1</version>
+    <version>9.4.2</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>

From 60d578696d56971c491f73e9e0e8eeb5870c6b49 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Fri, 13 Jan 2023 10:54:34 +0100
Subject: [PATCH 037/140] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 99513f8e..69319e47 100644
--- a/README.md
+++ b/README.md
@@ -378,4 +378,6 @@ gpg --list-keys
 
 ##### Debug
 
-`mvn help:evaluate -Dexpression=project.version -Dorg.slf4j.simpleLogger.log.me.qoomon.maven.gitversioning=debug`
+```shell
+mvn help:evaluate -Dexpression=project.version -Dorg.slf4j.simpleLogger.log.me.qoomon.maven.gitversioning=debug
+```

From 420a0fcb83f650b0517f5fdcee6e7a18b1e46d0b Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <qoo@qoomon.me>
Date: Tue, 24 Jan 2023 14:39:23 +0100
Subject: [PATCH 038/140] feat: add global config for describeTagFirstParent

---
 CHANGELOG.md                                       |  5 +++++
 README.md                                          | 14 +++++++++-----
 docs/configuration-9.4.0.xsd                       |  1 +
 pom.xml                                            |  2 +-
 .../qoomon/maven/gitversioning/Configuration.java  |  2 ++
 .../gitversioning/GitVersioningModelProcessor.java |  3 +++
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49b6d00f..3372a6fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 # Changelog
 
+## 9.5.0
+
+##### Features
+- add global option `describeTagFirstParent` option to enable/disable follow first parent only
+
 ## 9.4.2
 
 ##### Fixes
diff --git a/README.md b/README.md
index 69319e47..044129a6 100644
--- a/README.md
+++ b/README.md
@@ -89,9 +89,13 @@ You can configure the version and properties adjustments for specific branches a
     - Can be overridden by command option, see [Parameters & Environment Variables](#parameters--environment-variables).
 
 - `<projectVersionPattern>` An arbitrary regex to match project version, matching groups can be used as [Format Placeholders](#format-placeholders) (has to be a **full match pattern**)
-- `<describeTagPattern>` An arbitrary regex to match tag names for git describe command (has to be a **full match pattern** e.g. `v(.+)`, default is `.*`
+- `<describeTagPattern>` An arbitrary regex to match tag names for git describe command
+  - has to be a **full match pattern** e.g. `v(.+)`, default is `.*`
+- `<describeTagFirstParent>` Enable(`true`) or disable(`false`) following only the first parent in a merge commit
+  - default is `true`
+
 - `<updatePom>` Enable(`true`)/disable(`false`) version and properties update in original pom file, default is `false`
-    - Can be overridden by command option, see [Parameters & Environment Variables](#parameters--environment-variables).
+  - Can be overridden by command option, see [Parameters & Environment Variables](#parameters--environment-variables).
 
 - `<refs considerTagsOnBranches="BOOLEAN">` List of ref configurations, ordered by priority. First matching
   configuration will be used.
@@ -108,8 +112,10 @@ You can configure the version and properties adjustments for specific branches a
       - `<describeTagPattern>` An arbitrary regex to match tag names for git describe command
         - has to be a **full match pattern** e.g. `v.+`)
         - will override global `<describeTagPattern>` value
+      - `<describeTagFirstParent>` Enable(`true`) or disable(`false`) following only the first parent in a merge commit
+        - default is `true`
           <br><br>
-
+        
       - `<version>` The new version format, see [Format Placeholders](#format-placeholders)
       - `<properties>`
         - `<name>value</name>` A property definition to update the value of a property.
@@ -120,8 +126,6 @@ You can configure the version and properties adjustments for specific branches a
       - `<updatePom>` Enable(`true`) or disable(`false`) version and properties update in original pom file
         - will override global `<updatePom>` value
 
-      - `<describeTagFirstParent>` Enable(`true`) or disable(`false`) following only the first parent in a merge commit
-        - default is `true`
 
 - `<rev>` Rev configuration will be used if no ref configuration is matching current git situation.
     - same as `<ref>` configuration, except `type` attribute and `<pattern>` element.
diff --git a/docs/configuration-9.4.0.xsd b/docs/configuration-9.4.0.xsd
index eae6f7be..28d84d2d 100644
--- a/docs/configuration-9.4.0.xsd
+++ b/docs/configuration-9.4.0.xsd
@@ -13,6 +13,7 @@
                 <xs:element name="projectVersionPattern" type="xs:string" minOccurs="0"/>
 
                 <xs:element name="describeTagPattern" type="xs:string" minOccurs="0"/>
+                <xs:element name="describeTagFirstParent" type="xs:boolean" minOccurs="0"/>
                 <xs:element name="updatePom" type="xs:boolean" minOccurs="0"/>
 
                 <xs:element name="refs" minOccurs="0">
diff --git a/pom.xml b/pom.xml
index cfdeb9d0..598f7233 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.4.2</version>
+    <version>9.5.0</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>
diff --git a/src/main/java/me/qoomon/maven/gitversioning/Configuration.java b/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
index 7dd8ea02..dd14dc63 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
@@ -46,6 +46,8 @@ public Pattern projectVersionPattern() {
     @JsonDeserialize(using = IgnoreWhitespaceDeserializer.class)
     public String describeTagPattern = null;
 
+    public Boolean describeTagFirstParent = true;
+
     public Pattern describeTagPattern() {
         if(describeTagPattern == null) {
             return null;
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 315e9693..f27d4ea9 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -968,6 +968,9 @@ private static Configuration readConfig(File configFile) throws IOException {
             if (patchDescription.describeTagPattern == null) {
                 patchDescription.describeTagPattern = config.describeTagPattern;
             }
+            if (patchDescription.describeTagFirstParent == null) {
+                patchDescription.describeTagFirstParent = config.describeTagFirstParent;
+            }
             if (patchDescription.updatePom == null) {
                 patchDescription.updatePom = config.updatePom;
             }

From ab34b0651c35b7dfe84a00b56bcd83a50342c02b Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <qoo@qoomon.me>
Date: Fri, 27 Jan 2023 09:37:34 +0100
Subject: [PATCH 039/140] doc: update version in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 044129a6..707d451a 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.4.1</version>
+        <version>9.5.0</version>
     </extension>
 
 </extensions>

From b305cbea31bcc542bfedcf544213ed7beeb63bd4 Mon Sep 17 00:00:00 2001
From: Frederik Libert <frederik.libert@ehealth.fgov.be>
Date: Wed, 1 Feb 2023 11:55:43 +0100
Subject: [PATCH 040/140] Support overwriting properties defined in parent #235

Added a new configuration section for userProperties which are added to the mavenSession.userProperties at startup.
---
 .../java/me/qoomon/maven/gitversioning/Configuration.java   | 5 +++++
 .../maven/gitversioning/GitVersioningModelProcessor.java    | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/Configuration.java b/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
index dd14dc63..a9b8a929 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/Configuration.java
@@ -87,6 +87,11 @@ public Pattern describeTagPattern() {
         // TODO  @JsonDeserialize(using = IgnoreWhitespaceDeserializer.class)
         public Map<String, String> properties = new HashMap<>();
 
+        @JsonInclude(NON_EMPTY)
+        @JacksonXmlElementWrapper(useWrapping = false)
+        // TODO  @JsonDeserialize(using = IgnoreWhitespaceDeserializer.class)
+        public Map<String, String> userProperties = new HashMap<>();
+
         public Boolean updatePom;
 
         public Boolean describeTagFirstParent;
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index f27d4ea9..a03c333f 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -220,6 +220,10 @@ private void init(Model projectModel) throws IOException {
             logger.info("  properties: " + patchDescription.version);
             patchDescription.properties.forEach((key, value) -> logger.info("    " + key + " - " + value));
         }
+        if (!patchDescription.userProperties.isEmpty()) {
+            logger.info("  userProperties: ");
+            patchDescription.userProperties.forEach((key, value) -> logger.info("    " + key + " - " + value));
+        }
         updatePom = getUpdatePomOption(patchDescription);
         if (updatePom) {
             logger.info("  updatePom: " + updatePom);
@@ -234,6 +238,8 @@ private void init(Model projectModel) throws IOException {
             relatedProjects.forEach(gav -> logger.debug("  " + gav));
         }
 
+        patchDescription.userProperties.forEach((k, v) -> mavenSession.getUserProperties().put(k,getGitPropertyValue(v, "", GAV.of(projectModel).getVersion())));
+
         logger.info("");
     }
 

From 747ceb023c2861d20d57a6de7f8ed0b5e1ba05ea Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Wed, 1 Feb 2023 15:35:28 +0100
Subject: [PATCH 041/140] Update GitVersioningModelProcessor.java

---
 .../maven/gitversioning/GitVersioningModelProcessor.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index a03c333f..e1fe6934 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -222,7 +222,10 @@ private void init(Model projectModel) throws IOException {
         }
         if (!patchDescription.userProperties.isEmpty()) {
             logger.info("  userProperties: ");
-            patchDescription.userProperties.forEach((key, value) -> logger.info("    " + key + " - " + value));
+            patchDescription.userProperties.forEach((key, value) -> {
+                logger.info("    " + key + " - " + value);
+                mavenSession.getUserProperties().put(k, getGitPropertyValue(value, "", GAV.of(projectModel).getVersion()))
+            });
         }
         updatePom = getUpdatePomOption(patchDescription);
         if (updatePom) {
@@ -238,8 +241,6 @@ private void init(Model projectModel) throws IOException {
             relatedProjects.forEach(gav -> logger.debug("  " + gav));
         }
 
-        patchDescription.userProperties.forEach((k, v) -> mavenSession.getUserProperties().put(k,getGitPropertyValue(v, "", GAV.of(projectModel).getVersion())));
-
         logger.info("");
     }
 

From 8a2642d138de59d8b662ef774833bfe46b6d6071 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Wed, 1 Feb 2023 15:37:36 +0100
Subject: [PATCH 042/140] Update GitVersioningModelProcessor.java

---
 .../maven/gitversioning/GitVersioningModelProcessor.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index e1fe6934..e2c2c4ce 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -217,14 +217,16 @@ private void init(Model projectModel) throws IOException {
             logger.info("  version: " + patchDescription.version);
         }
         if (!patchDescription.properties.isEmpty()) {
-            logger.info("  properties: " + patchDescription.version);
-            patchDescription.properties.forEach((key, value) -> logger.info("    " + key + " - " + value));
+            logger.info("  properties: ");
+            patchDescription.properties.forEach((key, value) -> {
+                logger.info("    " + key + " - " + value);
+            });
         }
         if (!patchDescription.userProperties.isEmpty()) {
             logger.info("  userProperties: ");
             patchDescription.userProperties.forEach((key, value) -> {
                 logger.info("    " + key + " - " + value);
-                mavenSession.getUserProperties().put(k, getGitPropertyValue(value, "", GAV.of(projectModel).getVersion()))
+                mavenSession.getUserProperties().put(key, getGitPropertyValue(value, "", GAV.of(projectModel).getVersion()))
             });
         }
         updatePom = getUpdatePomOption(patchDescription);

From 20838ebae95e1568f38613a30b655d6bee35f41c Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Wed, 1 Feb 2023 15:40:20 +0100
Subject: [PATCH 043/140] Update GitVersioningModelProcessor.java

---
 .../maven/gitversioning/GitVersioningModelProcessor.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index e2c2c4ce..1dad91a7 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -224,9 +224,10 @@ private void init(Model projectModel) throws IOException {
         }
         if (!patchDescription.userProperties.isEmpty()) {
             logger.info("  userProperties: ");
+            String projectVersion = GAV.of(projectModel).getVersion();
             patchDescription.userProperties.forEach((key, value) -> {
                 logger.info("    " + key + " - " + value);
-                mavenSession.getUserProperties().put(key, getGitPropertyValue(value, "", GAV.of(projectModel).getVersion()))
+                mavenSession.getUserProperties().put(key, getGitPropertyValue(value, "", projectVersion))
             });
         }
         updatePom = getUpdatePomOption(patchDescription);

From 09df5e2be645a6490994ac06427550ec9453ef9c Mon Sep 17 00:00:00 2001
From: Frederik Libert <frederik.libert@ehealth.fgov.be>
Date: Mon, 6 Feb 2023 11:35:31 +0100
Subject: [PATCH 044/140] Fix compilation error + order of commands. Update
 docs

---
 README.md                                              | 10 ++++++++++
 .../gitversioning/GitVersioningModelProcessor.java     |  7 ++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 707d451a..38134fa2 100644
--- a/README.md
+++ b/README.md
@@ -123,6 +123,16 @@ You can configure the version and properties adjustments for specific branches a
           - `value` The new value format of the property, see [Format Placeholders](#format-placeholders)
             <br><br>
 
+      - `<userProperties>`
+        - `<name>value</name>` A property definition to add a user property to the maven session, active during the build. UserProperties with the same name of a property in the pom or this configuration file will take precedence as that is how maven handles user properties.
+          - `<name>` The property name
+          - `value` The new value format of the property, see [Format Placeholders](#format-placeholders)
+        ```xml
+        <userProperties>
+            <test.property>${ref}</test.property>
+        </userProperties>
+        ```
+      
       - `<updatePom>` Enable(`true`) or disable(`false`) version and properties update in original pom file
         - will override global `<updatePom>` value
 
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 1dad91a7..035e11b2 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -222,12 +222,15 @@ private void init(Model projectModel) throws IOException {
                 logger.info("    " + key + " - " + value);
             });
         }
+
+        globalFormatPlaceholderMap = generateGlobalFormatPlaceholderMap(gitSituation, gitVersionDetails, mavenSession);
+
         if (!patchDescription.userProperties.isEmpty()) {
             logger.info("  userProperties: ");
             String projectVersion = GAV.of(projectModel).getVersion();
             patchDescription.userProperties.forEach((key, value) -> {
                 logger.info("    " + key + " - " + value);
-                mavenSession.getUserProperties().put(key, getGitPropertyValue(value, "", projectVersion))
+                mavenSession.getUserProperties().put(key, getGitPropertyValue(value, "", projectVersion));
             });
         }
         updatePom = getUpdatePomOption(patchDescription);
@@ -235,8 +238,6 @@ private void init(Model projectModel) throws IOException {
             logger.info("  updatePom: " + updatePom);
         }
 
-        globalFormatPlaceholderMap = generateGlobalFormatPlaceholderMap(gitSituation, gitVersionDetails, mavenSession);
-
         // determine related projects
         relatedProjects = determineRelatedProjects(projectModel);
         if (logger.isDebugEnabled()) {

From 74f5791bec4f96a1e34fe74518a347c2375d8652 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <qoo@qoomon.me>
Date: Tue, 7 Feb 2023 10:40:57 +0100
Subject: [PATCH 045/140] build(release): bump minor version

---
 README.md |  2 +-
 pom.xml   | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 38134fa2..27a7d336 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.5.0</version>
+        <version>9.6.0</version>
     </extension>
 
 </extensions>
diff --git a/pom.xml b/pom.xml
index 598f7233..18bfac8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.5.0</version>
+    <version>9.6.0</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.6.4</version>
+            <version>3.7.1</version>
             <scope>provided</scope>
         </dependency>
 
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
-            <version>2.14.1</version>
+            <version>2.14.2</version>
         </dependency>
 
         <dependency>
@@ -91,21 +91,21 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.1</version>
+            <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.1</version>
+            <version>5.9.2</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.23.1</version>
+            <version>3.24.2</version>
             <scope>test</scope>
         </dependency>
 
@@ -119,7 +119,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.6</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -138,7 +138,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.6.4</version>
+                <version>3.7.1</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>
@@ -155,12 +155,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.0.0-M8</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.0.0-M8</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

From db999759eae5a96a40dbb36b05d8b1ef974fe787 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <qoo@qoomon.me>
Date: Tue, 7 Feb 2023 11:14:31 +0100
Subject: [PATCH 046/140] test: upgrade maven verify

---
 pom.xml                                                   | 2 +-
 .../maven/gitversioning/GitVersioningExtensionIT.java     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 18bfac8d..63347d7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-verifier</artifactId>
-            <version>1.8.0</version>
+            <version>2.0.0-M1</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
index df320abe..31e71aa5 100644
--- a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
+++ b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
@@ -5,12 +5,12 @@
 import me.qoomon.gitversioning.commons.GitRefType;
 import me.qoomon.maven.gitversioning.Configuration.PatchDescription;
 import me.qoomon.maven.gitversioning.Configuration.RefPatchDescription;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Parent;
+import org.apache.maven.shared.verifier.VerificationException;
+import org.apache.maven.shared.verifier.Verifier;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.MergeCommand;
 import org.eclipse.jgit.lib.Ref;
@@ -63,7 +63,7 @@ void noGitVersioning() throws Exception {
         String expectedVersion = "0.0.0";
         verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
         verifier.verifyTextInLog("[WARNING] skip - project is not part of a git repository");
-        verifier.assertFileNotPresent(GIT_VERSIONING_POM_NAME);
+        verifier.verifyFileNotPresent(GIT_VERSIONING_POM_NAME);
     }
 
     private static Verifier getVerifier(Path projectDir) throws VerificationException {
@@ -92,7 +92,7 @@ void disableVersioning_cliOption() throws Exception {
             verifier.verifyTextInLog("skip - versioning is disabled by command option");
             String expectedVersion = pomModel.getVersion();
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
-            verifier.assertFileNotPresent(GIT_VERSIONING_POM_NAME);
+            verifier.verifyFileNotPresent(GIT_VERSIONING_POM_NAME);
         }
     }
 

From 679debeb4d2bf82d7b4499d41e5c5fcba9e05eca Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <qoo@qoomon.me>
Date: Tue, 7 Feb 2023 11:41:46 +0100
Subject: [PATCH 047/140] build(release): bump patch version

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 27a7d336..fede991e 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.6.0</version>
+        <version>9.6.1</version>
     </extension>
 
 </extensions>
diff --git a/pom.xml b/pom.xml
index 63347d7b..58787c39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.6.0</version>
+    <version>9.6.1</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>

From 50c2c071b53373cd21c7063ba34e4629367ea6cf Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <qoo@qoomon.me>
Date: Tue, 7 Feb 2023 11:46:54 +0100
Subject: [PATCH 048/140] doc: add changelog entry

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3372a6fb..99005999 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
 [![Maven Central](https://img.shields.io/maven-central/v/me.qoomon/maven-git-versioning-extension.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22me.qoomon%22%20AND%20a%3A%22maven-git-versioning-extension%22)
 
 # Changelog
+## 9.6.1
+
+##### Features
+- add support for user properties (kudos to @frelibert #237)
+
 
 ## 9.5.0
 

From 464877a45bba4b83742e88a819f2e0407cfd9980 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Sat, 11 Feb 2023 16:13:39 +0100
Subject: [PATCH 049/140] fix: fix null pointer exception in case mojo runs
 multiple times

---
 CHANGELOG.md                                          |  7 +++++++
 README.md                                             |  2 +-
 pom.xml                                               |  2 +-
 .../qoomon/maven/gitversioning/GitVersioningMojo.java | 11 ++++++++---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99005999..27fc485c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@
 [![Maven Central](https://img.shields.io/maven-central/v/me.qoomon/maven-git-versioning-extension.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22me.qoomon%22%20AND%20a%3A%22maven-git-versioning-extension%22)
 
 # Changelog
+
+## 9.6.2
+
+##### Fixes
+- fix null pointer exception in case mojo runs multiple times
+
+
 ## 9.6.1
 
 ##### Features
diff --git a/README.md b/README.md
index fede991e..39081114 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.6.1</version>
+        <version>9.6.2</version>
     </extension>
 
 </extensions>
diff --git a/pom.xml b/pom.xml
index 58787c39..f757f522 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.6.1</version>
+    <version>9.6.2</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningMojo.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningMojo.java
index 36398964..b8d076f0 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningMojo.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningMojo.java
@@ -27,12 +27,17 @@ public class GitVersioningMojo extends AbstractMojo {
 
     @Override
     public synchronized void execute() {
+        getLog().debug("mojo run");
+
         File gitVersionedPomFile = new File(project.getBasedir(), GitVersioningModelProcessor.GIT_VERSIONING_POM_NAME);
         project.setPomFile(gitVersionedPomFile);
 
-        getLog().debug("remove version build plugin");
-        project.getModel().getBuild().getPlugins().remove(asPlugin());
-        project.getOriginalModel().getBuild().getPlugins().remove(asPlugin());
+        if(project.getModel().getBuild() != null){
+            project.getModel().getBuild().getPlugins().remove(asPlugin());
+        }
+        if(project.getOriginalModel().getBuild() != null) {
+            project.getOriginalModel().getBuild().getPlugins().remove(asPlugin());
+        }
     }
 
     static Plugin asPlugin() {

From 68565c585cf13776fab3d4e09e6f3c25b00aa1c9 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Sat, 11 Feb 2023 16:16:23 +0100
Subject: [PATCH 050/140] build: add maven wrapper

---
 .mvn/wrapper/maven-wrapper.jar        | Bin 0 -> 59925 bytes
 .mvn/wrapper/maven-wrapper.properties |  18 ++
 README.md                             |   8 +-
 mvnw                                  | 287 ++++++++++++++++++++++++++
 mvnw.cmd                              | 187 +++++++++++++++++
 5 files changed, 496 insertions(+), 4 deletions(-)
 create mode 100644 .mvn/wrapper/maven-wrapper.jar
 create mode 100644 .mvn/wrapper/maven-wrapper.properties
 create mode 100755 mvnw
 create mode 100644 mvnw.cmd

diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..bf82ff01c6cdae4a1bb754a6e062954d77ac5c11
GIT binary patch
literal 59925
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
VCNKd3JGtOvEm(5t0lFyE{{i--k}m)N

literal 0
HcmV?d00001

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 00000000..6686a643
--- /dev/null
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
diff --git a/README.md b/README.md
index 39081114..07794bbe 100644
--- a/README.md
+++ b/README.md
@@ -380,14 +380,14 @@ gpg --list-keys
 ```
 
 ```shell
-  mvn verify
+  ./mvnw verify
   # Publishes this plugin to local Maven
-  mvn install
+  ./mvnw install
   # Run integration tests after install, 
   # integration tests will run with LATEST version of extension installed
-  mvn failsafe:integration-test
+  ./mvnw failsafe:integration-test
   # Publishes this plugin to OSS Nexus.
-  GPG_TTY=$(tty) mvn clean deploy -P release -Dgpg.keyname=???
+  GPG_TTY=$(tty) ./mvnw clean deploy -P release -Dgpg.keyname=???
 ```
 
 ##### Debug
diff --git a/mvnw b/mvnw
new file mode 100755
index 00000000..b7f06462
--- /dev/null
+++ b/mvnw
@@ -0,0 +1,287 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.1.1
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        JAVA_HOME="`/usr/libexec/java_home`"; export JAVA_HOME
+      else
+        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`\\unset -f command; \\command -v java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  printf '%s' "$(cd "$basedir"; pwd)"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=$(find_maven_basedir "$(dirname $0)")
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+    else
+      wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) wrapperUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $wrapperUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        QUIET="--quiet"
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+          QUIET=""
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath"
+        else
+            wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath"
+        fi
+        [ $? -eq 0 ] || rm -f "$wrapperJarPath"
+    elif command -v curl > /dev/null; then
+        QUIET="--silent"
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+          QUIET=""
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L
+        else
+            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L
+        fi
+        [ $? -eq 0 ] || rm -f "$wrapperJarPath"
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaSource="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaSource=`cygpath --path --windows "$javaSource"`
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaSource" ]; then
+            if [ ! -e "$javaClass" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaSource")
+            fi
+            if [ -e "$javaClass" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
new file mode 100644
index 00000000..474c9d6b
--- /dev/null
+++ b/mvnw.cmd
@@ -0,0 +1,187 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.1.1
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %WRAPPER_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%

From d45c1f0d26b85efae5dc4c1c1365df927fcc7115 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Wed, 15 Feb 2023 08:25:13 +0100
Subject: [PATCH 051/140] fix: trim profile id element to match profile ids

---
 CHANGELOG.md                                                | 6 ++++++
 README.md                                                   | 2 +-
 pom.xml                                                     | 2 +-
 .../maven/gitversioning/GitVersioningModelProcessor.java    | 3 ++-
 src/test/resources/testProjects/standardProject/pom.xml     | 6 ++++++
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27fc485c..515f4229 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 # Changelog
 
+## 9.6.3
+
+##### Fixes
+- fix null pointer exception if profile id has leading or trailing whitespaces #239
+
+
 ## 9.6.2
 
 ##### Fixes
diff --git a/README.md b/README.md
index 07794bbe..4f0505ab 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.6.2</version>
+        <version>9.6.3</version>
     </extension>
 
 </extensions>
diff --git a/pom.xml b/pom.xml
index f757f522..987c5afb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.6.2</version>
+    <version>9.6.3</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 035e11b2..e20c2df9 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -1309,7 +1309,8 @@ private void updateProfiles(Element projectElement, List<Profile> profiles) {
             Map<String, Profile> profileMap = profiles.stream()
                     .collect(toMap(Profile::getId, it -> it));
             for (Element profileElement : profilesElement.getChildren("profile")) {
-                Profile profile = profileMap.get(profileElement.getChild("id").getText());
+                String profileId = profileElement.getChild("id").getText().trim();
+                Profile profile = profileMap.get(profileId);
                 updatePropertyValues(profileElement, profile);
                 updateDependencyVersions(profileElement, profile);
                 updatePluginVersions(profileElement, profile.getBuild(), profile.getReporting());
diff --git a/src/test/resources/testProjects/standardProject/pom.xml b/src/test/resources/testProjects/standardProject/pom.xml
index 804d19da..4bf85394 100644
--- a/src/test/resources/testProjects/standardProject/pom.xml
+++ b/src/test/resources/testProjects/standardProject/pom.xml
@@ -94,8 +94,14 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+
     </build>
 
+    <profiles>
+        <profile>
+            <id>foo </id>
+        </profile>
+    </profiles>
 </project>
 
 <!--mvn install -Dmaven.repo.local=$PWD/.m2/repository-->

From 00b043934222e9468d4200a20fcb629fdf5dbf07 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Fri, 17 Feb 2023 21:39:36 +0100
Subject: [PATCH 052/140] fix: handle tags within git worktrees directories

---
 CHANGELOG.md                                  |  6 ++
 README.md                                     |  2 +-
 pom.xml                                       |  4 +-
 .../gitversioning/commons/GitSituation.java   | 33 +------
 .../qoomon/gitversioning/commons/GitUtil.java | 93 ++++++++++++++++---
 5 files changed, 94 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 515f4229..e003ae64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 # Changelog
 
+## 9.6.4
+
+##### Fixes
+- handle tags within git worktrees directories
+
+
 ## 9.6.3
 
 ##### Fixes
diff --git a/README.md b/README.md
index 4f0505ab..f7bfe7a7 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.6.3</version>
+        <version>9.6.4</version>
     </extension>
 
 </extensions>
diff --git a/pom.xml b/pom.xml
index 987c5afb..712042b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,12 +2,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <prerequisites>
-        <maven>3.6.3</maven>
+        <maven>3.6.4</maven>
     </prerequisites>
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.6.3</version>
+    <version>9.6.4</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>
diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java b/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
index 696c9c71..a22ab8e9 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitSituation.java
@@ -1,13 +1,11 @@
 package me.qoomon.gitversioning.commons;
 
 import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.errors.NoWorkTreeException;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Repository;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -19,8 +17,7 @@
 import static java.util.Collections.emptyList;
 import static java.util.Objects.requireNonNull;
 import static java.util.stream.Collectors.toList;
-import static me.qoomon.gitversioning.commons.GitUtil.NO_COMMIT;
-import static org.eclipse.jgit.lib.Constants.HEAD;
+import static me.qoomon.gitversioning.commons.GitUtil.*;
 
 public class GitSituation {
 
@@ -28,7 +25,6 @@ public class GitSituation {
     private final File rootDirectory;
 
     private final ObjectId head;
-    private final String rev;
     private final Supplier<ZonedDateTime> timestamp = Lazy.by(this::timestamp);
     private Supplier<String> branch = Lazy.by(this::branch);
 
@@ -44,29 +40,8 @@ public class GitSituation {
 
     public GitSituation(Repository repository) throws IOException {
         this.repository = repository;
-        this.rootDirectory = getWorkTree(repository);
-        this.head = repository.resolve(HEAD);
-        this.rev = head != null ? head.getName() : NO_COMMIT;
-    }
-
-    /**
-     * fixed version repository.getWorkTree()
-     * handle worktrees as well
-     *
-     * @param repository
-     * @return .git directory
-     */
-    private File getWorkTree(Repository repository) throws IOException {
-        try {
-            return repository.getWorkTree();
-        } catch (NoWorkTreeException e) {
-            File gitDirFile = new File(repository.getDirectory(), "gitdir");
-            if (gitDirFile.exists()) {
-                String gitDirPath = Files.readAllLines(gitDirFile.toPath()).get(0);
-                return new File(gitDirPath).getParentFile();
-            }
-            throw e;
-        }
+        this.rootDirectory = worktreesFix_getWorkTree(repository);
+        this.head = worktreesFix_resolveHead(repository);
     }
 
     public File getRootDirectory() {
@@ -74,7 +49,7 @@ public File getRootDirectory() {
     }
 
     public String getRev() {
-        return rev;
+        return head != null ? head.getName() : NO_COMMIT;
     }
 
     public ZonedDateTime getTimestamp() {
diff --git a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
index 56ac40aa..77ed29f3 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/GitUtil.java
@@ -3,19 +3,21 @@
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.Status;
 import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Ref;
-import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.errors.NoWorkTreeException;
+import org.eclipse.jgit.lib.*;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -24,6 +26,7 @@
 import static java.util.Collections.emptyList;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toList;
+import static org.eclipse.jgit.lib.Constants.HEAD;
 import static org.eclipse.jgit.lib.Constants.R_TAGS;
 import static org.eclipse.jgit.lib.Repository.shortenRefName;
 
@@ -48,6 +51,7 @@ public static List<String> tagsPointAt(ObjectId revObjectId, Repository reposito
     }
 
     public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern, Repository repository, boolean firstParent) throws IOException {
+        Repository commonRepository = worktreesFix_getCommonRepository(repository);
         if (revObjectId == null) {
             return new GitDescription(NO_COMMIT, "root", 0);
         }
@@ -55,7 +59,7 @@ public static GitDescription describe(ObjectId revObjectId, Pattern tagPattern,
         Map<ObjectId, List<String>> objectIdListMap = reverseTagRefMap(repository);
 
         // Walk back commit ancestors looking for tagged one
-        try (RevWalk walk = new RevWalk(repository)) {
+        try (RevWalk walk = new RevWalk(commonRepository)) {
             walk.setRetainBody(false);
             walk.setFirstParent(firstParent);
             walk.markStart(walk.parseCommit(revObjectId));
@@ -86,17 +90,17 @@ public static boolean isShallowRepository(Repository repository) {
     }
 
     public static List<Ref> tags(Repository repository) throws IOException {
-        return repository.getRefDatabase().getRefsByPrefix(R_TAGS).stream()
-//                .sorted(new TagComparator(repository)) // TODO may can be removed
-                .collect(toList());
+        Repository commonRepository = worktreesFix_getCommonRepository(repository);
+        return commonRepository.getRefDatabase().getRefsByPrefix(R_TAGS);
     }
 
     public static Map<ObjectId, List<String>> reverseTagRefMap(Repository repository) throws IOException {
-        TagComparator tagComparator = new TagComparator(repository);
-        return tags(repository).stream()
+        Repository commonRepository = worktreesFix_getCommonRepository(repository);
+        TagComparator tagComparator = new TagComparator(commonRepository);
+        return tags(commonRepository).stream()
                 .collect(groupingBy(r -> {
                     try {
-                        Ref peel = repository.getRefDatabase().peel(r);
+                        Ref peel = commonRepository.getRefDatabase().peel(r);
                         return peel.getPeeledObjectId() != null
                                 ? peel.getPeeledObjectId()
                                 : peel.getObjectId();
@@ -106,7 +110,7 @@ public static Map<ObjectId, List<String>> reverseTagRefMap(Repository repository
                 }))
                 .entrySet().stream()
                 .collect(Collectors.toMap(
-                        e -> e.getKey(),
+                        Entry::getKey,
                         e -> e.getValue().stream()
                                 .sorted(tagComparator)
                                 .map(v -> shortenRefName(v.getName())).collect(toList())
@@ -114,7 +118,72 @@ public static Map<ObjectId, List<String>> reverseTagRefMap(Repository repository
     }
 
     public static ZonedDateTime revTimestamp(Repository repository, ObjectId rev) throws IOException {
-        Instant commitTime = Instant.ofEpochSecond(repository.parseCommit(rev).getCommitTime());
+        Repository commonRepository = worktreesFix_getCommonRepository(repository);
+        Instant commitTime = Instant.ofEpochSecond(commonRepository.parseCommit(rev).getCommitTime());
         return ZonedDateTime.ofInstant(commitTime, UTC);
     }
+
+    /**
+     * @see Repository#getWorkTree()
+     */
+    public static File worktreesFix_getWorkTree(Repository repository) throws IOException {
+        try {
+            return repository.getWorkTree();
+        } catch (NoWorkTreeException e) {
+            File gitDirFile = new File(repository.getDirectory(), "gitdir");
+            if (gitDirFile.exists()) {
+                String gitDirPath = Files.readAllLines(gitDirFile.toPath()).get(0);
+                return new File(gitDirPath).getParentFile();
+            }
+            throw e;
+        }
+    }
+
+    /**
+     * @return common repository
+     */
+    public static Repository worktreesFix_getCommonRepository(Repository repository) throws IOException {
+        try {
+            repository.getWorkTree();
+            return repository;
+        } catch (NoWorkTreeException e) {
+            File commonDirFile = new File(repository.getDirectory(), "commondir");
+            if (!commonDirFile.exists()) {
+                throw e;
+            }
+
+            String commonDirPath = Files.readAllLines(commonDirFile.toPath()).get(0);
+            File commonGitDir = new File(repository.getDirectory(), commonDirPath);
+            return new FileRepositoryBuilder().setGitDir(commonGitDir).build();
+        }
+    }
+
+    /**
+     * @see Repository#resolve(String)
+     * @see Constants#HEAD
+     */
+    public static ObjectId worktreesFix_resolveHead(Repository repository) throws IOException {
+        try {
+            repository.getWorkTree();
+            return repository.resolve(HEAD);
+        } catch (NoWorkTreeException e) {
+            File headFile = new File(repository.getDirectory(), "HEAD");
+            if (!headFile.exists()) {
+                throw e;
+            }
+
+            String head = Files.readAllLines(headFile.toPath()).get(0);
+            if (head.startsWith("ref:")) {
+                String refPath = head.replaceFirst("^ref: *", "");
+
+                File commonDirFile = new File(repository.getDirectory(), "commondir");
+                String commonDirPath = Files.readAllLines(commonDirFile.toPath()).get(0);
+                File commonGitDir = new File(repository.getDirectory(), commonDirPath);
+
+                File refFile = new File(commonGitDir, refPath);
+                head = Files.readAllLines(refFile.toPath()).get(0);
+            }
+            return repository.resolve(head);
+        }
+    }
 }

From 61d4c05de2bb0a5634f2003c812230656c3751ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20B=C3=B6hme?= <christoph@b3e.net>
Date: Wed, 8 Mar 2023 20:44:46 +0100
Subject: [PATCH 053/140] Add test for accessing describe.tag.version.label

---
 .../GitVersioningExtensionIT.java             | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
index 31e71aa5..64128387 100644
--- a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
+++ b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
@@ -859,6 +859,33 @@ private void apply_TagOnMerged(final boolean firstParent) throws Exception {
     }
     // TODO add tests for property updates
 
+    @Test
+    void apply_UseDescribeTagVersionLabel() throws Exception {
+
+        try (Git git = Git.init().setInitialBranch("master").setDirectory(projectDir.toFile()).call()) {
+            // Given
+            git.commit().setMessage("initial commit").setAllowEmpty(true).call();
+            git.tag().setAnnotated(true).setName("v1.0.0-label").call();
+
+            writeModel(projectDir.resolve("pom.xml").toFile(), pomModel);
+            writeExtensionsFile(projectDir);
+            writeExtensionConfigFile(projectDir, new Configuration() {{
+                refs.list.add(createVersionDescription(BRANCH, "${describe.tag.version.version.label}"));
+            }});
+
+            // When
+            Verifier verifier = getVerifier(projectDir);
+            verifier.executeGoal("verify");
+
+            // Then
+            verifier.verifyErrorFreeLog();
+            String expectedVersion = "label";
+            verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
+
+            Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
+            assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
+        }
+    }
 
     // -----------------------------------------------------------------------------------------------------------------
 

From 827480596b1b9d8383884314741bd7f834889d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20B=C3=B6hme?= <christoph@b3e.net>
Date: Wed, 8 Mar 2023 21:13:43 +0100
Subject: [PATCH 054/140] Fix naming of describe.tag.version.label

The placeholder was misspelled and contained the version segment two
times.
---
 .../maven/gitversioning/GitVersioningModelProcessor.java      | 4 ++--
 .../qoomon/maven/gitversioning/GitVersioningExtensionIT.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index e20c2df9..91e78330 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -917,7 +917,7 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
         placeholderMap.put("describe.tag.version.patch", Lazy.by(() -> requireNonNullElse(descriptionTagVersionMatcher.get().group("patch"), "0")));
         placeholderMap.put("describe.tag.version.patch.next", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch").get(), 1)));
 
-        placeholderMap.put("describe.tag.version.version.label", Lazy.by(() -> requireNonNullElse(descriptionTagVersionMatcher.get().group("label"), "")));
+        placeholderMap.put("describe.tag.version.label", Lazy.by(() -> requireNonNullElse(descriptionTagVersionMatcher.get().group("label"), "")));
         placeholderMap.put("describe.tag.version.label.next", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.label").get(), 1)));
 
         final Lazy<Integer> descriptionDistance = Lazy.by(() -> description.get().getDistance());
@@ -926,7 +926,7 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
         placeholderMap.put("describe.tag.version.patch.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch").get(), descriptionDistance.get())));
         placeholderMap.put("describe.tag.version.patch.next.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch.next").get(), descriptionDistance.get())));
 
-        placeholderMap.put("describe.tag.version.label.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.version.label").get(), descriptionDistance.get())));
+        placeholderMap.put("describe.tag.version.label.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.label").get(), descriptionDistance.get())));
         placeholderMap.put("describe.tag.version.label.next.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.label.next").get(), descriptionDistance.get())));
 
         // command parameters e.g. mvn -Dfoo=123 will be available as ${property.foo}
diff --git a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
index 64128387..ded58bb1 100644
--- a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
+++ b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
@@ -870,7 +870,7 @@ void apply_UseDescribeTagVersionLabel() throws Exception {
             writeModel(projectDir.resolve("pom.xml").toFile(), pomModel);
             writeExtensionsFile(projectDir);
             writeExtensionConfigFile(projectDir, new Configuration() {{
-                refs.list.add(createVersionDescription(BRANCH, "${describe.tag.version.version.label}"));
+                refs.list.add(createVersionDescription(BRANCH, "${describe.tag.version.label}"));
             }});
 
             // When

From 22e84dd742aa2ce713de279353122dd53c1d32a7 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Fri, 10 Mar 2023 10:59:44 +0100
Subject: [PATCH 055/140] build(release): bump patch version

---
 CHANGELOG.md | 6 ++++++
 README.md    | 2 +-
 pom.xml      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e003ae64..eb495049 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 # Changelog
 
+## 9.6.5
+
+##### Fixes
+- fix ``{describe.tag.version.label}` placeholder
+
+
 ## 9.6.4
 
 ##### Fixes
diff --git a/README.md b/README.md
index f7bfe7a7..aab09c61 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.6.4</version>
+        <version>9.6.5</version>
     </extension>
 
 </extensions>
diff --git a/pom.xml b/pom.xml
index 712042b3..5bd184c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.6.4</version>
+    <version>9.6.5</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>

From 4be8d556a3d2f8d5fccab140c825ff880968eea5 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Fri, 10 Mar 2023 15:25:24 +0100
Subject: [PATCH 056/140] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index aab09c61..c64938ea 100644
--- a/README.md
+++ b/README.md
@@ -259,8 +259,8 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
         ```xml
         <ref type="branch">
             <pattern>main</pattern>
-            <describeTagPattern><![CDATA[v(?<version>.*)]]></describeTagPattern>
-            <version>${describe.tag.version}-SNAPSHOT</version>
+            <describeTagPattern><![CDATA[v(?<name>.*)]]></describeTagPattern>
+            <version>${describe.tag.name}-SNAPSHOT</version>
         </ref>
         ```
         <br> 

From 2384e0a9a5b9a5528de18689cfa2fdcb60ee50b5 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Fri, 10 Mar 2023 17:07:19 +0100
Subject: [PATCH 057/140] refactor: throw exception named capture group would
 overwrite existing placeholder

---
 CHANGELOG.md                                  |  2 +-
 .../GitVersioningModelProcessor.java          | 41 ++++++++++++++-----
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb495049..c34517d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 ## 9.6.5
 
 ##### Fixes
-- fix ``{describe.tag.version.label}` placeholder
+- fix `${describe.tag.version.label}` placeholder
 
 
 ## 9.6.4
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 91e78330..d4ed7ca2 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -828,10 +828,17 @@ private Map<String, Supplier<String>> generateFormatPlaceholderMap(String projec
             for (Entry<String, String> patternGroup : patternGroupValues(projectVersionPattern, projectVersion).entrySet()) {
                 final String groupName = patternGroup.getKey();
                 final String value = patternGroup.getValue() != null ? patternGroup.getValue() : "";
-                placeholderMap.put("version." + groupName, () -> value);
+
+                final var placeholderKey = "version." + groupName;
+                // ensure no placeholder overwrites
+                if(placeholderMap.containsKey(placeholderKey)){
+                    throw new IllegalArgumentException("project version pattern capture group can not be named '" + groupName + "', because this would overwrite extension placeholder ${" + placeholderKey + "}");
+                }
+                placeholderMap.put(placeholderKey, () -> value);
             }
         }
 
+
         return placeholderMap;
     }
 
@@ -878,8 +885,14 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
             for (Entry<String, String> patternGroup : patternGroupValues(refPattern, refName).entrySet()) {
                 final String groupName = patternGroup.getKey();
                 final String value = patternGroup.getValue() != null ? patternGroup.getValue() : "";
-                placeholderMap.put("ref." + groupName, () -> value);
-                placeholderMap.put("ref." + groupName + ".slug", Lazy.by(() -> slugify(value)));
+
+                final var placeholderKey = "ref." + groupName;
+                // ensure no placeholder overwrites
+                if(placeholderMap.containsKey(placeholderKey)){
+                    throw new IllegalArgumentException("ref pattern capture group can not be named '" + groupName + "', because this would overwrite extension placeholder ${" + placeholderKey + "}");
+                }
+                placeholderMap.put(placeholderKey, () -> value);
+                placeholderMap.put(placeholderKey + ".slug", Lazy.by(() -> slugify(value)));
             }
         }
 
@@ -893,14 +906,6 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
         placeholderMap.put("describe", Lazy.by(() -> description.get().toString()));
         final Lazy<String> descriptionTag = Lazy.by(() -> description.get().getTag());
         placeholderMap.put("describe.tag", descriptionTag);
-        // describe tag pattern groups
-        final Lazy<Map<String, String>> describeTagPatternValues = Lazy.by(
-                () -> patternGroupValues(gitSituation.getDescribeTagPattern(), descriptionTag.get()));
-        for (String groupName : patternGroups(gitSituation.getDescribeTagPattern())) {
-            Lazy<String> groupValue = Lazy.by(() -> describeTagPatternValues.get().get(groupName));
-            placeholderMap.put("describe.tag." + groupName, groupValue);
-            placeholderMap.put("describe.tag." + groupName + ".slug", Lazy.by(() -> slugify(groupValue.get())));
-        }
 
         final Lazy<Matcher> descriptionTagVersionMatcher = Lazy.by(() -> matchVersion(descriptionTag.get()));
 
@@ -929,6 +934,20 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
         placeholderMap.put("describe.tag.version.label.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.label").get(), descriptionDistance.get())));
         placeholderMap.put("describe.tag.version.label.next.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.label.next").get(), descriptionDistance.get())));
 
+        // describe tag pattern groups
+        final Lazy<Map<String, String>> describeTagPatternValues = Lazy.by(
+                () -> patternGroupValues(gitSituation.getDescribeTagPattern(), descriptionTag.get()));
+        for (String groupName : patternGroups(gitSituation.getDescribeTagPattern())) {
+            final var placeholderKey = "describe.tag." + groupName;
+            // ensure no placeholder overwrites
+            if(placeholderMap.containsKey(placeholderKey)){
+                throw new IllegalArgumentException("describe tag pattern capture group can not be named '" + groupName + "', because this would overwrite extension placeholder ${" + placeholderKey + "}");
+            }
+            Lazy<String> groupValue = Lazy.by(() -> describeTagPatternValues.get().get(groupName));
+            placeholderMap.put(placeholderKey, groupValue);
+            placeholderMap.put(placeholderKey+ ".slug", Lazy.by(() -> slugify(groupValue.get())));
+        }
+
         // command parameters e.g. mvn -Dfoo=123 will be available as ${property.foo}
         for (Entry<Object, Object> property : mavenSession.getUserProperties().entrySet()) {
             if (property.getValue() != null) {

From 7927c9aab41a69775e628591766b061f240fbad7 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Thu, 30 Mar 2023 16:17:28 +0200
Subject: [PATCH 058/140] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c64938ea..8a34bf5c 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,10 @@
 [![Build Workflow](https://github.com/qoomon/maven-git-versioning-extension/workflows/Build/badge.svg)](https://github.com/qoomon/maven-git-versioning-extension/actions?query=workflow%3ABuild)
 [![LGTM Grade](https://img.shields.io/lgtm/grade/java/github/qoomon/maven-git-versioning-extension)](https://lgtm.com/projects/g/qoomon/maven-git-versioning-extension)
 
-![Example](docs/MavenGitVersioningExtension.png)
-
 **ℹ Also available as [Gradle Plugin](https://github.com/qoomon/gradle-git-versioning-plugin)**
 
+![Example](docs/MavenGitVersioningExtension.png)
+
 This extension can virtually set project version and properties, based on current **Git status**
 
 ℹ **No POM files will be modified, version and properties are modified in memory only**

From 59c80d2dfabbc6b44f0291ad6c2c17f3b12a7040 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Thu, 7 Sep 2023 16:22:17 +0200
Subject: [PATCH 059/140] fix: fix tag sorting by version (fixes #250)

---
 CHANGELOG.md                                                | 6 ++++++
 README.md                                                   | 2 +-
 pom.xml                                                     | 2 +-
 .../maven/gitversioning/GitVersioningModelProcessor.java    | 3 +--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c34517d5..0f8470ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 # Changelog
 
+## 9.6.6
+
+##### Fixes
+- fix tag sorting by version (fixes #250)
+
+
 ## 9.6.5
 
 ##### Fixes
diff --git a/README.md b/README.md
index 8a34bf5c..2972e46e 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.6.5</version>
+        <version>9.6.6</version>
     </extension>
 
 </extensions>
diff --git a/pom.xml b/pom.xml
index 5bd184c2..67ecc748 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.6.5</version>
+    <version>9.6.6</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index d4ed7ca2..ea84e7bc 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -746,8 +746,7 @@ protected void addTag(String tag) {
     }
 
     private static GitVersionDetails getGitVersionDetails(GitSituation gitSituation, Configuration config) {
-        final Lazy<List<String>> sortedTags = Lazy.by(() -> gitSituation.getTags().stream()
-                .sorted(comparing(DefaultArtifactVersion::new)).collect(toList()));
+        final Lazy<List<String>> sortedTags = Lazy.by(gitSituation::getTags);
         for (RefPatchDescription refConfig : config.refs.list) {
             switch (refConfig.type) {
                 case TAG: {

From 62c1c78d72d7ae943bde4df91f22df5aec33e167 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 12:04:44 +0000
Subject: [PATCH 060/140] build(deps): bump
 org.apache.maven.plugins:maven-javadoc-plugin

Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.1 to 3.6.3.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.4.1...maven-javadoc-plugin-3.6.3)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-javadoc-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 67ecc748..dd59577c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.4.1</version>
+                        <version>3.6.3</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>

From 65d5712035c20f8430a5b68083e3f76c51845dfe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 12:36:23 +0000
Subject: [PATCH 061/140] build(deps): bump org.eclipse.jgit:org.eclipse.jgit

Bumps org.eclipse.jgit:org.eclipse.jgit from 6.4.0.202211300538-r to 6.8.0.202311291450-r.

---
updated-dependencies:
- dependency-name: org.eclipse.jgit:org.eclipse.jgit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 67ecc748..bf1d9405 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit</artifactId>
-            <version>6.4.0.202211300538-r</version>
+            <version>6.8.0.202311291450-r</version>
         </dependency>
 
         <dependency>

From 957c81c13794f276df764718a3baf3ca4b3f215c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Dec 2023 12:57:46 +0000
Subject: [PATCH 062/140] build(deps): bump
 com.fasterxml.jackson.dataformat:jackson-dataformat-xml

Bumps [com.fasterxml.jackson.dataformat:jackson-dataformat-xml](https://github.com/FasterXML/jackson-dataformat-xml) from 2.14.2 to 2.16.1.
- [Commits](https://github.com/FasterXML/jackson-dataformat-xml/compare/jackson-dataformat-xml-2.14.2...jackson-dataformat-xml-2.16.1)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-xml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 67ecc748..37440862 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
-            <version>2.14.2</version>
+            <version>2.16.1</version>
         </dependency>
 
         <dependency>

From be60ab2f1a167ca5965d0a29482be8b71ed93200 Mon Sep 17 00:00:00 2001
From: jycr <jycr@users.noreply.github.com>
Date: Tue, 2 Jan 2024 01:52:34 +0100
Subject: [PATCH 063/140] fix: CVE-2023-2976 CVE-2020-8908 due to
 google:guava:25.1 from org.apache.maven:maven-core:3.8.7

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 67ecc748..a4e4de9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.8.7</version>
+            <version>3.9.6</version>
             <scope>provided</scope>
         </dependency>
 

From 868c9f9918ff161b778efeac08186ab566ec59f9 Mon Sep 17 00:00:00 2001
From: jycr <jycr@users.noreply.github.com>
Date: Tue, 2 Jan 2024 01:54:23 +0100
Subject: [PATCH 064/140] fix: CVE-2023-35116 due to
 fasterxml:jackson-modules-java8:2.14.2 from
 com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.14.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a4e4de9a..2b79b51d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
-            <version>2.14.2</version>
+            <version>2.16.1</version>
         </dependency>
 
         <dependency>

From 3c26cb3300f53e67b1a27e62430e98e43fc83852 Mon Sep 17 00:00:00 2001
From: jycr <jycr@users.noreply.github.com>
Date: Tue, 2 Jan 2024 02:00:58 +0100
Subject: [PATCH 065/140] refactor: Code quality

---
 pom.xml                                       |   2 +-
 .../GitVersioningModelProcessor.java          | 106 ++++++++++--------
 2 files changed, 62 insertions(+), 46 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2b79b51d..8a32543e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -238,7 +238,7 @@
                                 <configuration>
                                     <gpgArguments>
                                         <arg>--pinentry-mode</arg>
-                                        <arg>loopback</arg>j
+                                        <arg>loopback</arg>
                                     </gpgArguments>
                                 </configuration>
                             </execution>
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index ea84e7bc..0f32fce4 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -10,7 +10,6 @@
 import me.qoomon.gitversioning.commons.Lazy;
 import me.qoomon.maven.gitversioning.Configuration.PatchDescription;
 import me.qoomon.maven.gitversioning.Configuration.RefPatchDescription;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.building.Source;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.*;
@@ -44,7 +43,6 @@
 import static java.time.format.DateTimeFormatter.ISO_INSTANT;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
-import static java.util.Comparator.comparing;
 import static java.util.Objects.requireNonNullElse;
 import static java.util.stream.Collectors.*;
 import static me.qoomon.gitversioning.commons.GitRefType.*;
@@ -122,18 +120,20 @@ public Model read(InputStream input, Map<String, ?> options) throws IOException
 
 
     private void init(Model projectModel) throws IOException {
-        logger.info("");
-        logger.info(extensionLogHeader(BuildProperties.projectGAV()));
+        if (logger.isInfoEnabled()) {
+            logger.info("");
+            logger.info(extensionLogHeader(BuildProperties.projectGAV()));
+        }
 
         File pomFile = projectModel.getPomFile();
-        if(pomFile == null ){
+        if (pomFile == null) {
             logger.debug("skip - project model does not belong to a local project");
             disabled = true;
             return;
         }
 
-        if(!pomFile.isFile()){
-            logger.debug("skip - pom file does not exist " + pomFile);
+        if (!pomFile.isFile()) {
+            logger.debug("skip - pom file does not exist {}", pomFile);
             disabled = true;
             return;
         }
@@ -147,11 +147,11 @@ private void init(Model projectModel) throws IOException {
             return;
         }
 
-        logger.debug("pom file: " + pomFile);
+        logger.debug("pom file: {}", pomFile);
         mvnDirectory = findMvnDirectory(pomFile);
-        logger.debug(".mvn directory: " + mvnDirectory);
+        logger.debug(".mvn directory: {}", mvnDirectory);
         final File configFile = new File(mvnDirectory, projectArtifactId() + ".xml");
-        logger.debug("read config from " + configFile);
+        logger.debug("read config from {}", configFile);
         config = readConfig(configFile);
 
         // check if extension is disabled by command option
@@ -181,12 +181,12 @@ private void init(Model projectModel) throws IOException {
 
         if (logger.isDebugEnabled()) {
             logger.debug("git situation:");
-            logger.debug("  root directory: " + gitSituation.getRootDirectory());
-            logger.debug("  head commit: " + gitSituation.getRev());
-            logger.debug("  head commit timestamp: " + gitSituation.getTimestamp());
-            logger.debug("  head branch: " + gitSituation.getBranch());
-            logger.debug("  head tags: " + gitSituation.getTags());
-            logger.debug("  head description: " + gitSituation.getDescription());
+            logger.debug("  root directory: {}", gitSituation.getRootDirectory());
+            logger.debug("  head commit: {}", gitSituation.getRev());
+            logger.debug("  head commit timestamp: {}", gitSituation.getTimestamp());
+            logger.debug("  head branch: {}", gitSituation.getBranch());
+            logger.debug("  head tags: {}", gitSituation.getTags());
+            logger.debug("  head description: {}", gitSituation.getDescription());
         }
 
         // determine git version details
@@ -194,32 +194,32 @@ private void init(Model projectModel) throws IOException {
         if (gitVersionDetails == null) {
             logger.warn("skip - no matching <ref> configuration and no <rev> configuration defined");
             logger.warn("git refs:");
-            logger.warn("  branch: " + gitSituation.getBranch());
-            logger.warn("  tags: " + gitSituation.getTags());
+            logger.warn("  branch: {}", gitSituation.getBranch());
+            logger.warn("  tags: {}", gitSituation.getTags());
             logger.warn("defined ref configurations:");
-            config.refs.list.forEach(ref -> logger.warn("  " + rightPad(ref.type.name(), 6) + " - pattern: " + ref.pattern));
+            config.refs.list.forEach(ref -> logger.warn("  {} - pattern: {}", rightPad(ref.type.name(), 6), ref.pattern));
             disabled = true;
             return;
         }
 
-        logger.info("matching ref: " + gitVersionDetails.getRefType().name() + " - " + gitVersionDetails.getRefName());
+        logger.info("matching ref: {} - {}", gitVersionDetails.getRefType().name(), gitVersionDetails.getRefName());
         final RefPatchDescription patchDescription = gitVersionDetails.getPatchDescription();
-        logger.info("ref configuration: " + gitVersionDetails.getRefType().name() + " - pattern: " + patchDescription.pattern);
+        logger.info("ref configuration: {} - pattern: {}", gitVersionDetails.getRefType().name(), patchDescription.pattern);
         if (patchDescription.describeTagPattern != null && !patchDescription.describeTagPattern.equals(".*")) {
-            logger.info("  describeTagPattern: " + patchDescription.describeTagPattern);
+            logger.info("  describeTagPattern: {}", patchDescription.describeTagPattern);
             gitSituation.setDescribeTagPattern(patchDescription.describeTagPattern());
         }
         if (patchDescription.describeTagFirstParent != null) {
-            logger.info("  describeTagFirstParent: " + patchDescription.describeTagFirstParent);
+            logger.info("  describeTagFirstParent: {}", patchDescription.describeTagFirstParent);
             gitSituation.setFirstParent(patchDescription.describeTagFirstParent);
         }
         if (patchDescription.version != null) {
-            logger.info("  version: " + patchDescription.version);
+            logger.info("  version: {}", patchDescription.version);
         }
         if (!patchDescription.properties.isEmpty()) {
             logger.info("  properties: ");
             patchDescription.properties.forEach((key, value) -> {
-                logger.info("    " + key + " - " + value);
+                logger.info("    {} - {}", key, value);
             });
         }
 
@@ -229,20 +229,20 @@ private void init(Model projectModel) throws IOException {
             logger.info("  userProperties: ");
             String projectVersion = GAV.of(projectModel).getVersion();
             patchDescription.userProperties.forEach((key, value) -> {
-                logger.info("    " + key + " - " + value);
+                logger.info("    {} - {}", key, value);
                 mavenSession.getUserProperties().put(key, getGitPropertyValue(value, "", projectVersion));
             });
         }
         updatePom = getUpdatePomOption(patchDescription);
         if (updatePom) {
-            logger.info("  updatePom: " + updatePom);
+            logger.info("  updatePom: {}", updatePom);
         }
 
         // determine related projects
         relatedProjects = determineRelatedProjects(projectModel);
         if (logger.isDebugEnabled()) {
             logger.debug(buffer().strong("related projects:").toString());
-            relatedProjects.forEach(gav -> logger.debug("  " + gav));
+            relatedProjects.forEach(gav -> logger.debug("  {}", gav));
         }
 
         logger.info("");
@@ -271,13 +271,13 @@ public Model processModel(Model projectModel, Map<String, ?> options) throws IOE
 
         GAV projectGAV = GAV.of(projectModel);
         if (projectGAV.getVersion() == null) {
-            logger.debug("skip model - can not determine project version - " + projectModel.getPomFile());
+            logger.debug("skip model - can not determine project version - {}", projectModel.getPomFile());
             return projectModel;
         }
 
         if (!isRelatedProject(projectGAV)) {
             if (logger.isTraceEnabled()) {
-                logger.trace("skip model - unrelated project - " + projectModel.getPomFile());
+                logger.trace("skip model - unrelated project - {}", projectModel.getPomFile());
             }
             return projectModel;
         }
@@ -376,7 +376,7 @@ private void updateVersion(Model projectModel, String versionFormat) {
         if (projectModel.getVersion() != null) {
             GAV projectGAV = GAV.of(projectModel);
             String gitVersion = getGitVersion(versionFormat, projectGAV.getVersion());
-            logger.info("set version to " + gitVersion);
+            logger.info("set version to {}", gitVersion);
             projectModel.setVersion(gitVersion);
         }
     }
@@ -407,7 +407,9 @@ private void updatePluginVersions(ModelBase model, String versionFormat) {
         {
             List<Plugin> relatedPlugins = filterRelatedPlugins(build.getPlugins());
             if (!relatedPlugins.isEmpty()) {
-                logger.debug(sectionLogHeader("plugins", model));
+                if (logger.isDebugEnabled()) {
+                    logger.debug(sectionLogHeader("plugins", model));
+                }
                 for (Plugin plugin : relatedPlugins) {
                     updateVersion(plugin, versionFormat);
                 }
@@ -419,7 +421,9 @@ private void updatePluginVersions(ModelBase model, String versionFormat) {
         if (pluginManagement != null) {
             List<Plugin> relatedPlugins = filterRelatedPlugins(pluginManagement.getPlugins());
             if (!relatedPlugins.isEmpty()) {
-                logger.debug(sectionLogHeader("plugin management", model));
+                if (logger.isDebugEnabled()) {
+                    logger.debug(sectionLogHeader("plugin management", model));
+                }
                 for (Plugin plugin : relatedPlugins) {
                     updateVersion(plugin, versionFormat);
                 }
@@ -431,7 +435,9 @@ private void updatePluginVersions(ModelBase model, String versionFormat) {
         if (reporting != null) {
             List<ReportPlugin> relatedPlugins = filterRelatedReportPlugins(reporting.getPlugins());
             if (!relatedPlugins.isEmpty()) {
-                logger.debug(sectionLogHeader("reporting plugins", model));
+                if (logger.isDebugEnabled()) {
+                    logger.debug(sectionLogHeader("reporting plugins", model));
+                }
                 for (ReportPlugin plugin : relatedPlugins) {
                     updateVersion(plugin, versionFormat);
                 }
@@ -443,7 +449,9 @@ private void updateVersion(Plugin plugin, String versionFormat) {
         if (plugin.getVersion() != null) {
             GAV pluginGAV = GAV.of(plugin);
             String gitVersion = getGitVersion(versionFormat, pluginGAV.getVersion());
-            logger.debug(pluginGAV.getProjectId() + ": set version to " + gitVersion);
+            if (logger.isDebugEnabled()) {
+                logger.debug("{}: set version to {}", pluginGAV.getProjectId(), gitVersion);
+            }
             plugin.setVersion(gitVersion);
         }
     }
@@ -452,7 +460,9 @@ private void updateVersion(ReportPlugin plugin, String versionFormat) {
         if (plugin.getVersion() != null) {
             GAV pluginGAV = GAV.of(plugin);
             String gitVersion = getGitVersion(versionFormat, pluginGAV.getVersion());
-            logger.debug(pluginGAV.getProjectId() + ": set version to " + gitVersion);
+            if (logger.isDebugEnabled()) {
+                logger.debug("{}: set version to {}", pluginGAV.getProjectId(), gitVersion);
+            }
             plugin.setVersion(gitVersion);
         }
     }
@@ -474,7 +484,9 @@ private void updateDependencyVersions(ModelBase model, String versionFormat) {
         {
             List<Dependency> relatedDependencies = filterRelatedDependencies(model.getDependencies());
             if (!relatedDependencies.isEmpty()) {
-                logger.debug(sectionLogHeader("dependencies", model));
+                if (logger.isDebugEnabled()) {
+                    logger.debug(sectionLogHeader("dependencies", model));
+                }
                 for (Dependency dependency : relatedDependencies) {
                     updateVersion(dependency, versionFormat);
                 }
@@ -485,7 +497,9 @@ private void updateDependencyVersions(ModelBase model, String versionFormat) {
         if (dependencyManagement != null) {
             List<Dependency> relatedDependencies = filterRelatedDependencies(dependencyManagement.getDependencies());
             if (!relatedDependencies.isEmpty()) {
-                logger.debug(sectionLogHeader("dependency management", model));
+                if (logger.isDebugEnabled()) {
+                    logger.debug(sectionLogHeader("dependency management", model));
+                }
                 for (Dependency dependency : relatedDependencies) {
                     updateVersion(dependency, versionFormat);
                 }
@@ -497,7 +511,9 @@ private void updateVersion(Dependency dependency, String versionFormat) {
         if (dependency.getVersion() != null) {
             GAV dependencyGAV = GAV.of(dependency);
             String gitVersion = getGitVersion(versionFormat, dependencyGAV.getVersion());
-            logger.debug(dependencyGAV.getProjectId() + ": set version to " + gitVersion);
+            if (logger.isDebugEnabled()) {
+                logger.debug("{}: set version to {}", dependencyGAV.getProjectId(), gitVersion);
+            }
             dependency.setVersion(gitVersion);
         }
     }
@@ -649,7 +665,7 @@ private void handleEnvironment(Repository repository) throws IOException {
 
                     logger.info("gather git situation from GitHub Actions environment variable: GITHUB_REF");
                     String githubRef = System.getenv("GITHUB_REF");
-                    logger.debug("  GITHUB_REF: " + githubRef);
+                    logger.debug("  GITHUB_REF: {}", githubRef);
 
                     if (githubRef.startsWith("refs/tags/")) {
                         addTag(githubRef);
@@ -830,7 +846,7 @@ private Map<String, Supplier<String>> generateFormatPlaceholderMap(String projec
 
                 final var placeholderKey = "version." + groupName;
                 // ensure no placeholder overwrites
-                if(placeholderMap.containsKey(placeholderKey)){
+                if (placeholderMap.containsKey(placeholderKey)) {
                     throw new IllegalArgumentException("project version pattern capture group can not be named '" + groupName + "', because this would overwrite extension placeholder ${" + placeholderKey + "}");
                 }
                 placeholderMap.put(placeholderKey, () -> value);
@@ -887,7 +903,7 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
 
                 final var placeholderKey = "ref." + groupName;
                 // ensure no placeholder overwrites
-                if(placeholderMap.containsKey(placeholderKey)){
+                if (placeholderMap.containsKey(placeholderKey)) {
                     throw new IllegalArgumentException("ref pattern capture group can not be named '" + groupName + "', because this would overwrite extension placeholder ${" + placeholderKey + "}");
                 }
                 placeholderMap.put(placeholderKey, () -> value);
@@ -939,12 +955,12 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
         for (String groupName : patternGroups(gitSituation.getDescribeTagPattern())) {
             final var placeholderKey = "describe.tag." + groupName;
             // ensure no placeholder overwrites
-            if(placeholderMap.containsKey(placeholderKey)){
+            if (placeholderMap.containsKey(placeholderKey)) {
                 throw new IllegalArgumentException("describe tag pattern capture group can not be named '" + groupName + "', because this would overwrite extension placeholder ${" + placeholderKey + "}");
             }
             Lazy<String> groupValue = Lazy.by(() -> describeTagPatternValues.get().get(groupName));
             placeholderMap.put(placeholderKey, groupValue);
-            placeholderMap.put(placeholderKey+ ".slug", Lazy.by(() -> slugify(groupValue.get())));
+            placeholderMap.put(placeholderKey + ".slug", Lazy.by(() -> slugify(groupValue.get())));
         }
 
         // command parameters e.g. mvn -Dfoo=123 will be available as ${property.foo}
@@ -1160,7 +1176,7 @@ private static Set<File> getProjectModules(Model projectModel) {
 
     private File writePomFile(Model projectModel) throws IOException {
         File gitVersionedPomFile = new File(projectModel.getProjectDirectory(), GIT_VERSIONING_POM_NAME);
-        logger.debug("generate " + gitVersionedPomFile);
+        logger.debug("generate {}", gitVersionedPomFile);
 
         // read original pom file
         Document gitVersionedPomDocument = readXml(projectModel.getPomFile());

From 1fcadec07576e6e489577b0050c9423f87be6a8b Mon Sep 17 00:00:00 2001
From: jycr <jycr@users.noreply.github.com>
Date: Tue, 2 Jan 2024 00:01:28 +0100
Subject: [PATCH 066/140] chore: Update jGit dependency

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8a32543e..a5587a1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit</artifactId>
-            <version>6.4.0.202211300538-r</version>
+            <version>6.8.0.202311291450-r</version>
         </dependency>
 
         <dependency>

From 10ff879bae0f6584327828a74a5262fd0fa3dc54 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Tue, 2 Jan 2024 10:39:54 +0100
Subject: [PATCH 067/140] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 67ecc748..d0199d11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -238,7 +238,7 @@
                                 <configuration>
                                     <gpgArguments>
                                         <arg>--pinentry-mode</arg>
-                                        <arg>loopback</arg>j
+                                        <arg>loopback</arg>
                                     </gpgArguments>
                                 </configuration>
                             </execution>

From 791377b2e81f50caad927c305a319ea3dad6f0a5 Mon Sep 17 00:00:00 2001
From: jycr <jycr@users.noreply.github.com>
Date: Tue, 2 Jan 2024 00:04:02 +0100
Subject: [PATCH 068/140] feat: Delegate Model Processing to parent
 implementation

---
 .../GitVersioningModelProcessor.java          | 45 +++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 0f32fce4..7096a046 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -19,6 +19,8 @@
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
+import org.eclipse.sisu.BeanEntry;
+import org.eclipse.sisu.inject.BeanLocator;
 import org.slf4j.Logger;
 
 import javax.inject.Inject;
@@ -32,10 +34,15 @@
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.StreamSupport;
 
 import static com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS;
 import static java.lang.Boolean.parseBoolean;
@@ -57,11 +64,11 @@
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
- * Replacement for {@link ModelProcessor} to adapt versions.
+ * Wrapper for {@link ModelProcessor} to adapt versions.
  */
 @Named("core-default")
 @Singleton
-public class GitVersioningModelProcessor extends DefaultModelProcessor {
+public class GitVersioningModelProcessor implements ModelProcessor {
 
     private static final Pattern VERSION_PATTERN = Pattern.compile(".*?(?<version>(?<core>(?<major>\\d+)(?:\\.(?<minor>\\d+)(?:\\.(?<patch>\\d+))?)?)(?:-(?<label>.*))?)|");
 
@@ -75,8 +82,9 @@ public class GitVersioningModelProcessor extends DefaultModelProcessor {
 
     final private Logger logger = getLogger(GitVersioningModelProcessor.class);
 
-    @Inject
-    private SessionScope sessionScope;
+    private final SessionScope sessionScope;
+
+    private final ModelProcessor delegatedModelProcessor;
 
     private boolean initialized = false;
 
@@ -99,23 +107,37 @@ public class GitVersioningModelProcessor extends DefaultModelProcessor {
 
     private final Map<File, Model> sessionModelCache = new HashMap<>();
 
+    @Inject
+    public GitVersioningModelProcessor(
+            final BeanLocator beanLocator,
+            final SessionScope sessionScope
+    ) {
+        this.sessionScope = sessionScope;
+        this.delegatedModelProcessor = StreamSupport.stream(beanLocator.locate(Key.get(ModelProcessor.class)).spliterator(), false)
+                // Avoid circular dependency
+                .filter(beanEntry -> !beanEntry.getImplementationClass().equals(GitVersioningModelProcessor.class))
+                .findFirst()
+                .map(BeanEntry::getValue)
+                // There is normally always at least one implementation available: org.apache.maven.model.building.DefaultModelProcessor
+                .orElseThrow(() -> new NoSuchElementException("Unable to find default ModelProcessor"));
+    }
 
     @Override
     public Model read(File input, Map<String, ?> options) throws IOException {
         // clone model before return to prevent concurrency issues
-        return processModel(super.read(input, options), options).clone();
+        return processModel(delegatedModelProcessor.read(input, options), options).clone();
     }
 
     @Override
     public Model read(Reader input, Map<String, ?> options) throws IOException {
         // clone model before return to prevent concurrency issues
-        return processModel(super.read(input, options), options).clone();
+        return processModel(delegatedModelProcessor.read(input, options), options).clone();
     }
 
     @Override
     public Model read(InputStream input, Map<String, ?> options) throws IOException {
         // clone model before return to prevent concurrency issues
-        return processModel(super.read(input, options), options).clone();
+        return processModel(delegatedModelProcessor.read(input, options), options).clone();
     }
 
 
@@ -1179,7 +1201,7 @@ private File writePomFile(Model projectModel) throws IOException {
         logger.debug("generate {}", gitVersionedPomFile);
 
         // read original pom file
-        Document gitVersionedPomDocument = readXml(projectModel.getPomFile());
+        Document gitVersionedPomDocument = readXml(this.locatePom(projectModel.getProjectDirectory()));
         Element projectElement = gitVersionedPomDocument.getChild("project");
 
         // update project
@@ -1418,4 +1440,11 @@ private static String increase(String number, long increment) {
         String sanitized = number.isEmpty() ? "0" : number;
         return String.format("%0" + sanitized.length() + "d", Long.parseLong(number.isEmpty() ? "0" : number) + increment);
     }
+
+    @Override
+    public File locatePom(File projectDirectory) {
+        File result = delegatedModelProcessor.locatePom(projectDirectory);
+        logger.debug("locatePom in: {} -> {}", projectDirectory, result,new Exception());
+        return result;
+    }
 }

From 9e48685eaf00e48f7e0b58bc5552e0fcd08387cf Mon Sep 17 00:00:00 2001
From: jycr <jycr@users.noreply.github.com>
Date: Tue, 2 Jan 2024 10:43:44 +0100
Subject: [PATCH 069/140] refactor: Change dependency injection as suggested by
 https://github.com/qoomon/maven-git-versioning-extension/pull/269#issuecomment-1873750806

---
 .../GitVersioningModelProcessor.java          | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 7096a046..e9e31b08 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -13,14 +13,11 @@
 import org.apache.maven.building.Source;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.*;
-import org.apache.maven.model.building.DefaultModelProcessor;
 import org.apache.maven.model.building.ModelProcessor;
 import org.apache.maven.session.scope.internal.SessionScope;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
-import org.eclipse.sisu.BeanEntry;
-import org.eclipse.sisu.inject.BeanLocator;
 import org.slf4j.Logger;
 
 import javax.inject.Inject;
@@ -42,7 +39,6 @@
 import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.StreamSupport;
 
 import static com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS;
 import static java.lang.Boolean.parseBoolean;
@@ -82,9 +78,10 @@ public class GitVersioningModelProcessor implements ModelProcessor {
 
     final private Logger logger = getLogger(GitVersioningModelProcessor.class);
 
-    private final SessionScope sessionScope;
+    @Inject
+    private SessionScope sessionScope;
 
-    private final ModelProcessor delegatedModelProcessor;
+    private ModelProcessor delegatedModelProcessor;
 
     private boolean initialized = false;
 
@@ -108,18 +105,14 @@ public class GitVersioningModelProcessor implements ModelProcessor {
     private final Map<File, Model> sessionModelCache = new HashMap<>();
 
     @Inject
-    public GitVersioningModelProcessor(
-            final BeanLocator beanLocator,
-            final SessionScope sessionScope
-    ) {
-        this.sessionScope = sessionScope;
-        this.delegatedModelProcessor = StreamSupport.stream(beanLocator.locate(Key.get(ModelProcessor.class)).spliterator(), false)
+    void setDelegatedModelProcessor(List<ModelProcessor> modelProcessors) {
+        this.delegatedModelProcessor = modelProcessors.stream()
                 // Avoid circular dependency
-                .filter(beanEntry -> !beanEntry.getImplementationClass().equals(GitVersioningModelProcessor.class))
+                .filter(modelProcessor -> !Objects.equals(modelProcessor, this))
                 .findFirst()
-                .map(BeanEntry::getValue)
                 // There is normally always at least one implementation available: org.apache.maven.model.building.DefaultModelProcessor
                 .orElseThrow(() -> new NoSuchElementException("Unable to find default ModelProcessor"));
+        logger.debug("Delegated ModelProcessor: {}", this.delegatedModelProcessor);
     }
 
     @Override
@@ -147,7 +140,7 @@ private void init(Model projectModel) throws IOException {
             logger.info(extensionLogHeader(BuildProperties.projectGAV()));
         }
 
-        File pomFile = projectModel.getPomFile();
+        File pomFile = locatePom(projectModel.getProjectDirectory());
         if (pomFile == null) {
             logger.debug("skip - project model does not belong to a local project");
             disabled = true;
@@ -1443,8 +1436,6 @@ private static String increase(String number, long increment) {
 
     @Override
     public File locatePom(File projectDirectory) {
-        File result = delegatedModelProcessor.locatePom(projectDirectory);
-        logger.debug("locatePom in: {} -> {}", projectDirectory, result,new Exception());
-        return result;
+        return delegatedModelProcessor.locatePom(projectDirectory);
     }
 }

From 9421760dfad0046108cb90906b7117630eeed494 Mon Sep 17 00:00:00 2001
From: jycr <jycr@users.noreply.github.com>
Date: Tue, 2 Jan 2024 11:17:12 +0100
Subject: [PATCH 070/140] refactor: Code quality

---
 .../GitVersioningModelProcessor.java          | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index e9e31b08..1f701a24 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -233,9 +233,7 @@ private void init(Model projectModel) throws IOException {
         }
         if (!patchDescription.properties.isEmpty()) {
             logger.info("  properties: ");
-            patchDescription.properties.forEach((key, value) -> {
-                logger.info("    {} - {}", key, value);
-            });
+            patchDescription.properties.forEach((key, value) -> logger.info("    {} - {}", key, value));
         }
 
         globalFormatPlaceholderMap = generateGlobalFormatPlaceholderMap(gitSituation, gitVersionDetails, mavenSession);
@@ -308,8 +306,10 @@ public Model processModel(Model projectModel, Map<String, ?> options) throws IOE
         // add current project model to session project models
         sessionModelCache.put(canonicalProjectPomFile, projectModel);
 
-        // log project header
-        logger.info(projectLogHeader(projectGAV));
+        if (logger.isInfoEnabled()) {
+            // log project header
+            logger.info(projectLogHeader(projectGAV));
+        }
 
         updateModel(projectModel, gitVersionDetails.getPatchDescription());
 
@@ -381,7 +381,7 @@ private void updateParentVersion(Model projectModel, String versionFormat) {
             GAV parentGAV = GAV.of(parent);
             if (isRelatedProject(parentGAV)) {
                 String gitVersion = getGitVersion(versionFormat, parentGAV.getVersion());
-                logger.debug("set parent version to " + gitVersion + " (" + parentGAV + ")");
+                logger.debug("set parent version to {} ({})", gitVersion, parentGAV);
                 parent.setVersion(gitVersion);
             }
         }
@@ -406,7 +406,7 @@ private void updatePropertyValues(ModelBase model, Map<String, String> propertyF
             if (propertyFormat != null) {
                 String gitPropertyValue = getGitPropertyValue(propertyFormat, (String) modelPropertyValue, originalProjectGAV.getVersion());
                 if (!gitPropertyValue.equals(modelPropertyValue)) {
-                    logger.info("set property " + modelPropertyName + " to " + gitPropertyValue);
+                    logger.info("set property {} to {}", modelPropertyName, gitPropertyValue);
                     model.addProperty((String) modelPropertyName, gitPropertyValue);
                 }
             }
@@ -700,9 +700,9 @@ private void handleEnvironment(Repository repository) throws IOException {
                     String commitBranch = System.getenv("CI_COMMIT_BRANCH");
                     String commitTag = System.getenv("CI_COMMIT_TAG");
                     String mrSourceBranch = System.getenv("CI_MERGE_REQUEST_SOURCE_BRANCH_NAME");
-                    logger.debug("  CI_COMMIT_BRANCH: " + commitBranch);
-                    logger.debug("  CI_COMMIT_TAG: " + commitTag);
-                    logger.debug("  CI_MERGE_REQUEST_SOURCE_BRANCH_NAME: " + mrSourceBranch);
+                    logger.debug("  CI_COMMIT_BRANCH: {}", commitBranch);
+                    logger.debug("  CI_COMMIT_TAG: {}", commitTag);
+                    logger.debug("  CI_MERGE_REQUEST_SOURCE_BRANCH_NAME: {}", mrSourceBranch);
 
                     if (commitBranch != null) {
                         setBranch(commitBranch);
@@ -723,8 +723,8 @@ private void handleEnvironment(Repository repository) throws IOException {
                     logger.info("gather git situation from Circle CI environment variables: CIRCLE_BRANCH and CIRCLE_TAG");
                     String commitBranch = System.getenv("CIRCLE_BRANCH");
                     String commitTag = System.getenv("CIRCLE_TAG");
-                    logger.debug("  CIRCLE_BRANCH: " + commitBranch);
-                    logger.debug("  CIRCLE_TAG: " + commitTag);
+                    logger.debug("  CIRCLE_BRANCH: {}", commitBranch);
+                    logger.debug("  CIRCLE_TAG: {}", commitTag);
 
                     if (commitBranch != null) {
                         setBranch(commitBranch);
@@ -742,8 +742,8 @@ private void handleEnvironment(Repository repository) throws IOException {
                     logger.info("gather git situation from jenkins environment variables: BRANCH_NAME and TAG_NAME");
                     String commitBranch = System.getenv("BRANCH_NAME");
                     String commitTag = System.getenv("TAG_NAME");
-                    logger.debug("  BRANCH_NAME: " + commitBranch);
-                    logger.debug("  TAG_NAME: " + commitTag);
+                    logger.debug("  BRANCH_NAME: {}", commitBranch);
+                    logger.debug("  TAG_NAME: {}", commitTag);
 
                     if (commitBranch != null) {
                         if (commitBranch.equals(commitTag)) {
@@ -760,17 +760,17 @@ private void handleEnvironment(Repository repository) throws IOException {
 
 
             protected void setBranch(String branch) {
-                logger.debug("override git branch with " + branch);
+                logger.debug("override git branch with {}", branch);
                 super.setBranch(branch);
             }
 
             protected void setTags(List<String> tags) {
-                logger.debug("override git tags with single tag " + tags);
+                logger.debug("override git tags with single tag {}", tags);
                 super.setTags(tags);
             }
 
             protected void addTag(String tag) {
-                logger.debug("add git tag " + tag);
+                logger.debug("add git tag {}", tag);
                 super.addTag(tag);
             }
         };

From 67f6be09ee1516c8f8e6d19e0450ad97c79d7c69 Mon Sep 17 00:00:00 2001
From: jycr <jycr@users.noreply.github.com>
Date: Tue, 2 Jan 2024 11:21:15 +0100
Subject: [PATCH 071/140] fix: update pom feature as suggested in:
 https://github.com/qoomon/maven-git-versioning-extension/pull/269#issuecomment-1873838849

---
 .../qoomon/maven/gitversioning/GitVersioningModelProcessor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 1f701a24..58e8af55 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -318,7 +318,7 @@ public Model processModel(Model projectModel, Map<String, ?> options) throws IOE
             logger.debug("updating original POM file");
             Files.copy(
                     gitVersionedPomFile.toPath(),
-                    projectModel.getPomFile().toPath(),
+                    locatePom(projectModel.getProjectDirectory()).toPath(),
                     StandardCopyOption.REPLACE_EXISTING);
         }
 

From e8007f3bfa302b8a5d0ce5eafc5cd3c60c24c4a7 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Tue, 2 Jan 2024 11:52:14 +0100
Subject: [PATCH 072/140] Update GitVersioningModelProcessor.java

---
 .../GitVersioningModelProcessor.java          | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 58e8af55..b79c78a4 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -78,10 +78,22 @@ public class GitVersioningModelProcessor implements ModelProcessor {
 
     final private Logger logger = getLogger(GitVersioningModelProcessor.class);
 
+    // gets injected by setter, see below
+    private ModelProcessor delegatedModelProcessor;
+    
     @Inject
-    private SessionScope sessionScope;
+    void setDelegatedModelProcessor(List<ModelProcessor> modelProcessors) {
+        this.delegatedModelProcessor = modelProcessors.stream()
+                // Avoid circular dependency
+                .filter(modelProcessor -> !Objects.equals(modelProcessor, this))
+                .findFirst()
+                // There is normally always at least one implementation available: org.apache.maven.model.building.DefaultModelProcessor
+                .orElseThrow(() -> new NoSuchElementException("Unable to find default ModelProcessor"));
+        logger.debug("Delegated ModelProcessor: {}", this.delegatedModelProcessor);
+    }
 
-    private ModelProcessor delegatedModelProcessor;
+    @Inject
+    private SessionScope sessionScope;
 
     private boolean initialized = false;
 
@@ -104,16 +116,7 @@ public class GitVersioningModelProcessor implements ModelProcessor {
 
     private final Map<File, Model> sessionModelCache = new HashMap<>();
 
-    @Inject
-    void setDelegatedModelProcessor(List<ModelProcessor> modelProcessors) {
-        this.delegatedModelProcessor = modelProcessors.stream()
-                // Avoid circular dependency
-                .filter(modelProcessor -> !Objects.equals(modelProcessor, this))
-                .findFirst()
-                // There is normally always at least one implementation available: org.apache.maven.model.building.DefaultModelProcessor
-                .orElseThrow(() -> new NoSuchElementException("Unable to find default ModelProcessor"));
-        logger.debug("Delegated ModelProcessor: {}", this.delegatedModelProcessor);
-    }
+   
 
     @Override
     public Model read(File input, Map<String, ?> options) throws IOException {

From baae0c9a4d3ceaa5f6560e7db458991aff58de4c Mon Sep 17 00:00:00 2001
From: jycr <jycr@users.noreply.github.com>
Date: Tue, 2 Jan 2024 12:13:22 +0100
Subject: [PATCH 073/140] doc: Add comments as suggested in
 https://github.com/qoomon/maven-git-versioning-extension/pull/269

---
 .../maven/gitversioning/GitVersioningModelProcessor.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index b79c78a4..09b6621f 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -143,6 +143,8 @@ private void init(Model projectModel) throws IOException {
             logger.info(extensionLogHeader(BuildProperties.projectGAV()));
         }
 
+        // In case another ModelProcessor is used (like for example polyglot extension),
+        // we need to work on the POM possibly translated into XML
         File pomFile = locatePom(projectModel.getProjectDirectory());
         if (pomFile == null) {
             logger.debug("skip - project model does not belong to a local project");
@@ -321,6 +323,8 @@ public Model processModel(Model projectModel, Map<String, ?> options) throws IOE
             logger.debug("updating original POM file");
             Files.copy(
                     gitVersionedPomFile.toPath(),
+                    // In case another ModelProcessor is used (like for example polyglot extension),
+                    // we need to work on the POM possibly translated into XML
                     locatePom(projectModel.getProjectDirectory()).toPath(),
                     StandardCopyOption.REPLACE_EXISTING);
         }
@@ -1196,7 +1200,8 @@ private File writePomFile(Model projectModel) throws IOException {
         File gitVersionedPomFile = new File(projectModel.getProjectDirectory(), GIT_VERSIONING_POM_NAME);
         logger.debug("generate {}", gitVersionedPomFile);
 
-        // read original pom file
+        // In case another ModelProcessor is used (like for example polyglot extension),
+        // we need to work on the POM possibly translated into XML
         Document gitVersionedPomDocument = readXml(this.locatePom(projectModel.getProjectDirectory()));
         Element projectElement = gitVersionedPomDocument.getChild("project");
 

From 0bb204a40f79d3e8c0736b41f8840fe09b9a7586 Mon Sep 17 00:00:00 2001
From: jycr <jycr@users.noreply.github.com>
Date: Tue, 2 Jan 2024 13:09:39 +0100
Subject: [PATCH 074/140] refactor: Move overridden method with the other
 overridden methods

---
 .../gitversioning/GitVersioningModelProcessor.java     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 09b6621f..2faa275e 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -116,7 +116,10 @@ void setDelegatedModelProcessor(List<ModelProcessor> modelProcessors) {
 
     private final Map<File, Model> sessionModelCache = new HashMap<>();
 
-   
+    @Override
+    public File locatePom(File projectDirectory) {
+        return delegatedModelProcessor.locatePom(projectDirectory);
+    }
 
     @Override
     public Model read(File input, Map<String, ?> options) throws IOException {
@@ -1441,9 +1444,4 @@ private static String increase(String number, long increment) {
         String sanitized = number.isEmpty() ? "0" : number;
         return String.format("%0" + sanitized.length() + "d", Long.parseLong(number.isEmpty() ? "0" : number) + increment);
     }
-
-    @Override
-    public File locatePom(File projectDirectory) {
-        return delegatedModelProcessor.locatePom(projectDirectory);
-    }
 }

From 152f2678f886120957240b0b81764b3cd74054cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 12:11:20 +0000
Subject: [PATCH 075/140] build(deps): bump
 org.apache.maven.plugins:maven-surefire-plugin

Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M8 to 3.2.3.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M8...surefire-3.2.3)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a5587a1b..71d6c9d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,7 +155,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M8</version>
+                <version>3.2.3</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

From b7577b737c604f8cae17fe675a141b853a7136de Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Tue, 2 Jan 2024 13:45:44 +0100
Subject: [PATCH 076/140] refactor: streamline readModel

---
 src/main/java/me/qoomon/maven/gitversioning/MavenUtil.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/me/qoomon/maven/gitversioning/MavenUtil.java b/src/main/java/me/qoomon/maven/gitversioning/MavenUtil.java
index 28d269bf..92531c6f 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/MavenUtil.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/MavenUtil.java
@@ -30,8 +30,8 @@ final class MavenUtil {
      * @throws IOException IOException
      */
     static Model readModel(File pomFile) throws IOException {
-        try (InputStream inputStream = new FileInputStream(pomFile)) {
-            Model model = new MavenXpp3Reader().read(inputStream);
+        try (FileReader fileReader = new FileReader(pomFile)) {
+            Model model = new MavenXpp3Reader().read(fileReader);
             model.setPomFile(pomFile);
             return model;
         } catch (XmlPullParserException e) {

From acfe3428e11f59b1f274a31460635e3c76726f8e Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Tue, 2 Jan 2024 13:46:34 +0100
Subject: [PATCH 077/140] build: update junit

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 55e49580..eb3ac939 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,14 +91,14 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.9.2</version>
+            <version>5.10.0</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.9.2</version>
+            <version>5.10.0</version>
             <scope>test</scope>
         </dependency>
 

From 604588619c21c240801f39bd2df3660dc7f1d615 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Tue, 2 Jan 2024 13:47:41 +0100
Subject: [PATCH 078/140] test: fix illegal describeTagPattern in test config

---
 .../multiModuleProject/.mvn/maven-git-versioning-extension.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/resources/testProjects/multiModuleProject/.mvn/maven-git-versioning-extension.xml b/src/test/resources/testProjects/multiModuleProject/.mvn/maven-git-versioning-extension.xml
index 1081bca5..727ab95b 100644
--- a/src/test/resources/testProjects/multiModuleProject/.mvn/maven-git-versioning-extension.xml
+++ b/src/test/resources/testProjects/multiModuleProject/.mvn/maven-git-versioning-extension.xml
@@ -2,7 +2,7 @@
                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-7.0.0.xsd">
 
-    <describeTagPattern><![CDATA[v(?<version>.*)]]></describeTagPattern>
+
 
     <refs>
 

From afaeb7e472e8509ac58b9caa6412699859039dc9 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Tue, 2 Jan 2024 13:49:38 +0100
Subject: [PATCH 079/140] test: add polyglot extension to test setup

---
 .../testProjects/multiModuleProject/.mvn/extensions.xml    | 6 ++++++
 .../resources/testProjects/multiModuleProject/pom.yaml     | 7 +++++++
 2 files changed, 13 insertions(+)
 create mode 100644 src/test/resources/testProjects/multiModuleProject/pom.yaml

diff --git a/src/test/resources/testProjects/multiModuleProject/.mvn/extensions.xml b/src/test/resources/testProjects/multiModuleProject/.mvn/extensions.xml
index fa49c7a0..b3e807cc 100644
--- a/src/test/resources/testProjects/multiModuleProject/.mvn/extensions.xml
+++ b/src/test/resources/testProjects/multiModuleProject/.mvn/extensions.xml
@@ -5,4 +5,10 @@
         <artifactId>maven-git-versioning-extension</artifactId>
         <version>LATEST</version>
     </extension>
+
+    <extension>
+        <groupId>io.takari.polyglot</groupId>
+        <artifactId>polyglot-yaml</artifactId>
+        <version>LATEST</version>
+    </extension>
 </extensions>
diff --git a/src/test/resources/testProjects/multiModuleProject/pom.yaml b/src/test/resources/testProjects/multiModuleProject/pom.yaml
new file mode 100644
index 00000000..fd867ac5
--- /dev/null
+++ b/src/test/resources/testProjects/multiModuleProject/pom.yaml
@@ -0,0 +1,7 @@
+modelEncoding: UTF-8
+modelVersion: 4.0.0
+
+groupId: multi-module-project
+artifactId: main
+version: 0.0.0-LOCAL
+packaging: pom

From d10e8d7573d8eea27076d0c86273cccfc9d45ac5 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Tue, 2 Jan 2024 13:50:04 +0100
Subject: [PATCH 080/140] build(release): bump version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index eb3ac939..ac2884b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.6.6</version>
+    <version>9.7.0</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>

From ba86feb9fc924d2813eae6080781c2f436c0b7b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 13:04:09 +0000
Subject: [PATCH 081/140] build(deps-dev): bump
 org.junit.jupiter:junit-jupiter-api

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.9.2 to 5.10.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.10.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ac2884b6..c9699470 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.10.0</version>
+            <version>5.10.1</version>
             <scope>test</scope>
         </dependency>
 

From b082ab88c35d2fdbaa0dccc5ceba7bea01e5cf29 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Jan 2024 13:04:15 +0000
Subject: [PATCH 082/140] build(deps-dev): bump
 org.junit.jupiter:junit-jupiter-engine

Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.2 to 5.10.1.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.10.1)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ac2884b6..97b0f946 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.10.0</version>
+            <version>5.10.1</version>
             <scope>test</scope>
         </dependency>
 

From b2bbe7fd211bffa64f11a55af6c2f71211c05cd9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 12:03:03 +0000
Subject: [PATCH 083/140] build(deps): bump
 org.apache.maven.plugins:maven-enforcer-plugin

Bumps [org.apache.maven.plugins:maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.1.0 to 3.4.1.
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.1.0...enforcer-3.4.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 25a445c7..67fffe7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-enforcer-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.4.1</version>
                         <executions>
                             <execution>
                                 <id>enforce-no-snapshots</id>

From 0460f4ccf2b4743839a6d5ac681210b400d8fb13 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 12:03:08 +0000
Subject: [PATCH 084/140] build(deps): bump
 org.apache.maven.plugins:maven-failsafe-plugin

Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.0.0-M8 to 3.2.3.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M8...surefire-3.2.3)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 25a445c7..1132edba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.0.0-M8</version>
+                <version>3.2.3</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

From 621bd9434c95f1a5b821fa141e570beb2ab181bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 12:03:12 +0000
Subject: [PATCH 085/140] build(deps): bump
 org.codehaus.plexus:plexus-component-metadata

Bumps [org.codehaus.plexus:plexus-component-metadata](https://github.com/codehaus-plexus/plexus-containers) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/codehaus-plexus/plexus-containers/releases)
- [Changelog](https://github.com/codehaus-plexus/plexus-containers/blob/master/ReleaseNotes.md)
- [Commits](https://github.com/codehaus-plexus/plexus-containers/compare/plexus-containers-2.1.1...plexus-containers-2.2.0)

---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-component-metadata
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 25a445c7..2b416661 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-component-metadata</artifactId>
-                <version>2.1.1</version>
+                <version>2.2.0</version>
                 <executions>
                     <execution>
                         <goals>

From 2ae8994daaed3807a49b19acc228deb49db5a818 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 12:03:17 +0000
Subject: [PATCH 086/140] build(deps): bump
 org.apache.maven.plugins:maven-gpg-plugin

Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.0.1 to 3.1.0.
- [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.0.1...maven-gpg-plugin-3.1.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-gpg-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 25a445c7..128c84f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,7 +227,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <version>3.1.0</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

From eef0a2b5cbe2f36ad11820ee3ed4d2b897eb49e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 12:14:13 +0000
Subject: [PATCH 087/140] build(deps): bump
 org.apache.maven.plugin-tools:maven-plugin-annotations

Bumps [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.7.1 to 3.10.2.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.7.1...maven-plugin-tools-3.10.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1f58eba3..32fc7c5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.7.1</version>
+            <version>3.10.2</version>
             <scope>provided</scope>
         </dependency>
 

From c5191440c1c61f7fce557366646aea61574049d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 12:14:18 +0000
Subject: [PATCH 088/140] build(deps): bump org.apache.maven:maven-plugin-api
 from 3.8.7 to 3.9.6

Bumps [org.apache.maven:maven-plugin-api](https://github.com/apache/maven) from 3.8.7 to 3.9.6.
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.7...maven-3.9.6)

---
updated-dependencies:
- dependency-name: org.apache.maven:maven-plugin-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1f58eba3..f7238a9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.8.7</version>
+            <version>3.9.6</version>
             <scope>provided</scope>
         </dependency>
 

From 583b02ff050bace78df0fdb346021c604996cd3d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Jan 2024 12:14:28 +0000
Subject: [PATCH 089/140] build(deps-dev): bump org.assertj:assertj-core from
 3.24.2 to 3.25.1

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.24.2 to 3.25.1.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.24.2...assertj-build-3.25.1)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1f58eba3..12ee1059 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.24.2</version>
+            <version>3.25.1</version>
             <scope>test</scope>
         </dependency>
 

From 4463f9e5efe3fbc6a3a702ed3633963a194e9e62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jan 2024 12:23:26 +0000
Subject: [PATCH 090/140] build(deps): bump
 org.apache.maven.plugins:maven-plugin-plugin

Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.7.1 to 3.10.2.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.7.1...maven-plugin-tools-3.10.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0f5ce8cf..93af476e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.7.1</version>
+                <version>3.10.2</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>

From abd6f53823339c46760910aa3199babb1b54c331 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Jan 2024 12:23:28 +0000
Subject: [PATCH 091/140] build(deps-dev): bump org.slf4j:slf4j-simple from
 2.0.6 to 2.0.10

Bumps org.slf4j:slf4j-simple from 2.0.6 to 2.0.10.

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-simple
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0f5ce8cf..26e47e2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.6</version>
+            <version>2.0.10</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

From 8e73543826aaf957c28c0641f06970e2581eb7e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 12:51:33 +0000
Subject: [PATCH 092/140] build(deps-dev): bump org.slf4j:slf4j-simple from
 2.0.10 to 2.0.11

Bumps org.slf4j:slf4j-simple from 2.0.10 to 2.0.11.

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-simple
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f69927dc..5464db42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.10</version>
+            <version>2.0.11</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

From dd3225f2651fc1b28143759db79107e7216f5ba1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jan 2024 12:59:09 +0000
Subject: [PATCH 093/140] build(deps): bump
 org.apache.maven.plugins:maven-surefire-plugin

Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.3 to 3.2.5.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.3...surefire-3.2.5)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5464db42..81c843ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,7 +155,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.2.5</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

From b6b2008e133bc9c4422527a167eb2baeacd77697 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jan 2024 12:59:12 +0000
Subject: [PATCH 094/140] build(deps): bump
 org.apache.maven.plugins:maven-failsafe-plugin

Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.2.3 to 3.2.5.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.3...surefire-3.2.5)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5464db42..3d594b54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.2.5</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

From 969335841cb2a936d5948947b711d83a1f1c1ebd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Jan 2024 12:52:00 +0000
Subject: [PATCH 095/140] build(deps): bump
 org.apache.maven.plugins:maven-plugin-plugin

Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.10.2 to 3.11.0.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.2...maven-plugin-tools-3.11.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 40ad2761..9ffc1a70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.10.2</version>
+                <version>3.11.0</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>

From 3c641112d88b348b831dada23fd828baf8df72ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Jan 2024 12:52:06 +0000
Subject: [PATCH 096/140] build(deps): bump
 org.apache.maven.plugin-tools:maven-plugin-annotations

Bumps [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.10.2 to 3.11.0.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.10.2...maven-plugin-tools-3.11.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 40ad2761..14bd8e18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.10.2</version>
+            <version>3.11.0</version>
             <scope>provided</scope>
         </dependency>
 

From 0e46a628eb43672ce64b01189dbc00314d11ac19 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Thu, 11 Jan 2024 18:22:07 +0100
Subject: [PATCH 097/140] Update pom.xml

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index b24c6723..6bc97f8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
+                <goalPrefix>${project.name}</goalPrefix>
                 <version>3.11.0</version>
             </plugin>
             <plugin>

From d32abbb7ef8424528af7fa7532ee284d85be55cc Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Thu, 11 Jan 2024 18:23:46 +0100
Subject: [PATCH 098/140] Update pom.xml

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6bc97f8a..2d8d3189 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <goalPrefix>${project.name}</goalPrefix>
+                <configuration>
+                    <goalPrefix>${project.name}</goalPrefix>
+                </configuration>
                 <version>3.11.0</version>
             </plugin>
             <plugin>

From 6e0c3e1eae23f93d156a72764b9a2e564189880b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 12:16:38 +0000
Subject: [PATCH 099/140] build(deps-dev): bump
 org.junit.jupiter:junit-jupiter-api

Bumps [org.junit.jupiter:junit-jupiter-api](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-api
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2d8d3189..52245e3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.10.1</version>
+            <version>5.10.2</version>
             <scope>test</scope>
         </dependency>
 

From 48dd560fbccdb565f856fd0814de602952cd99fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 12:16:42 +0000
Subject: [PATCH 100/140] build(deps-dev): bump
 org.junit.jupiter:junit-jupiter-engine

Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.10.1 to 5.10.2.
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.10.1...r5.10.2)

---
updated-dependencies:
- dependency-name: org.junit.jupiter:junit-jupiter-engine
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2d8d3189..a5be5a37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.10.1</version>
+            <version>5.10.2</version>
             <scope>test</scope>
         </dependency>
 

From d24e0b3c830c12388807d48321d345ea47689cb5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 12:16:46 +0000
Subject: [PATCH 101/140] build(deps-dev): bump org.assertj:assertj-core from
 3.25.1 to 3.25.3

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.1 to 3.25.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.1...assertj-build-3.25.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2d8d3189..575fc98e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.25.1</version>
+            <version>3.25.3</version>
             <scope>test</scope>
         </dependency>
 

From 11e2ee8dd9e1d58101ff18416d8de42d355c64bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 12:24:09 +0000
Subject: [PATCH 102/140] build(deps): bump
 org.apache.maven.plugins:maven-compiler-plugin

Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.13.0.
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.13.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2d8d3189..9aacd4d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.13.0</version>
             </plugin>
         </plugins>
     </build>

From e4d8674bd5e4b94a4aebc27f8767603a006fd55d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Apr 2024 12:30:42 +0000
Subject: [PATCH 103/140] build(deps): bump
 org.apache.maven.plugins:maven-source-plugin

Bumps [org.apache.maven.plugins:maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.2.1 to 3.3.1.
- [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.2.1...maven-source-plugin-3.3.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-source-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2d8d3189..3dd822df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,7 +202,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>3.2.1</version>
+                        <version>3.3.1</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>

From 28da1fb3eb2317b4d2240dfaca55267ed6d83308 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 12:05:50 +0000
Subject: [PATCH 104/140] build(deps): bump
 com.fasterxml.jackson.dataformat:jackson-dataformat-xml

Bumps [com.fasterxml.jackson.dataformat:jackson-dataformat-xml](https://github.com/FasterXML/jackson-dataformat-xml) from 2.16.1 to 2.17.0.
- [Commits](https://github.com/FasterXML/jackson-dataformat-xml/compare/jackson-dataformat-xml-2.16.1...jackson-dataformat-xml-2.17.0)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-xml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3dd822df..3442e7ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
-            <version>2.16.1</version>
+            <version>2.17.0</version>
         </dependency>
 
         <dependency>

From de36eef4806e43a7ade2ddbbc4753291e35a6e66 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Apr 2024 12:15:52 +0000
Subject: [PATCH 105/140] build(deps): bump org.eclipse.jgit:org.eclipse.jgit

Bumps org.eclipse.jgit:org.eclipse.jgit from 6.8.0.202311291450-r to 6.9.0.202403050737-r.

---
updated-dependencies:
- dependency-name: org.eclipse.jgit:org.eclipse.jgit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3442e7ef..52d30d48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit</artifactId>
-            <version>6.8.0.202311291450-r</version>
+            <version>6.9.0.202403050737-r</version>
         </dependency>
 
         <dependency>

From 6afe37c7c54146b2be7f25aa367b79bf619e7585 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Apr 2024 12:39:26 +0000
Subject: [PATCH 106/140] build(deps): bump
 org.apache.maven.plugin-tools:maven-plugin-annotations

Bumps [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.11.0 to 3.12.0.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.11.0...maven-plugin-tools-3.12.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 52d30d48..b1858948 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.11.0</version>
+            <version>3.12.0</version>
             <scope>provided</scope>
         </dependency>
 

From 149992e4389c0cdcb18bccecdb02df16fba0176c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Apr 2024 12:18:00 +0000
Subject: [PATCH 107/140] build(deps): bump
 org.apache.maven.plugins:maven-gpg-plugin

Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.1.0 to 3.2.3.
- [Release notes](https://github.com/apache/maven-gpg-plugin/releases)
- [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.1.0...maven-gpg-plugin-3.2.3)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-gpg-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b1858948..19de8034 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,7 +230,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.2.3</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

From 7acf78c6800b5148c7b82a1fb29a1d1236e3debf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Apr 2024 12:24:04 +0000
Subject: [PATCH 108/140] build(deps): bump
 org.apache.maven.plugins:maven-plugin-plugin

Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.11.0 to 3.12.0.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.11.0...maven-plugin-tools-3.12.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 19de8034..928d7a48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
                 <configuration>
                     <goalPrefix>${project.name}</goalPrefix>
                 </configuration>
-                <version>3.11.0</version>
+                <version>3.12.0</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>

From 45a236d935db87c24c13899ec5647a6ca1eea03e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 12:42:20 +0000
Subject: [PATCH 109/140] build(deps-dev): bump org.slf4j:slf4j-simple from
 2.0.11 to 2.0.13

Bumps org.slf4j:slf4j-simple from 2.0.11 to 2.0.13.

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-simple
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e36f1132..b13913fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.11</version>
+            <version>2.0.13</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

From ccdfec181290c2f3e7ba1624748f3caa85f27616 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Apr 2024 12:28:54 +0000
Subject: [PATCH 110/140] build(deps): bump
 org.apache.maven.plugins:maven-gpg-plugin

Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.2.3 to 3.2.4.
- [Release notes](https://github.com/apache/maven-gpg-plugin/releases)
- [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.2.3...maven-gpg-plugin-3.2.4)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-gpg-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b13913fa..ccaa8a47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,7 +230,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.3</version>
+                        <version>3.2.4</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

From e70282ecbbb6c526d5fe521289004412e31a6014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20Gond=C5=BEa?= <ogondza@gmail.com>
Date: Wed, 24 Apr 2024 18:46:52 +0200
Subject: [PATCH 111/140] Fix #299: Introduce `describe.distance.snapshot` for
 compatibility with maven deploy plugin

---
 README.md                                     |  1 +
 .../GitVersioningModelProcessor.java          |  3 +-
 .../GitVersioningExtensionIT.java             | 54 +++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2972e46e..671b15a6 100644
--- a/README.md
+++ b/README.md
@@ -236,6 +236,7 @@ e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
 
 - `${describe}` Will resolve to `git describe` output
 - `${describe.distance}` The distance count to last matching tag
+- `${describe.distance.snapshot}` Empty string on matching tag, `-SNAPSHOT` if `describe.distance > 0` 
 - `${describe.tag}` The matching tag of `git describe`
   - `${describe.tag.version}` the tag version determined by regex `(?<version>(?<core>(?<major>\d+)(?:\.(?<minor>\d+)(?:\.(?<patch>\d+))?)?)(?:-(?<label>.*))?)`
     - `${describe.tag.version.core}` the core version component of `${describe.tag.version}` e.g. '1.2.3' 
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 2faa275e..af08645b 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -80,7 +80,7 @@ public class GitVersioningModelProcessor implements ModelProcessor {
 
     // gets injected by setter, see below
     private ModelProcessor delegatedModelProcessor;
-    
+
     @Inject
     void setDelegatedModelProcessor(List<ModelProcessor> modelProcessors) {
         this.delegatedModelProcessor = modelProcessors.stream()
@@ -967,6 +967,7 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
 
         final Lazy<Integer> descriptionDistance = Lazy.by(() -> description.get().getDistance());
         placeholderMap.put("describe.distance", Lazy.by(() -> String.valueOf(descriptionDistance.get())));
+        placeholderMap.put("describe.distance.snapshot", Lazy.by(() -> (descriptionDistance.get() == 0 ? "" : "-SNAPSHOT")));
 
         placeholderMap.put("describe.tag.version.patch.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch").get(), descriptionDistance.get())));
         placeholderMap.put("describe.tag.version.patch.next.plus.describe.distance", Lazy.by(() -> increase(placeholderMap.get("describe.tag.version.patch.next").get(), descriptionDistance.get())));
diff --git a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
index ded58bb1..be9b7b87 100644
--- a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
+++ b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
@@ -807,7 +807,61 @@ void apply_TwoCommitsSinceLastTagGivesExpectedPlusDistanceResult() throws Except
             Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
             assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
         }
+    }
+
+    @Test
+    void apply_DescribeDistanceSnapshotRelease() throws Exception {
+        // given
+        try (Git git = Git.init().setInitialBranch(MASTER).setDirectory(projectDir.toFile()).call()) {
+            git.commit().setMessage("initial commit").setAllowEmpty(true).call();
+            git.tag().setName("2.0.4").call();
 
+            writeModel(projectDir.resolve("pom.xml").toFile(), pomModel);
+            writeExtensionsFile(projectDir);
+            writeExtensionConfigFile(projectDir, new Configuration() {{
+                refs.list.add(createVersionDescription(BRANCH, "${describe.tag}${describe.distance.snapshot}"));
+            }});
+
+            // When
+            Verifier verifier = getVerifier(projectDir);
+            verifier.executeGoal("verify");
+
+            // Then
+            String expectedVersion = "2.0.4";
+            Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
+            assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
+
+            verifier.verifyErrorFreeLog();
+            verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
+        }
+    }
+
+    @Test
+    void apply_DescribeDistanceSnapshot() throws Exception {
+        // given
+        try (Git git = Git.init().setInitialBranch(MASTER).setDirectory(projectDir.toFile()).call()) {
+            git.commit().setMessage("initial commit").setAllowEmpty(true).call();
+            git.tag().setName("2.0.4").call();
+            git.commit().setMessage("commit one").setAllowEmpty(true).call();
+
+            writeModel(projectDir.resolve("pom.xml").toFile(), pomModel);
+            writeExtensionsFile(projectDir);
+            writeExtensionConfigFile(projectDir, new Configuration() {{
+                refs.list.add(createVersionDescription(BRANCH, "${describe.tag}${describe.distance.snapshot}"));
+            }});
+
+            // When
+            Verifier verifier = getVerifier(projectDir);
+            verifier.executeGoal("verify");
+
+            // Then
+            String expectedVersion = "2.0.4-SNAPSHOT";
+            Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
+            assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
+
+            verifier.verifyErrorFreeLog();
+            verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
+        }
     }
 
     @Test

From 8f4be64da353f24c57508e44c589cabdc237b200 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Thu, 25 Apr 2024 13:20:13 +0200
Subject: [PATCH 112/140] build(release): bump version to 9.8.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ccaa8a47..3683bb98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.7.0</version>
+    <version>9.8.0</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>

From 040419b3ff43d3e64b736f4b9426a30fe0afabd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 12:01:24 +0000
Subject: [PATCH 113/140] build(deps): bump
 org.apache.maven.plugins:maven-plugin-plugin

Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.12.0 to 3.13.1.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.12.0...maven-plugin-tools-3.13.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-plugin-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3683bb98..2a6a1bfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
                 <configuration>
                     <goalPrefix>${project.name}</goalPrefix>
                 </configuration>
-                <version>3.12.0</version>
+                <version>3.13.1</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.plexus</groupId>

From d52aa2fb90a59ea6ed7df2b292b2964a9ca459a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 12:01:31 +0000
Subject: [PATCH 114/140] build(deps): bump
 org.apache.maven.plugin-tools:maven-plugin-annotations

Bumps [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.12.0 to 3.13.1.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.12.0...maven-plugin-tools-3.13.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3683bb98..360acbf6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.12.0</version>
+            <version>3.13.1</version>
             <scope>provided</scope>
         </dependency>
 

From e21ac6d2202da93366843a92ab2a90f6cbb52b53 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 12:19:47 +0000
Subject: [PATCH 115/140] build(deps): bump org.apache.maven:maven-plugin-api
 from 3.9.6 to 3.9.8

Bumps [org.apache.maven:maven-plugin-api](https://github.com/apache/maven) from 3.9.6 to 3.9.8.
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.9.6...maven-3.9.8)

---
updated-dependencies:
- dependency-name: org.apache.maven:maven-plugin-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3683bb98..38b4fb12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>3.9.6</version>
+            <version>3.9.8</version>
             <scope>provided</scope>
         </dependency>
 

From 311901049441be00a6d697ebfe384dbd0e28ace1 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Thu, 4 Jul 2024 08:32:55 +0200
Subject: [PATCH 116/140] refactor: replace commons-lang

---
 pom.xml                                                         | 2 +-
 .../qoomon/maven/gitversioning/GitVersioningModelProcessor.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3683bb98..173a4c49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.8.0</version>
+    <version>9.8.1</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index af08645b..28c90f98 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -53,7 +53,7 @@
 import static me.qoomon.maven.gitversioning.BuildProperties.projectArtifactId;
 import static me.qoomon.maven.gitversioning.GitVersioningMojo.asPlugin;
 import static me.qoomon.maven.gitversioning.MavenUtil.*;
-import static org.apache.commons.lang3.StringUtils.leftPad;
+import static org.apache.maven.shared.utils.StringUtils.leftPad;
 import static org.apache.maven.shared.utils.StringUtils.repeat;
 import static org.apache.maven.shared.utils.StringUtils.rightPad;
 import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;

From 92096e4596de8dc39de8e3a78724146afe4c6122 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Thu, 4 Jul 2024 08:37:54 +0200
Subject: [PATCH 117/140] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 671b15a6..3d8c2d1a 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ create or update `${rootProjectDir}/.mvn/extensions.xml` file
     <extension>
         <groupId>me.qoomon</groupId>
         <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.6.6</version>
+        <version>9.8.1</version>
     </extension>
 
 </extensions>

From e9ce70525219da3996d93ff9fb7d12da272e8637 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Thu, 4 Jul 2024 09:33:03 +0200
Subject: [PATCH 118/140] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 173a4c49..4182191f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     <developers>
         <developer>
             <name>Bengt Brodersen</name>
-            <url>https://qoomon.me</url>
+            <url>https://github.com/qoomon</url>
             <roles>
                 <role>project creator</role>
             </roles>

From 5cf41b0b23ef6d8a9f12aa6665778a872a763129 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 12:50:26 +0000
Subject: [PATCH 119/140] build(deps): bump
 com.fasterxml.jackson.dataformat:jackson-dataformat-xml

Bumps [com.fasterxml.jackson.dataformat:jackson-dataformat-xml](https://github.com/FasterXML/jackson-dataformat-xml) from 2.17.0 to 2.17.2.
- [Commits](https://github.com/FasterXML/jackson-dataformat-xml/compare/jackson-dataformat-xml-2.17.0...jackson-dataformat-xml-2.17.2)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-xml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4182191f..0062699b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
-            <version>2.17.0</version>
+            <version>2.17.2</version>
         </dependency>
 
         <dependency>

From 0c22bdf45bf5f2f4201a470e1c2d24537dc4cad7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 12:13:04 +0000
Subject: [PATCH 120/140] build(deps-dev): bump org.assertj:assertj-core from
 3.25.3 to 3.26.3

Bumps [org.assertj:assertj-core](https://github.com/assertj/assertj) from 3.25.3 to 3.26.3.
- [Release notes](https://github.com/assertj/assertj/releases)
- [Commits](https://github.com/assertj/assertj/compare/assertj-build-3.25.3...assertj-build-3.26.3)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4182191f..018ece05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.25.3</version>
+            <version>3.26.3</version>
             <scope>test</scope>
         </dependency>
 

From 9b1b0ee3ed6fa94478910daf8c494a4c83f797c2 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Thu, 11 Jul 2024 13:23:45 +0200
Subject: [PATCH 121/140] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3d8c2d1a..d6415d30 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ This extension can virtually set project version and properties, based on curren
 
 #### Requirements
 * ⚠️ minimal required java version is `11`
-* ⚠️ minimal required maven version is `3.6.3`
+* ⚠️ minimal required maven version is `3.6.4`
 
 ## Usage
 

From bba8ed41e4a610f1ef8f0d2eeee1f0a35fd25a31 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 12:14:15 +0000
Subject: [PATCH 122/140] build(deps): bump org.eclipse.jgit:org.eclipse.jgit

Bumps org.eclipse.jgit:org.eclipse.jgit from 6.9.0.202403050737-r to 6.10.0.202406032230-r.

---
updated-dependencies:
- dependency-name: org.eclipse.jgit:org.eclipse.jgit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 18e93cb1..96c6a733 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit</artifactId>
-            <version>6.9.0.202403050737-r</version>
+            <version>6.10.0.202406032230-r</version>
         </dependency>
 
         <dependency>

From 0c0be3dc7965eaa975931f83f4d0da2759e5e7ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Jul 2024 12:14:30 +0000
Subject: [PATCH 123/140] build(deps): bump
 org.sonatype.plugins:nexus-staging-maven-plugin

Bumps org.sonatype.plugins:nexus-staging-maven-plugin from 1.6.13 to 1.7.0.

---
updated-dependencies:
- dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 18e93cb1..7efb6dba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -250,7 +250,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.13</version>
+                        <version>1.7.0</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>sonatype-nexus-staging</serverId>

From bb575b84a5e6f7c51f7f1b8e6874e25456b49ae4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 12:25:39 +0000
Subject: [PATCH 124/140] build(deps): bump
 org.apache.maven.plugins:maven-javadoc-plugin

Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.3 to 3.8.0.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.6.3...maven-javadoc-plugin-3.8.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-javadoc-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 18e93cb1..6bfbd50f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.6.3</version>
+                        <version>3.8.0</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>

From 80f96a55a7bda587973bfecb9ea9f9b8d38dd0e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 12:20:35 +0000
Subject: [PATCH 125/140] build(deps): bump
 org.apache.maven.plugins:maven-failsafe-plugin

Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.2.5 to 3.4.0.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.2.5...surefire-3.4.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 18e93cb1..6fafd1ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,7 +163,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.2.5</version>
+                <version>3.4.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

From 179187622e782b5e2ee93580dc4b4e9500cf1027 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 12:20:48 +0000
Subject: [PATCH 126/140] build(deps): bump org.apache.maven:maven-core from
 3.9.6 to 3.9.9

Bumps [org.apache.maven:maven-core](https://github.com/apache/maven) from 3.9.6 to 3.9.9.
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.9.6...maven-3.9.9)

---
updated-dependencies:
- dependency-name: org.apache.maven:maven-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 18e93cb1..2af9c4e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.9.6</version>
+            <version>3.9.9</version>
             <scope>provided</scope>
         </dependency>
 

From 0c1f9faebb647dbef25ae3eaa91409bd272820e1 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Mon, 19 Aug 2024 16:40:08 +0200
Subject: [PATCH 127/140] Update build.yml

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 24c91ff2..acb2d1cd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,8 +7,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v2
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: adopt

From 437f33bf6ccfab9d3439e735990a30608bd5e831 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Mon, 19 Aug 2024 16:43:37 +0200
Subject: [PATCH 128/140] Update build.yml

---
 .github/workflows/build.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index acb2d1cd..bba628e3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,9 +3,10 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
+    env:
+      MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+      MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version"
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
@@ -23,6 +24,4 @@ jobs:
         mvn ${MAVEN_CLI_OPTS} install -DskipTests
         mvn ${MAVEN_CLI_OPTS} failsafe:integration-test failsafe:verify
     
-    env:
-      MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
-      MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version"
+    

From bcdf6b20d053417c0e54d5a2d6cca20b91e394a8 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Mon, 19 Aug 2024 16:59:14 +0200
Subject: [PATCH 129/140] fix dependencies

---
 README.md |  2 +-
 pom.xml   | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/README.md b/README.md
index d6415d30..8b2a4af8 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ This extension can virtually set project version and properties, based on curren
     * git merge conflicts
 
 #### Requirements
-* ⚠️ minimal required java version is `11`
+[* ⚠️ minimal required java version is `11`]()
 * ⚠️ minimal required maven version is `3.6.4`
 
 ## Usage
diff --git a/pom.xml b/pom.xml
index fa485c4e..fc6816bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,18 +143,6 @@
                 </configuration>
                 <version>3.13.1</version>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-component-metadata</artifactId>
-                <version>2.2.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate-metadata</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

From 0d86c93416b029fac00f3a9ecd5485d8be4251b5 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Mon, 19 Aug 2024 17:43:39 +0200
Subject: [PATCH 130/140] Update pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fc6816bb..9e01344f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.8.1</version>
+    <version>9.8.2</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>

From 92e7f0b3a4cf935ee9cb5cf42165ea4b8c399cc3 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Mon, 19 Aug 2024 17:45:09 +0200
Subject: [PATCH 131/140] Update build.yml

---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bba628e3..3cdc59b2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,12 +16,12 @@ jobs:
         cache: maven
     - name: Build with Maven
       run: |
-        mvn ${MAVEN_CLI_OPTS} package -DskipTests
+        ./mvnw ${MAVEN_CLI_OPTS} package -DskipTests
     - name: Test with Maven
       run: |
         unset GITHUB_ACTIONS
-        mvn ${MAVEN_CLI_OPTS} test
-        mvn ${MAVEN_CLI_OPTS} install -DskipTests
-        mvn ${MAVEN_CLI_OPTS} failsafe:integration-test failsafe:verify
+        ./mvnw ${MAVEN_CLI_OPTS} test
+        ./mvnw ${MAVEN_CLI_OPTS} install -DskipTests
+        ./mvnw ${MAVEN_CLI_OPTS} failsafe:integration-test failsafe:verify
     
     

From fc1d45f281bc3b935772158d5e5db521028e4b98 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Mon, 19 Aug 2024 17:50:07 +0200
Subject: [PATCH 132/140] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3cdc59b2..d45429e4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+      # MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
       MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version"
     steps:
     - uses: actions/checkout@v4

From c61f75370e121b6de1dd61968593df26608265db Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Mon, 19 Aug 2024 18:17:40 +0200
Subject: [PATCH 133/140] tests: fix tests

---
 .github/workflows/build.yml                   |   2 +-
 .mvn/wrapper/maven-wrapper.properties         |   2 +-
 pom.xml                                       |   3 +-
 .../GitVersioningExtensionIT.java             | 112 +++++++++++++-----
 4 files changed, 84 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d45429e4..3cdc59b2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      # MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+      MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
       MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version"
     steps:
     - uses: actions/checkout@v4
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 6686a643..4b40fcfd 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
diff --git a/pom.xml b/pom.xml
index 9e01344f..f63ad8df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,8 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>3.9.9</version>
+            <!-- BREAKING CHANGE in https://maven.apache.org/docs/3.9.8/release-notes.html -->
+            <version>3.9.7</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
index be9b7b87..8ef08619 100644
--- a/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
+++ b/src/test/java/me/qoomon/maven/gitversioning/GitVersioningExtensionIT.java
@@ -55,10 +55,11 @@ void noGitVersioning() throws Exception {
 
         // When
         Verifier verifier = getVerifier(projectDir);
-        verifier.displayStreamBuffers();
-        verifier.executeGoal("verify");
+        verifier.addCliArgument("verify");
+        verifier.execute();
 
         // Then
+        System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
         verifier.verifyErrorFreeLog();
         String expectedVersion = "0.0.0";
         verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -82,12 +83,13 @@ void disableVersioning_cliOption() throws Exception {
             writeExtensionConfigFile(projectDir, new Configuration());
 
             // When
-            Verifier verifier = new Verifier(projectDir.toFile().getAbsolutePath()) {{
-                addCliOption("-Dversioning.disable");
-            }};
-            verifier.executeGoal("verify");
+            Verifier verifier = getVerifier(projectDir);
+            verifier.addCliArgument("-Dversioning.disable");
+            verifier.addCliArguments("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             verifier.verifyTextInLog("skip - versioning is disabled by command option");
             String expectedVersion = pomModel.getVersion();
@@ -109,9 +111,11 @@ void revVersioning_noCommit() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "0000000000000000000000000000000000000000";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -136,9 +140,11 @@ void revVersioning() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = givenCommit.getName();
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -163,9 +169,11 @@ void branchVersioning() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "feature-test-gitVersioning";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -193,9 +201,11 @@ void tagVersioning_atBranch() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "v1.0.0-gitVersioning";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -224,9 +234,11 @@ void tagVersioning_detachedHead() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "v1.0.0-gitVersioning";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -255,9 +267,11 @@ void tagVersioning_lightweightTag_atBranch() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "v1.0.0-gitVersioning";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -285,9 +299,11 @@ void tagVersioning_considerTagsOnlyIfHeadIsDetached() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "master-gitVersioning";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -315,9 +331,11 @@ void tagVersioning_environmentVariable() throws Exception {
             Verifier verifier = new Verifier(projectDir.toFile().getAbsolutePath()) {{
                 setEnvironmentVariable("VERSIONING_GIT_BRANCH", "v1.0.0");
             }};
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "v1.0.0-gitVersioning";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -380,9 +398,11 @@ void revVersioning_multiModuleProject() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "master-SNAPSHOT";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -439,9 +459,11 @@ void revVersioning_multiModuleProject_ambiguous_artifactId() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "master-SNAPSHOT";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -483,9 +505,11 @@ void branchVersioning_multiModuleProject_noParent() throws Exception {
 
             // When
             Verifier verifier = getVerifier(logicProjectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "feature-test-gitVersioning";
             verifier.verifyTextInLog("Building " + logicPomModel.getArtifactId() + " " + expectedVersion);
@@ -539,9 +563,11 @@ void branchVersioning_multiModuleProject_withExternalParent() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "feature-test-gitVersioning";
             verifier.verifyTextInLog("Building " + logicPomModel.getArtifactId() + " " + expectedVersion);
@@ -593,9 +619,11 @@ void branchVersioning_multiModuleProject_withAggregationAndParent() throws Excep
 
             // When
             Verifier verifier = getVerifier(logicProjectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "feature-test-gitVersioning";
             verifier.verifyTextInLog("Building " + logicPomModel.getArtifactId() + " " + expectedVersion);
@@ -651,9 +679,11 @@ void dependencyUpdates_multiModuleProject() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "test-gitVersioning";
             verifier.verifyTextInLog("Building " + logicPomModel.getArtifactId() + " " + expectedVersion);
@@ -683,9 +713,11 @@ void branchVersioning_WithBuildTime() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + "-gitVersioning";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -708,9 +740,11 @@ void apply_emptyRepoGivesExpectedPlusDistanceResult() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "0";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -719,7 +753,7 @@ void apply_emptyRepoGivesExpectedPlusDistanceResult() throws Exception {
             assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
         }
 
-     }
+    }
 
     @Test
     void apply_singleCommitUntaggedRepoGivesExpectedPlusDistanceResult() throws Exception {
@@ -735,9 +769,11 @@ void apply_singleCommitUntaggedRepoGivesExpectedPlusDistanceResult() throws Exce
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "1";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -746,7 +782,7 @@ void apply_singleCommitUntaggedRepoGivesExpectedPlusDistanceResult() throws Exce
             assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
         }
 
-     }
+    }
 
     @Test
     void apply_NoCommitsSinceLastTagGivesExpectedPlusDistanceResult() throws Exception {
@@ -765,9 +801,11 @@ void apply_NoCommitsSinceLastTagGivesExpectedPlusDistanceResult() throws Excepti
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "677";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -776,7 +814,7 @@ void apply_NoCommitsSinceLastTagGivesExpectedPlusDistanceResult() throws Excepti
             assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
         }
 
-     }
+    }
 
     @Test
     void apply_TwoCommitsSinceLastTagGivesExpectedPlusDistanceResult() throws Exception {
@@ -797,9 +835,11 @@ void apply_TwoCommitsSinceLastTagGivesExpectedPlusDistanceResult() throws Except
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "679";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -824,9 +864,11 @@ void apply_DescribeDistanceSnapshotRelease() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             String expectedVersion = "2.0.4";
             Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
             assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
@@ -852,9 +894,11 @@ void apply_DescribeDistanceSnapshot() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             String expectedVersion = "2.0.4-SNAPSHOT";
             Model gitVersionedPomModel = readModel(projectDir.resolve(GIT_VERSIONING_POM_NAME).toFile());
             assertThat(gitVersionedPomModel.getVersion()).isEqualTo(expectedVersion);
@@ -900,9 +944,11 @@ private void apply_TagOnMerged(final boolean firstParent) throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = firstParent ? tagOnMaster : tagOnBranch;
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);
@@ -929,9 +975,11 @@ void apply_UseDescribeTagVersionLabel() throws Exception {
 
             // When
             Verifier verifier = getVerifier(projectDir);
-            verifier.executeGoal("verify");
+            verifier.addCliArgument("verify");
+            verifier.execute();
 
             // Then
+            System.err.println(String.join("\n", verifier.loadFile(verifier.getBasedir(), verifier.getLogFileName(), false)));
             verifier.verifyErrorFreeLog();
             String expectedVersion = "label";
             verifier.verifyTextInLog("Building " + pomModel.getArtifactId() + " " + expectedVersion);

From a7bc127e5699e0b8795fb060f0b10446c8852a59 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Aug 2024 12:11:27 +0000
Subject: [PATCH 134/140] build(deps): bump
 org.apache.maven.plugin-tools:maven-plugin-annotations

Bumps [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.13.1 to 3.15.0.
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.13.1...maven-plugin-tools-3.15.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f63ad8df..03b12438 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.13.1</version>
+            <version>3.15.0</version>
             <scope>provided</scope>
         </dependency>
 

From 56837281143bbf3cb55bf4bf926eb75aee44a069 Mon Sep 17 00:00:00 2001
From: Ivan Grund 601625 <ivan.grund@o2.sk>
Date: Mon, 14 Oct 2024 18:31:09 +0200
Subject: [PATCH 135/140] feat(StringUtil): implement format placeholders
 closer to _posix parameter expansion_ - i.e. implement optional colon

---
 README.md                                                 | 8 ++++----
 .../java/me/qoomon/gitversioning/commons/StringUtil.java  | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 8b2a4af8..3e3783eb 100644
--- a/README.md
+++ b/README.md
@@ -156,11 +156,11 @@ You can configure the version and properties adjustments for specific branches a
 
 ℹ Final `version` will be slugified automatically, so no need to use `${….slug}` placeholders in `<version>` format.
 
-ℹ define placeholder default value (placeholder is not defined) like this `${name:-DEFAULT_VALUE}`<br>
-e.g `${env.BUILD_NUMBER:-0}` or `${env.BUILD_NUMBER:-local}`
+ℹ define placeholder default value (placeholder is not defined '-' or empty ':-') like this `${name:-DEFAULT_VALUE}`<br>
+e.g `${env.BUILD_NUMBER-0}` or `${env.BUILD_NUMBER:-local}`
 
-ℹ define placeholder overwrite value (placeholder is defined) like this `${name:+OVERWRITE_VALUE}`<br>
-e.g `${dirty:-SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
+ℹ define placeholder overwrite value (placeholder is defined '+' and non-empty ':+' ) like this `${name:+OVERWRITE_VALUE}`<br>
+e.g `${dirty:+SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
 
 ###### Placeholders
 
diff --git a/src/main/java/me/qoomon/gitversioning/commons/StringUtil.java b/src/main/java/me/qoomon/gitversioning/commons/StringUtil.java
index fda329d3..f4a1a5e1 100644
--- a/src/main/java/me/qoomon/gitversioning/commons/StringUtil.java
+++ b/src/main/java/me/qoomon/gitversioning/commons/StringUtil.java
@@ -12,7 +12,7 @@ public final class StringUtil {
 
     public static String substituteText(String text, Map<String, Supplier<String>> replacements) {
         StringBuffer result = new StringBuffer();
-        Pattern placeholderPattern = Pattern.compile("\\$\\{(?<key>[^}:]+)(?::(?<modifier>[-+])(?<value>[^}]*))?}");
+        Pattern placeholderPattern = Pattern.compile("\\$\\{(?<key>[^}:]+)(?<modifier>:?[-+])?(?<value>[^}]*)?}");
         Matcher placeholderMatcher = placeholderPattern.matcher(text);
         while (placeholderMatcher.find()) {
             String placeholderKey = placeholderMatcher.group("key");
@@ -26,6 +26,12 @@ public static String substituteText(String text, Map<String, Supplier<String>> r
                 if (placeholderModifier.equals("+") && replacement != null) {
                     replacement = placeholderMatcher.group("value");
                 }
+                if (placeholderModifier.equals(":-") && (replacement == null || replacement.isEmpty())) {
+                    replacement = placeholderMatcher.group("value");
+                }
+                if (placeholderModifier.equals(":+") && replacement != null && !replacement.isEmpty()) {
+                    replacement = placeholderMatcher.group("value");
+                }
             }
             if (replacement != null) {
                 // avoid group name replacement behaviour of replacement parameter value

From 9d78b19a81f7c2e3f29576dea0ea16bee7c03acc Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Wed, 23 Oct 2024 09:19:03 +0200
Subject: [PATCH 136/140] build(release): bump version to 3.7.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 03b12438..77d454a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.8.2</version>
+    <version>9.9.0</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>

From 7721aa1f6ca23c983e86f36506423aac11c7f84e Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Thu, 24 Oct 2024 11:51:57 +0200
Subject: [PATCH 137/140] feat: add ...timestamp.iso placeholder

---
 README.md                                                   | 2 ++
 pom.xml                                                     | 2 +-
 .../maven/gitversioning/GitVersioningModelProcessor.java    | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3e3783eb..edf41e3b 100644
--- a/README.md
+++ b/README.md
@@ -221,6 +221,7 @@ e.g `${dirty:+SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
 - `${commit.timestamp.minute}` commit minute of hour e.g. '59'
 - `${commit.timestamp.second}` commit second of minute e.g. '30'
 - `${commit.timestamp.datetime}` commit timestamp formatted as `yyyyMMdd.HHmmss`e.g. '20190616.161442'
+- `${commit.timestamp.iso}` commit timestamp formatted as `yyyy-MM-ddTHH:mm:ssZ`e.g. '2019-06-16T16:14:42Z'
       <br><br>
 
 - `${build.timestamp}` maven-build-timestamp (epoch seconds) e.g. '1560694278'
@@ -232,6 +233,7 @@ e.g `${dirty:+SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
 - `${build.timestamp.minute}` maven-build-timestamp minute of hour e.g. '59'
 - `${build.timestamp.second}` maven-build-timestamp second of minute e.g. '30'
 - `${build.timestamp.datetime}` maven-build-timestamp formatted as `yyyyMMdd.HHmmss`e.g. '20190616.161442'
+- `${build.timestamp.iso}` commit timestamp formatted as `yyyy-MM-ddTHH:mm:ssZ`e.g. '2019-06-16T16:14:42Z'
      <br><br>
 
 - `${describe}` Will resolve to `git describe` output
diff --git a/pom.xml b/pom.xml
index 77d454a4..d168c557 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>me.qoomon</groupId>
     <artifactId>maven-git-versioning-extension</artifactId>
-    <version>9.9.0</version>
+    <version>9.10.0</version>
     <packaging>maven-plugin</packaging>
 
     <name>Maven Git Versioning Extension</name>
diff --git a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
index 28c90f98..b4f2b731 100644
--- a/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
+++ b/src/main/java/me/qoomon/maven/gitversioning/GitVersioningModelProcessor.java
@@ -900,7 +900,9 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
         placeholderMap.put("commit.timestamp.minute", Lazy.by(() -> leftPad(String.valueOf(headCommitDateTime.get().getMinute()), 2, "0")));
         placeholderMap.put("commit.timestamp.second", Lazy.by(() -> leftPad(String.valueOf(headCommitDateTime.get().getSecond()), 2, "0")));
         placeholderMap.put("commit.timestamp.datetime", Lazy.by(() -> headCommitDateTime.get().toEpochSecond() > 0
-                ? headCommitDateTime.get().format(DateTimeFormatter.ofPattern("yyyyMMdd.HHmmss")) : "00000000.000000"));
+                ? headCommitDateTime.get().format(DateTimeFormatter.ofPattern("yyyyMMdd.HHmmss")) : "00000101.000000"));
+        placeholderMap.put("commit.timestamp.iso", Lazy.by(() -> headCommitDateTime.get().toEpochSecond() > 0
+                ? headCommitDateTime.get().format(DateTimeFormatter.ISO_INSTANT) : "0000-01-01T00:00:00Z"));
 
         final Lazy<ZonedDateTime> buildCommitDateTime = Lazy.by(() -> mavenSession.getStartTime().toInstant().atZone(ZoneId.systemDefault()));
         placeholderMap.put("build.timestamp", Lazy.by(() -> String.valueOf(buildCommitDateTime.get().toEpochSecond())));
@@ -913,6 +915,8 @@ private Map<String, Supplier<String>> generateGlobalFormatPlaceholderMap(GitSitu
         placeholderMap.put("build.timestamp.second", Lazy.by(() -> leftPad(String.valueOf(buildCommitDateTime.get().getSecond()), 2, "0")));
         placeholderMap.put("build.timestamp.datetime", Lazy.by(() -> buildCommitDateTime.get().toEpochSecond() > 0
                 ? buildCommitDateTime.get().format(DateTimeFormatter.ofPattern("yyyyMMdd.HHmmss")) : "00000000.000000"));
+        placeholderMap.put("build.timestamp.iso", Lazy.by(() -> buildCommitDateTime.get().toEpochSecond() > 0
+                ? headCommitDateTime.get().format(DateTimeFormatter.ISO_INSTANT) : "0000-01-01T00:00:00Z"));
 
         final String refName = gitVersionDetails.getRefName();
         final Lazy<String> refNameSlug = Lazy.by(() -> slugify(refName));

From a04583db87e12d36935704532b13b00b15ac4a41 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Fri, 15 Nov 2024 18:01:27 +0100
Subject: [PATCH 138/140] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index edf41e3b..ab16bfab 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Maven Git Versioning Extension [![Sparkline](https://stars.medv.io/qoomon/maven-git-versioning-extension.svg?)](https://stars.medv.io/qoomon/maven-git-versioning-extension)
+# Maven Git Versioning Extension [![starline](https://github-starline.vercel.app/qoomon/maven-git-versioning-extension)](https://github.com/qoomon/starline)
 
 [![Maven Central](https://img.shields.io/maven-central/v/me.qoomon/maven-git-versioning-extension.svg)](https://search.maven.org/artifact/me.qoomon/maven-git-versioning-extension)
 [![Changelog](https://badgen.net/badge/changelog/%E2%98%85/blue)](CHANGELOG.md)

From 86acfc9a0a2ce1951ab8d79339734189da3d2735 Mon Sep 17 00:00:00 2001
From: Bengt Brodersen <bengt.brodersen@gmail.com>
Date: Wed, 20 Nov 2024 16:39:18 +0100
Subject: [PATCH 139/140] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ab16bfab..e8db3a81 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Maven Git Versioning Extension [![starline](https://github-starline.vercel.app/qoomon/maven-git-versioning-extension)](https://github.com/qoomon/starline)
+# Maven Git Versioning Extension [![starline](https://starlines.qoo.monster/assets/qoomon/maven-git-versioning-extension)](https://github.com/qoomon/starlines)
 
 [![Maven Central](https://img.shields.io/maven-central/v/me.qoomon/maven-git-versioning-extension.svg)](https://search.maven.org/artifact/me.qoomon/maven-git-versioning-extension)
 [![Changelog](https://badgen.net/badge/changelog/%E2%98%85/blue)](CHANGELOG.md)

From 449345744acc05212a9e61da4e27f23514dfa078 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@users.noreply.github.com>
Date: Fri, 21 Feb 2025 01:32:36 +0000
Subject: [PATCH 140/140] Merge upstream

---
 .github/workflows/build.yml           |  27 --
 .github/workflows/codeql-analysis.yml |  54 ----
 README.md                             | 400 --------------------------
 3 files changed, 481 deletions(-)
 delete mode 100644 .github/workflows/build.yml
 delete mode 100644 .github/workflows/codeql-analysis.yml
 delete mode 100644 README.md

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 3cdc59b2..00000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Build
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    env:
-      MAVEN_OPTS: "-Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
-      MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version"
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
-      with:
-        java-version: 11
-        distribution: adopt
-        cache: maven
-    - name: Build with Maven
-      run: |
-        ./mvnw ${MAVEN_CLI_OPTS} package -DskipTests
-    - name: Test with Maven
-      run: |
-        unset GITHUB_ACTIONS
-        ./mvnw ${MAVEN_CLI_OPTS} test
-        ./mvnw ${MAVEN_CLI_OPTS} install -DskipTests
-        ./mvnw ${MAVEN_CLI_OPTS} failsafe:integration-test failsafe:verify
-    
-    
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
deleted file mode 100644
index bf74a873..00000000
--- a/.github/workflows/codeql-analysis.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [master, ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
-  schedule:
-    - cron: '0 4 * * 3'
-
-jobs:
-  analyse:
-    name: Analyse
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      # Override language selection by uncommenting this and choosing your languages
-      # with:
-      #   languages: go, javascript, csharp, python, cpp, java
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
diff --git a/README.md b/README.md
deleted file mode 100644
index e8db3a81..00000000
--- a/README.md
+++ /dev/null
@@ -1,400 +0,0 @@
-# Maven Git Versioning Extension [![starline](https://starlines.qoo.monster/assets/qoomon/maven-git-versioning-extension)](https://github.com/qoomon/starlines)
-
-[![Maven Central](https://img.shields.io/maven-central/v/me.qoomon/maven-git-versioning-extension.svg)](https://search.maven.org/artifact/me.qoomon/maven-git-versioning-extension)
-[![Changelog](https://badgen.net/badge/changelog/%E2%98%85/blue)](CHANGELOG.md)
-[![Build Workflow](https://github.com/qoomon/maven-git-versioning-extension/workflows/Build/badge.svg)](https://github.com/qoomon/maven-git-versioning-extension/actions?query=workflow%3ABuild)
-[![LGTM Grade](https://img.shields.io/lgtm/grade/java/github/qoomon/maven-git-versioning-extension)](https://lgtm.com/projects/g/qoomon/maven-git-versioning-extension)
-
-**ℹ Also available as [Gradle Plugin](https://github.com/qoomon/gradle-git-versioning-plugin)**
-
-![Example](docs/MavenGitVersioningExtension.png)
-
-This extension can virtually set project version and properties, based on current **Git status**
-
-ℹ **No POM files will be modified, version and properties are modified in memory only**
-
-* Get rid of…
-    * Maven Release Plugin; see [Maven Release Plugin: The Final Nail in the Coffin](https://axelfontaine.com/blog/final-nail.html)
-    * editing `pom.xml`
-    * managing project versions within files and Git tags
-    * git merge conflicts
-
-#### Requirements
-[* ⚠️ minimal required java version is `11`]()
-* ⚠️ minimal required maven version is `3.6.4`
-
-## Usage
-
-⚠️ If you're using **IntelliJ** have a look at [IntelliJ Setup Instructions](#intellij---multi-modules-projects)
-
-### Add Extension to Maven Project
-
-create or update `${rootProjectDir}/.mvn/extensions.xml` file
-
-```xml
-
-<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
-
-    <extension>
-        <groupId>me.qoomon</groupId>
-        <artifactId>maven-git-versioning-extension</artifactId>
-        <version>9.8.1</version>
-    </extension>
-
-</extensions>
-```
-
-### Configure Extension
-
-ℹ Consider [CI/CD](#cicd-setup) section when running this extension in a CI/CD environment
-
-Create `${rootProjectDir}/.mvn/maven-git-versioning-extension.xml`.
-
-You can configure the version and properties adjustments for specific branches and tags.
-
-**Example:** `maven-git-versioning-extension.xml`
-
-```xml
-<configuration xmlns="https://github.com/qoomon/maven-git-versioning-extension"
-               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>.+</pattern>
-            <version>${ref}-SNAPSHOT</version>
-            <properties>
-                <foo>${ref}</foo>
-            </properties>
-        </ref>
-
-        <ref type="tag">
-            <pattern><![CDATA[v(?<version>.*)]]></pattern>
-            <version>${ref.version}</version>
-        </ref>
-    </refs>
-
-    <!-- optional fallback configuration in case of no matching ref configuration-->
-    <rev>
-        <version>${commit}</version>
-    </rev>
-
-</configuration>
-```
-
-### Configuration Elements
-
-- `<disable>` global disable(`true`)/enable(`false`) extension, default is `false`.
-    - Can be overridden by command option, see [Parameters & Environment Variables](#parameters--environment-variables).
-
-- `<projectVersionPattern>` An arbitrary regex to match project version, matching groups can be used as [Format Placeholders](#format-placeholders) (has to be a **full match pattern**)
-- `<describeTagPattern>` An arbitrary regex to match tag names for git describe command
-  - has to be a **full match pattern** e.g. `v(.+)`, default is `.*`
-- `<describeTagFirstParent>` Enable(`true`) or disable(`false`) following only the first parent in a merge commit
-  - default is `true`
-
-- `<updatePom>` Enable(`true`)/disable(`false`) version and properties update in original pom file, default is `false`
-  - Can be overridden by command option, see [Parameters & Environment Variables](#parameters--environment-variables).
-
-- `<refs considerTagsOnBranches="BOOLEAN">` List of ref configurations, ordered by priority. First matching
-  configuration will be used.
-    - `considerTagsOnBranches` By default, tags pointing at current commit will be ignored if HEAD is attached to a branch. 
-     - If this option is `true` tags will always be taken into account.
-       <br><br>
-
-    - `<ref type="TYPE">` specific ref patch definition.
-      - *required* `type` Ref type indicates which kind of ref will be matched against `pattern`, can be `branch` or `tag`
-      - `<pattern>` An arbitrary regex to match ref names
-        - has to be a **full match pattern** e.g. `main` or `feature/.+`
-          <br><br>
-
-      - `<describeTagPattern>` An arbitrary regex to match tag names for git describe command
-        - has to be a **full match pattern** e.g. `v.+`)
-        - will override global `<describeTagPattern>` value
-      - `<describeTagFirstParent>` Enable(`true`) or disable(`false`) following only the first parent in a merge commit
-        - default is `true`
-          <br><br>
-        
-      - `<version>` The new version format, see [Format Placeholders](#format-placeholders)
-      - `<properties>`
-        - `<name>value</name>` A property definition to update the value of a property.
-          - `<name>` The property name
-          - `value` The new value format of the property, see [Format Placeholders](#format-placeholders)
-            <br><br>
-
-      - `<userProperties>`
-        - `<name>value</name>` A property definition to add a user property to the maven session, active during the build. UserProperties with the same name of a property in the pom or this configuration file will take precedence as that is how maven handles user properties.
-          - `<name>` The property name
-          - `value` The new value format of the property, see [Format Placeholders](#format-placeholders)
-        ```xml
-        <userProperties>
-            <test.property>${ref}</test.property>
-        </userProperties>
-        ```
-      
-      - `<updatePom>` Enable(`true`) or disable(`false`) version and properties update in original pom file
-        - will override global `<updatePom>` value
-
-
-- `<rev>` Rev configuration will be used if no ref configuration is matching current git situation.
-    - same as `<ref>` configuration, except `type` attribute and `<pattern>` element.
-
-- `<relatedProjects>` Add external projects as related project to update their versions as well.
-   ```xml
-   <relatedProjects>
-       <project>
-           <groupId>me.qoomon</groupId>
-           <artifactId>base</artifactId>
-       </project>
-   </relatedProjects>
-   ```
-
-### Format Placeholders
-
-ℹ `….slug` placeholders means all `/` characters will be replaced by `-`.
-
-ℹ Final `version` will be slugified automatically, so no need to use `${….slug}` placeholders in `<version>` format.
-
-ℹ define placeholder default value (placeholder is not defined '-' or empty ':-') like this `${name:-DEFAULT_VALUE}`<br>
-e.g `${env.BUILD_NUMBER-0}` or `${env.BUILD_NUMBER:-local}`
-
-ℹ define placeholder overwrite value (placeholder is defined '+' and non-empty ':+' ) like this `${name:+OVERWRITE_VALUE}`<br>
-e.g `${dirty:+SNAPSHOT}` resolves to `-SNAPSHOT` instead of `-DIRTY`
-
-###### Placeholders
-
-- `${env.VARIABLE}` Value of environment variable `VARIABLE`
-- `${property.name}` Value of commandline property `-Dname=value`
-      <br><br>
-
-- `${version}` `<version>` set in `pom.xml` e.g. '1.2.3-SNAPSHOT'
-  - `${version.core}` the core version component of `${version}` e.g. '1.2.3'
-  - `${version.major}` the major version component of `${version}` e.g. '1'
-    - `${version.major.next}` the `${version.major}` increased by 1 e.g. '2'
-  - `${version.minor}` the minor version component of `${version}` e.g. '2'
-    - `${version.minor.next}` the `${version.minor}` increased by 1 e.g. '3'
-  - `${version.patch}` the patch version component of `${version}` e.g. '3'
-    - `${version.patch.next}` the `${version.patch}` increased by 1 e.g. '4'
-  - `${version.label}` the version label of `${version}` e.g. 'SNAPSHOT'
-    - `${version.label.prefixed}` like `${version.label}` with label separator e.g. '-SNAPSHOT'
-- Project Version Pattern Groups
-  - Content of regex groups in `<projectVersionPattern>` can be addressed like this:
-  - `${version.GROUP_NAME}`
-  - `${version.GROUP_INDEX}`
-  - Named Group Example
-      ```xml
-      <configuration>
-        <projectVersionPattern><![CDATA[^.+-(?<environment>.+)-SNAPSHOT$]]></projectVersionPattern>
-    
-        <refs>
-          <ref type="branch">
-            <version>${version.environment}-SNAPSHOT</version>
-          </ref>
-        </refs>
-      </configuration>
-      ```
-      <br>
-
-- `${ref}` `${ref.slug}` ref name (branch or tag name or commit hash)
-- Ref Pattern Groups
-    - Content of regex groups in `<ref><pattern>` can be addressed like this:
-    - `${ref.GROUP_NAME}` `${ref.GROUP_NAME.slug}`
-    - `${ref.GROUP_INDEX}` `${ref.GROUP_INDEX.slug}`
-    - Named Group Example
-        ```xml
-        <ref type="branch">
-            <pattern><![CDATA[feature/(?<feature>.+)]]></pattern>
-            <version>${ref.feature}-SNAPSHOT</version>
-        </ref>
-        ```
-        <br>
-
-- `${commit}` commit hash '0fc20459a8eceb2c4abb9bf0af45a6e8af17b94b'
-- `${commit.short}` commit hash (7 characters) e.g. '0fc2045'
-- `${commit.timestamp}` commit timestamp (epoch seconds) e.g. '1560694278'
-- `${commit.timestamp.year}` commit year e.g. '2021'
-- `${commit.timestamp.year.2digit}` 2-digit commit year.g. '21'
-- `${commit.timestamp.month}` commit month of year e.g. '12'
-- `${commit.timestamp.day}` commit day of month e.g. '23'
-- `${commit.timestamp.hour}` commit hour of day (24h)e.g. '13'
-- `${commit.timestamp.minute}` commit minute of hour e.g. '59'
-- `${commit.timestamp.second}` commit second of minute e.g. '30'
-- `${commit.timestamp.datetime}` commit timestamp formatted as `yyyyMMdd.HHmmss`e.g. '20190616.161442'
-- `${commit.timestamp.iso}` commit timestamp formatted as `yyyy-MM-ddTHH:mm:ssZ`e.g. '2019-06-16T16:14:42Z'
-      <br><br>
-
-- `${build.timestamp}` maven-build-timestamp (epoch seconds) e.g. '1560694278'
-- `${build.timestamp.year}` maven-build-timestamp year e.g. '2021'
-- `${build.timestamp.year.2digit}` 2-digit maven-build-timestamp year.g. '21'
-- `${build.timestamp.month}` maven-build-timestamp month of year e.g. '12'
-- `${build.timestamp.day}` maven-build-timestamp day of month e.g. '23'
-- `${build.timestamp.hour}` maven-build-timestamp hour of day (24h)e.g. '13'
-- `${build.timestamp.minute}` maven-build-timestamp minute of hour e.g. '59'
-- `${build.timestamp.second}` maven-build-timestamp second of minute e.g. '30'
-- `${build.timestamp.datetime}` maven-build-timestamp formatted as `yyyyMMdd.HHmmss`e.g. '20190616.161442'
-- `${build.timestamp.iso}` commit timestamp formatted as `yyyy-MM-ddTHH:mm:ssZ`e.g. '2019-06-16T16:14:42Z'
-     <br><br>
-
-- `${describe}` Will resolve to `git describe` output
-- `${describe.distance}` The distance count to last matching tag
-- `${describe.distance.snapshot}` Empty string on matching tag, `-SNAPSHOT` if `describe.distance > 0` 
-- `${describe.tag}` The matching tag of `git describe`
-  - `${describe.tag.version}` the tag version determined by regex `(?<version>(?<core>(?<major>\d+)(?:\.(?<minor>\d+)(?:\.(?<patch>\d+))?)?)(?:-(?<label>.*))?)`
-    - `${describe.tag.version.core}` the core version component of `${describe.tag.version}` e.g. '1.2.3' 
-    - `${describe.tag.version.major}` the major version component of `${describe.tag.version}` e.g. '1'
-      - `${describe.tag.version.major.next}` the `${describe.tag.version.major}` increased by 1 e.g. '2'
-    - `${describe.tag.version.minor}` the minor version component of `${describe.tag.version}` e.g. '2'
-      - `${describe.tag.version.minor.next}` the `${describe.tag.version.minor}` increased by 1 e.g. '3'
-    - `${describe.tag.version.patch}` the patch version component of `${describe.tag.version}` e.g. '3'
-      - `${describe.tag.version.patch.next}` the `${describe.tag.version.patch}` increased by 1 e.g. '4'
-      - `${describe.tag.version.patch.plus.describe.distance}` the `${describe.tag.version.patch}` increased by `${describe.distance}` e.g. '2'
-      - `${describe.tag.version.patch.next.plus.describe.distance}` the `${describe.tag.version.patch.next}` increased by `${describe.distance}` e.g. '3'
-    - `${describe.tag.version.label}` the label version component of `${describe.tag.version}` e.g. 'SNAPSHOT'
-      - `${describe.tag.version.label.next}` the `${describe.tag.version.label}` converted to an integer and increased by 1 e.g. '6'
-      - `${describe.tag.version.label.plus.describe.distance}` the `${describe.tag.version.label}` increased by `${describe.distance}` e.g. '2'
-      - `${describe.tag.version.label.next.plus.describe.distance}` the `${describe.tag.version.label.next}` increased by `${describe.distance}` e.g. '3'
-- Describe Tag Pattern Groups
-    - Content of regex groups in `<describeTagPattern>` can be addressed like this:
-    - `${describe.tag.GROUP_NAME}` `${describe.tag.GROUP_NAME.slug}`
-    - `${describe.tag.GROUP_INDEX}` `${describe.tag.GROUP_INDEX.slug}`
-    - Named Group Example
-        ```xml
-        <ref type="branch">
-            <pattern>main</pattern>
-            <describeTagPattern><![CDATA[v(?<name>.*)]]></describeTagPattern>
-            <version>${describe.tag.name}-SNAPSHOT</version>
-        </ref>
-        ```
-        <br> 
-
-- `${dirty}` If repository has untracked files or uncommitted changes this placeholder will resolve to `-DIRTY`, otherwise it will resolve to an empty string.
-    - ℹ May lead to performance issue on very large projects (10,000+ files)
-- `${dirty.snapshot}` Like `${dirty}`, but will resolve to `-SNAPSHOT`
-      <br><br>
-
-- `${value}` Original value of matching property (Only available within property format)
-
-
-### Parameters & Environment Variables
-
-- Disable Extension
-    - **Environment Variables**
-     - `export VERSIONING_DISABLE=true`
-    - **Command Line Parameters**
-     - `mvn … -Dversioning.disable`
-
-- Provide **branch** or **tag** name
-    - **Environment Variables**
-     - `export VERSIONING_GIT_REF=$PROVIDED_REF` e.g. `refs/heads/main`, `refs/tags/v1.0.0` or `refs/pull/1000/head`
-     - `export VERSIONING_GIT_BRANCH=$PROVIDED_BRANCH_NAME` e.g. `main` or `refs/heads/main`
-     - `export VERSIONING_GIT_TAG=$PROVIDED_TAG_NAME` e.g. `v1.0.0` or `refs/tags/v1.0.0`
-    - **Command Line Parameters**
-     - `mvn … -Dgit.ref=$PROVIDED_REF`
-     - `mvn … -Dgit.branch=$PROVIDED_BRANCH_NAME`
-     - `mvn … -Dgit.tag=$PROVIDED_TAG_NAME`
-
-  ℹ Especially useful for **CI builds** see [Miscellaneous Hints](#miscellaneous-hints)
-
-- Update `pom.xml`
-    - **Environment Variables**
-     - `export VERSIONING_UPDATE_POM=true`
-    - **Command Line Parameters**
-     - `mvn … -Dversioning.updatePom`
-
-## Provided Project Properties
-
-- `git.worktree` absolute path of git worktree directory
-
----
-
-## IDE Setup
-
-### IntelliJ - Multi Modules Projects
-
-For a flawless experience you need to disable this extension during project import, otherwise you'll get errors for modules depending on another module.  
-To disable this extension during import add following Maven Importer VM options (`Preferences > Build, Execution, Deployment > Build Tools > Maven > Importing > VM options for importer`) `-Dversioning.disable=true`
-
-*Related Issues*
-* https://youtrack.jetbrains.com/issue/IDEA-200272
-* https://youtrack.jetbrains.com/issue/IDEA-288322
-
-## CI/CD Setup
-
-Most CI/CD systems do checkouts in a detached HEAD state so no branch information is available, however they provide environment variables with this information. 
-You can provide those, by using [Parameters & Environment Variables](#parameters--environment-variables). 
-
-### Native Support
-
-* GitHub Actions: if `$GITHUB_ACTIONS == true`, `GITHUB_REF` is considered
-* GitLab CI: if `$GITLAB_CI == true`, `CI_COMMIT_BRANCH`, `CI_COMMIT_TAG` and `CI_MERGE_REQUEST_SOURCE_BRANCH_NAME` are considered
-* Circle CI: if `$CIRCLECI == true`, `CIRCLE_BRANCH` and `CIRCLE_TAG` are considered
-* Jenkins: if `JENKINS_HOME` is set, `BRANCH_NAME` and `TAG_NAME` are considered
-
-### Manual Setup
-
-Set following environment variables before running your `mvn` command
-
-```shell
-export VERSIONING_GIT_REF=$PROVIDED_REF;
-```
-
-`$PROVIDED_REF` value examples: `refs/heads/main`, `refs/tags/v1.0.0` or `refs/pull/1000/head`
-
-or
-
-```shell
-export VERSIONING_GIT_BRANCH=$PROVIDED_BRANCH;
-export VERSIONING_GIT_TAG=$PROVIDED_TAG;
-```
-
-`$PROVIDED_BRANCH` value examples: `main`, `refs/heads/main` or `refs/pull/1000/head`
-
-`$PROVIDED_TAG` value examples: `v1.0.0` or `refs/tags/v1.0.0`
-
----
-
-## Miscellaneous Hints
-
-### Commandline To Print Project Version
-
-`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`
-
-### Reproducible builds
-
-The [maven reproducible builds feature](https://maven.apache.org/guides/mini/guide-reproducible-builds.html) can be easily supported with this extension e.g.
-
-```xml
-<ref type="branch">
-  <pattern>.+</pattern>
-  <properties>
-    <project.build.outputTimestamp>${commit.timestamp}</project.build.outputTimestamp>
-  </properties>
-</ref>
-```
-
----
-
-## Build & Release
-
-```shell
-gpg --import private.key
-gpg --list-keys
-```
-
-```shell
-  ./mvnw verify
-  # Publishes this plugin to local Maven
-  ./mvnw install
-  # Run integration tests after install, 
-  # integration tests will run with LATEST version of extension installed
-  ./mvnw failsafe:integration-test
-  # Publishes this plugin to OSS Nexus.
-  GPG_TTY=$(tty) ./mvnw clean deploy -P release -Dgpg.keyname=???
-```
-
-##### Debug
-
-```shell
-mvn help:evaluate -Dexpression=project.version -Dorg.slf4j.simpleLogger.log.me.qoomon.maven.gitversioning=debug
-```