From 614fc2d1528a541e128eb1546a59c2a8a0efb072 Mon Sep 17 00:00:00 2001
From: TheSnoozer <s.lange@alumni.tu-berlin.de>
Date: Thu, 11 May 2023 21:09:52 +0200
Subject: [PATCH 01/11] 
 https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/615:
 declare these Maven artifacts in provided scope

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

diff --git a/.github/workflows/default-tests.yml b/.github/workflows/default-tests.yml
index 4c801326..aee98617 100644
--- a/.github/workflows/default-tests.yml
+++ b/.github/workflows/default-tests.yml
@@ -59,7 +59,7 @@ jobs:
     strategy:
       matrix:
         java_version: ['11']
-        maven_version: ['3.2.5', '3.3.9', '3.5.4', '3.6.3', '3.8.8', '3.9.1', '4.0.0-alpha-5']
+        maven_version: ['3.1.0-alpha-1', '3.1.1', '3.2.5', '3.3.9', '3.5.4', '3.6.3', '3.8.8', '3.9.1', '4.0.0-alpha-5']
 
     steps:
       - uses: actions/checkout@v3

From 775778505c31b6b2b64b3901c08b373aba77361e Mon Sep 17 00:00:00 2001
From: TheSnoozer <s.lange@alumni.tu-berlin.de>
Date: Thu, 11 May 2023 21:11:11 +0200
Subject: [PATCH 02/11] 
 https://github.com/git-commit-id/git-commit-id-maven-plugin/issues/615:
 declare these Maven artifacts in provided scope

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

