Add cli property to un-skip git-commit-id skip flag

Change-Id: I88340ab60e3e922fd3c79fe01f6b60471eec55e7
Signed-off-by: Sam Hague <shague@redhat.com>
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/odlparent-lite/pom.xml b/odlparent-lite/pom.xml
index 4cd7c16388962d5c19ba573a47ad1f0a2906462a..67939fa2320a788ff436fa3e1651ed07868a3b51 100644 (file)
--- a/odlparent-lite/pom.xml
+++ b/odlparent-lite/pom.xml
@@ -80,6 +80,13 @@
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+    <!-- This property is used in the pluginManagement and the q profile as well as -D set e.g. in releng/builder by c/53426
+         to emulate a future "maven.gitcommitid.skip", which only a future not-yet-available-on-Maven-central maven-git-commit-id-plugin release has.
+         (If we ever upgrade the version of the maven-git-commit-id-plugin we use, then this and re. pluginManagement config could be removed; BUT then
+          the q profile and all -D in releng/builder etc. else would have to be changed from this "gitid.skip" to "maven.gitcommitid.skip.)
+      -->
+    <gitid.skip>false</gitid.skip>
   </properties>
 
   <build>
@@ -306,6 +313,7 @@
           </execution>
         </executions>
         <configuration>
+          <skip>${gitid.skip}</skip>
           <failOnNoGitDirectory>false</failOnNoGitDirectory>
           <generateGitPropertiesFile>true</generateGitPropertiesFile>
           <generateGitPropertiesFilename>${project.build.outputDirectory}/META-INF/git.properties</generateGitPropertiesFilename>
@@ -365,18 +373,8 @@
             <invoker.skip>true</invoker.skip>
             <enforcer.skip>true</enforcer.skip>
             <mdsal.skip.verbose>true</mdsal.skip.verbose> <!-- Bug 6236 -->
+            <gitid.skip>true</gitid.skip>
         </properties>
-        <build>
-          <plugins>
-            <plugin>
-              <groupId>pl.project13.maven</groupId>
-              <artifactId>git-commit-id-plugin</artifactId>
-              <configuration>
-                <skip>true</skip>
-              </configuration>
-            </plugin>
-          </plugins>
-        </build>
     </profile>
     <profile>
       <!-- http://blog2.vorburger.ch/2016/06/maven-install-into-additional.html