git-commit-id-plugin cannot fail build for new projects w.o. .git/

Change-Id: I5483524047476b9fcf3562dde55b07c79efbea0b
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/odlparent-lite/pom.xml b/odlparent-lite/pom.xml
index 58a69ebd0df60b80294d24fb4e0644e10878c57a..7bd4cc56dadd0aa5d1fc59d82c72d6d396908833 100644 (file)
--- a/odlparent-lite/pom.xml
+++ b/odlparent-lite/pom.xml
@@ -277,6 +277,7 @@
           </execution>
         </executions>
         <configuration>
+          <failOnNoGitDirectory>false</failOnNoGitDirectory>
           <generateGitPropertiesFile>true</generateGitPropertiesFile>
           <generateGitPropertiesFilename>${project.build.outputDirectory}/META-INF/git.properties</generateGitPropertiesFilename>
           <gitDescribe>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index eb35df55832aa7939a9aa8759765db5a896415b5..c8a3927ebf7ab7b7747c9c0c9c65b7474dc310e7 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -1571,7 +1571,10 @@
           <extensions>true</extensions>
           <configuration>
             <instructions>
-              <Include-Resource>{maven-resources},target/classes/LICENSE,META-INF/git.properties=target/classes/META-INF/git.properties</Include-Resource>
+              <!-- Note the '-' for git.properties.. this is required because git-commit-id-plugin has <failOnNoGitDirectory>false,
+                   so that the build doesn't fail if there is no .../.git/ - so git.properties is effectively optional;
+                   and so the '-' there is needed to make the maven-bundle-plugin if that resource is not present.  -->
+              <Include-Resource>{maven-resources},target/classes/LICENSE,META-INF/git.properties=-target/classes/META-INF/git.properties</Include-Resource>
             </instructions>
           </configuration>
         </plugin>