DRYD-1712/DRYD-1715: only run `git-commit-id-plugin` once (#457)

* DRYD-1712/DRYD-1715: removed git-commit-id-plugin from topmost pom, which was inherited by all child poms, and instead placed it in JaxRsServiceProvider. This is the only project that needs it, since this is where the WAR is created and that's where systeminfo picks it up.

---------

Co-authored-by: Anthony Bucci <abucci@bucci.onl>

diff --git a/pom.xml b/pom.xml
index 230c7b37aaf310656007edc9b9bf22c8e4890616..8f3f5d437ed80aaa0a65daf918325904c9d59075 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -227,29 +227,6 @@
                                                </archive>
                                        </configuration>
                                </plugin>
-
-                               <plugin>
-                                       <groupId>pl.project13.maven</groupId>
-                                       <artifactId>git-commit-id-plugin</artifactId>
-                                       <version>4.9.10</version>
-                                       <executions>
-                                               <execution>
-                                                       <goals>
-                                                               <goal>revision</goal>
-                                                       </goals>
-                                                       <phase>initialize</phase>
-                                               </execution>
-                                       </executions>
-                                       <configuration>
-                                               <generateGitPropertiesFile>true</generateGitPropertiesFile>
-                                               <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
-                                               <includeOnlyProperties>
-                                                       <includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
-                                               </includeOnlyProperties>
-                                               <commitIdGenerationMode>full</commitIdGenerationMode>
-                                       </configuration>
-                               </plugin>
-
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-dependency-plugin</artifactId>
@@ -437,11 +414,6 @@
                     </files>
                 </configuration>
             </plugin>
-
-                       <plugin>
-                               <groupId>pl.project13.maven</groupId>
-                               <artifactId>git-commit-id-plugin</artifactId>
-                       </plugin>
                </plugins>
        </build>
 

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 89eb6473562a0a345c2a877ad63f2e8aeb9a6f1a..d574297c07e463548bd7f7ca7cd5b8efb7b348d9 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -873,6 +873,27 @@
                     </execution>
                 </executions>
             </plugin>
+                       <plugin>
+                               <groupId>pl.project13.maven</groupId>
+                               <artifactId>git-commit-id-plugin</artifactId>
+                               <version>4.9.10</version>
+                               <executions>
+                                       <execution>
+                                               <goals>
+                                                       <goal>revision</goal>
+                                               </goals>
+                                               <phase>initialize</phase>
+                                       </execution>
+                               </executions>
+                               <configuration>
+                                       <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                                       <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+                                       <includeOnlyProperties>
+                                                       <includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
+                                               </includeOnlyProperties>
+                                               <commitIdGenerationMode>full</commitIdGenerationMode>
+                                       </configuration>
+                               </plugin>
             <plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven2-plugin</artifactId>