Rebase on last master version

Author: katysaintin

pom.xml

@@ -99,7 +99,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.9.0</version>
+        <version>3.6.2</version>
         <configuration>
           <source>17</source>
           <target>17</target>
@@ -166,8 +166,6 @@
         <version>3.3.0</version>
       </plugin>
       <!-- Include the git properties to ensure reproducible builds -->
-      <!-- Maven 3.6.1 error build compatibility-->
-       <!--
       <plugin>
         <groupId>io.github.git-commit-id</groupId>
         <artifactId>git-commit-id-maven-plugin</artifactId>
@@ -193,7 +191,7 @@
             <excludeProperty>^git.local.branch.*$</excludeProperty>
           </excludeProperties>
         </configuration>
-      </plugin>-->
+      </plugin>
     </plugins>
   </build>