diff --git a/pom.xml b/pom.xml
index 99ab5cbc..b297da37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,11 +240,13 @@
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
             <version>${maven-plugin-api.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
             <version>${maven-plugin-api.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

From 0540377d4ee9ea628851fe4d33693e9f368e3fd4 Mon Sep 17 00:00:00 2001
From: TheSnoozer <s.lange@alumni.tu-berlin.de>
Date: Thu, 11 May 2023 21:17:29 +0200
Subject: [PATCH 03/11] Revert "bump maven-clean-plugin 3.1.0 -> 3.2.0"

This reverts commit 64d87996ede1195fa348b96e89b79cd6aa9ffb5f.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b297da37..da14f60b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>

From 42349e77c4f8695ce4bcc77fcccd812f25ab4eef Mon Sep 17 00:00:00 2001
From: TheSnoozer <s.lange@alumni.tu-berlin.de>
Date: Thu, 11 May 2023 21:22:24 +0200
Subject: [PATCH 04/11] Revert "bump maven-resources-plugin 3.1.0 -> 3.3.0"

This reverts commit 0a7001b4368b9e2cded00dfcee64063d5d9457cd.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index da14f60b..262b77ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>

From 3351d2e74ee21b9a07f423d4074e40e7f3d1bf95 Mon Sep 17 00:00:00 2001
From: TheSnoozer <s.lange@alumni.tu-berlin.de>
Date: Thu, 11 May 2023 21:24:56 +0200
Subject: [PATCH 05/11] Revert "bump maven-compiler-plugin 3.8.1 -> 3.10.1"

This reverts commit 1e92de33ebfe1b0e8d31097f5206e1ff19becb97.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 262b77ab..474f150f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.10.1</version>
+                    <version>3.8.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-gpg-plugin</artifactId>

From f0520ae52badf9145436d5261477a1a2a19c9917 Mon Sep 17 00:00:00 2001
From: TheSnoozer <s.lange@alumni.tu-berlin.de>
Date: Thu, 11 May 2023 21:29:15 +0200
Subject: [PATCH 06/11] Revert "bump
 org.apache.maven.plugin-tools:maven-plugin-annotations 3.6.0 -> 3.7.1"

This reverts commit de2a185733e1df0dabc9814cad74f585be3d89cc.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 474f150f..18949687 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
         <java.target>11</java.target>
 
         <maven-plugin-api.version>3.1.0-alpha-1</maven-plugin-api.version>
-        <maven-plugin-plugin.version>3.7.1</maven-plugin-plugin.version>
+        <maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
 
         <junit.version>4.13.2</junit.version>
         <mockito.version>5.1.1</mockito.version>

From 5dd822d8cc0286b4596147de9d591ee04d53ada0 Mon Sep 17 00:00:00 2001
From: TheSnoozer <s.lange@alumni.tu-berlin.de>
Date: Thu, 11 May 2023 21:39:01 +0200
Subject: [PATCH 07/11] Revert "bump maven-jar-plugin 3.2.0 -> 3.3.0"

This reverts commit 6eb673358b023d87d6c4e606aac7f19e087f1c8a.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 18949687..d7e30351 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-plugin-plugin</artifactId>

From 73748852691fae052f2cfa3d2d260d1e134feac2 Mon Sep 17 00:00:00 2001
From: TheSnoozer <s.lange@alumni.tu-berlin.de>
Date: Thu, 11 May 2023 21:42:42 +0200
Subject: [PATCH 08/11] Revert "bump maven-javadoc-plugin 3.2.0 -> 3.4.1"

This reverts commit 6c5f7cc4871e5652d620a10853d0dbf053aa30aa.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d7e30351..d743857d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-source-plugin</artifactId>

From 9905714a1f086e3f5792d10f89103651e69d74c7 Mon Sep 17 00:00:00 2001
From: TheSnoozer <s.lange@alumni.tu-berlin.de>
Date: Thu, 11 May 2023 21:46:03 +0200
Subject: [PATCH 09/11] Revert "bump maven-install-plugin 2.5.2 -> 3.1.0"

This reverts commit 4442cf768d59fcb9897a16c27765b5082bcf2996.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d743857d..41147e56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,7 +144,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>2.5.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>

From db0ad29d007c9d794d47d8f7f400a52e02250ed0 Mon Sep 17 00:00:00 2001
From: TheSnoozer <s.lange@alumni.tu-berlin.de>
Date: Thu, 11 May 2023 21:53:47 +0200
Subject: [PATCH 10/11] set properties encoding as per
 https://maven.apache.org/plugins/maven-resources-plugin/examples/filtering-properties-files.html

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

diff --git a/pom.xml b/pom.xml
index 41147e56..5610c16e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <propertiesEncoding>UTF-8</propertiesEncoding>
         <project.build.outputTimestamp>10</project.build.outputTimestamp>
 
         <java.target>11</java.target>

From 1608bb93a4830200a45fd89a8ce98edce0103434 Mon Sep 17 00:00:00 2001
From: TheSnoozer <s.lange@alumni.tu-berlin.de>
Date: Thu, 11 May 2023 22:09:40 +0200
Subject: [PATCH 11/11] fix javadoc warnings reported by 'mvn package
 -Dmaven.plugin.validation=VERBOSE'

---
 .../project13/maven/git/GitCommitIdMojo.java  | 60 ++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java b/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java
index c74028e6..82d0e650 100644
--- a/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java
+++ b/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java
@@ -113,7 +113,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <injectAllReactorProjects>false</injectAllReactorProjects>
+   * }
    * </pre>
    * </p>
    *
@@ -134,7 +136,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <verbose>false</verbose>
+   * }
    * </pre>
    * </p>
    */
@@ -159,7 +163,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <skipPoms>true</skipPoms>
+   * }
    * </pre>
    * </p>
    */
@@ -195,7 +201,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <generateGitPropertiesFile>true</generateGitPropertiesFile>
+   * }
    * </pre>
    * </p>
    */
@@ -234,7 +242,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+   * }
    * </pre>
    * </p>
    *
@@ -255,7 +265,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *    <generateGitPropertiesFileWithEscapedUnicode>true</generateGitPropertiesFileWithEscapedUnicode>
+   * }
    * </pre>
    * </p>
    *
@@ -273,7 +285,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *    <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+   * }
    * </pre>
    * </p>
    */
