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
diff --git a/pom.xml b/pom.xml
index 392afb12..5610c16e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,12 +41,13 @@
     <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>
 
         <maven-plugin-api.version>3.1.0-alpha-1</maven-plugin-api.version>
-        <maven-plugin-plugin.version>3.8.2</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>
@@ -100,7 +101,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.4.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-dependency-plugin</artifactId>
@@ -112,11 +113,11 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.2.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.8.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-gpg-plugin</artifactId>
@@ -124,15 +125,15 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-plugin-plugin</artifactId>
@@ -140,11 +141,11 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>2.22.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-install-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>2.5.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
@@ -156,7 +157,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-source-plugin</artifactId>
@@ -240,11 +241,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>
@@ -449,7 +452,7 @@
                             <dependency>
                                 <groupId>javax.xml.bind</groupId>
                                 <artifactId>jaxb-api</artifactId>
-                                <version>2.3.1</version>
+                                <version>2.2.3</version>
                             </dependency>
                         </dependencies>
                     </plugin>
@@ -473,7 +476,7 @@
         <profile>
             <id>checkstyle</id>
             <properties>
-                <maven-checkstyle-plugin.version>3.2.2</maven-checkstyle-plugin.version>
+                <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
                 <!--  if you update the checkstyle version make sure you update the google_checks.xml inside the repository -->
                 <checkstyle.version>8.25</checkstyle.version>
                 <checkstyle.config.path>${basedir}/.github/.checkstyle</checkstyle.config.path>
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>
    *