Add git-commitid-plugin and always flatten

Optum · Nov 20, 2020 · ea033df · ea033df
1 parent adb52bf
commit ea033df
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Manages commonly used plugins and configurations across all types of packaging a
 <parent>
     <groupId>com.optum.sourcehawk</groupId>
     <artifactId>sourcehawk-parent</artifactId>
-    <version>1.1.7</version>
+    <version>1.1.8</version>
 </parent>
 ```
 
@@ -35,7 +35,7 @@ Manages plugins and profiles for all JAR based projects which extend it.
 <parent>
     <groupId>com.optum.sourcehawk</groupId>
     <artifactId>sourcehawk-jar-parent</artifactId>
-    <version>1.1.7</version>
+    <version>1.1.8</version>
 </parent>
 ```
 

diff --git a/checkstyle-config/pom.xml b/checkstyle-config/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-parent</artifactId>
-        <version>1.1.7-SNAPSHOT</version>
+        <version>1.1.8-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/jar-parent/pom.xml b/jar-parent/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>sourcehawk-parent</artifactId>
         <groupId>com.optum.sourcehawk</groupId>
-        <version>1.1.7-SNAPSHOT</version>
+        <version>1.1.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>sourcehawk-jar-parent</artifactId>
@@ -70,7 +70,7 @@
                         <dependency>
                             <groupId>com.optum.sourcehawk</groupId>
                             <artifactId>sourcehawk-checkstyle-config</artifactId>
-                            <version>1.1.7-SNAPSHOT</version>
+                            <version>1.1.8-SNAPSHOT</version>
                         </dependency>
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
@@ -459,11 +459,6 @@
                 </file>
             </activation>
             <build>
-<!--                <testResources>-->
-<!--                    <testResource>-->
-<!--                        <directory>src/it/resources</directory>-->
-<!--                    </testResource>-->
-<!--                </testResources>-->
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.optum.sourcehawk</groupId>
     <artifactId>sourcehawk-parent</artifactId>
-    <version>1.1.7-SNAPSHOT</version>
+    <version>1.1.8-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Sourcehawk Parent</name>
@@ -188,6 +188,29 @@
                     <artifactId>asciidoctor-maven-plugin</artifactId>
                     <version>2.1.0</version>
                 </plugin>
+                <plugin>
+                    <groupId>pl.project13.maven</groupId>
+                    <artifactId>git-commit-id-plugin</artifactId>
+                    <version>4.0.3</version>
+                    <executions>
+                        <execution>
+                            <id>generate-git-commit-info</id>
+                            <goals>
+                                <goal>revision</goal>
+                            </goals>
+                            <phase>initialize</phase>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <offline>true</offline>
+                        <runOnlyOnce>true</runOnlyOnce>
+                        <includeOnlyProperties>
+                            <includeOnlyProperty>^git.commit.time$</includeOnlyProperty>
+                            <includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
+                        </includeOnlyProperties>
+                        <commitIdGenerationMode>full</commitIdGenerationMode>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>com.spotify</groupId>
                     <artifactId>dockerfile-maven-plugin</artifactId>
@@ -295,6 +318,10 @@
                     <plugin>
                         <artifactId>maven-enforcer-plugin</artifactId>
                     </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>flatten-maven-plugin</artifactId>
+                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -315,14 +342,6 @@
                     <name>ci.build</name>
                 </property>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>flatten-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
 
         <!-- CI: DEPLOY -->
@@ -341,10 +360,6 @@
             </distributionManagement>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>flatten-maven-plugin</artifactId>
-                    </plugin>
                     <plugin>
                         <artifactId>maven-gpg-plugin</artifactId>
                     </plugin>