@@ -298,6 +312,7 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    *     <pre>
+   *     {@code
    *         <gitDescribe>
    *             <!--
    *             Default (optional):
@@ -396,7 +411,7 @@ public class GitCommitIdMojo extends AbstractMojo {
    *             Explanation:
    *             git-describe, by default, returns just the tag name, if the current commit is tagged.
    *             Set this option to `true` to force it to format the output using the typical describe
-   *             format ("${tag-name}-${commits_from_tag}-g${commit_id-maybe_dirty}"), even if "on" a tag.
+   *             format ("$tag_name-$commits_from_tag-g$commit_id-maybe_dirty"), even if "on" a tag.
    *
    *             An example would be: `tagname-0-gc0ffebabe` - notice that the distance from the tag is
    *             0 here, if you don't use **forceLongFormat** mode, the describe for such commit would
@@ -404,6 +419,7 @@ public class GitCommitIdMojo extends AbstractMojo {
    *             -->
    *             <forceLongFormat>false</forceLongFormat>
    *         </gitDescribe>
+   *     }
    *     </pre>
    * </p>
    *
@@ -428,7 +444,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *    <abbrevLength>7</abbrevLength>
+   * }
    * </pre>
    * </p>
    *
@@ -453,7 +471,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *    <format>properties</format>
+   * }
    * </pre>
    * </p>
    */
@@ -478,7 +498,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *    <prefix>git</prefix>
+   * }
    * </pre>
    * </p>
    */
@@ -498,7 +520,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *    <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
+   * }
    * </pre>
    * </p>
    *
@@ -525,7 +549,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>
+   * }
    * </pre>
    * </p>
    *
@@ -543,7 +569,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <failOnNoGitDirectory>true</failOnNoGitDirectory>
+   * }
    * </pre>
    * </p>
    *
@@ -567,7 +595,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <failOnUnableToExtractRepoInfo>true</failOnUnableToExtractRepoInfo>
+   * }
    * </pre>
    * </p>
    *
@@ -596,7 +626,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <useNativeGit>true</useNativeGit>
+   * }
    * </pre>
    * </p>
    *
@@ -616,7 +648,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     mvn clean package -Dmaven.gitcommitid.nativegit=true
+   * }
    * </pre>
    * </p>
    *
@@ -637,7 +671,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <skip>false</skip>
+   * }
    * </pre>
    * </p>
    *
@@ -658,7 +694,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     mvn clean package -Dmaven.gitcommitid.skip=true
+   * }
    * </pre>
    * </p>
    *
@@ -696,7 +734,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <runOnlyOnce>true</runOnlyOnce>
+   * }
    * </pre>
    * </p>
    *
@@ -734,9 +774,11 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <excludeProperties>
    *          <excludeProperty>git.user.*</excludeProperty>
    *     </excludeProperties>
+   * }
    * </pre>
    * </p>
    *
@@ -776,9 +818,11 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <includeOnlyProperties>
    *         <includeOnlyProperty>^git.commit.id.full$</includeOnlyProperty>
    *     </includeOnlyProperties>
+   * }
    * </pre>
    * </p>
    *
@@ -825,7 +869,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <commitIdGenerationMode>flat</commitIdGenerationMode>
+   * }
    * </pre>
    * </p>
    *
@@ -903,6 +949,7 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <replacementProperties>
    *         <!--
    *             example:
@@ -928,6 +975,7 @@ public class GitCommitIdMojo extends AbstractMojo {
    *             </transformationRules>
    *         </replacementProperty>
    *     </replacementProperties>
+   * }
    * </pre>
    * </p>
    *
@@ -956,7 +1004,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <evaluateOnCommit>HEAD</evaluateOnCommit>
+   * }
    * </pre>
    * </p>
    *
@@ -977,7 +1027,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <nativeGitTimeoutInMs>30000</nativeGitTimeoutInMs>
+   * }
    * </pre>
    * </p>
    *
@@ -999,7 +1051,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <useBranchNameFromBuildEnvironment>true</useBranchNameFromBuildEnvironment>
+   * }
    * </pre>
    * </p>
    *
@@ -1020,7 +1074,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <injectIntoSysProperties>true</injectIntoSysProperties>
+   * }
    * </pre>
    * </p>
    *
@@ -1051,7 +1107,9 @@ public class GitCommitIdMojo extends AbstractMojo {
    *
    * <p>Example:
    * <pre>
+   * {@code
    *     <offline>true</offline>
+   * }
    * </pre>
    * </p>
    *