From 9ce8e4698590ced5dea65f3b7718b37ecfa9f2aa Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 26 May 2020 11:04:24 +0200
Subject: [PATCH] use git-commit-id-plugin only once in scm-packaging

---
 scm-packaging/docker/pom.xml | 22 ----------------------
 scm-packaging/helm/pom.xml   | 31 -------------------------------
 scm-packaging/pom.xml        | 29 +++++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 53 deletions(-)

diff --git a/scm-packaging/docker/pom.xml b/scm-packaging/docker/pom.xml
index d179e2f51e..ea30dd2695 100644
--- a/scm-packaging/docker/pom.xml
+++ b/scm-packaging/docker/pom.xml
@@ -52,28 +52,6 @@
   <build>
     <plugins>
 
-      <plugin>
-        <groupId>pl.project13.maven</groupId>
-        <artifactId>git-commit-id-plugin</artifactId>
-        <version>4.0.0</version>
-        <executions>
-          <execution>
-            <id>get-git-commit-id</id>
-            <goals>
-              <goal>revision</goal>
-            </goals>
-            <phase>initialize</phase>
-          </execution>
-        </executions>
-        <configuration>
-          <skipPoms>false</skipPoms>
-          <dotGitDirectory>${project.basedir}/../../.git</dotGitDirectory>
-          <includeOnlyProperties>
-            <includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
-          </includeOnlyProperties>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
diff --git a/scm-packaging/helm/pom.xml b/scm-packaging/helm/pom.xml
index 8be77a1b69..dd4ff35ab9 100644
--- a/scm-packaging/helm/pom.xml
+++ b/scm-packaging/helm/pom.xml
@@ -46,37 +46,6 @@
   <build>
     <plugins>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.8.2</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>pl.project13.maven</groupId>
-        <artifactId>git-commit-id-plugin</artifactId>
-        <version>4.0.0</version>
-        <executions>
-          <execution>
-            <id>get-git-commit-id</id>
-            <goals>
-              <goal>revision</goal>
-            </goals>
-            <phase>validate</phase>
-          </execution>
-        </executions>
-        <configuration>
-          <skipPoms>false</skipPoms>
-          <dotGitDirectory>${project.basedir}/../../.git</dotGitDirectory>
-          <includeOnlyProperties>
-            <includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
-          </includeOnlyProperties>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.codehaus.gmavenplus</groupId>
         <artifactId>gmavenplus-plugin</artifactId>
diff --git a/scm-packaging/pom.xml b/scm-packaging/pom.xml
index 00d987e2a5..035e41a5f0 100644
--- a/scm-packaging/pom.xml
+++ b/scm-packaging/pom.xml
@@ -62,6 +62,35 @@
         <module>helm</module>
       </modules>
 
+      <build>
+        <plugins>
+
+          <plugin>
+            <groupId>pl.project13.maven</groupId>
+            <artifactId>git-commit-id-plugin</artifactId>
+            <version>4.0.0</version>
+            <executions>
+              <execution>
+                <id>get-git-commit-id</id>
+                <goals>
+                  <goal>revision</goal>
+                </goals>
+                <phase>validate</phase>
+              </execution>
+            </executions>
+            <configuration>
+              <skipPoms>false</skipPoms>
+              <dotGitDirectory>${project.basedir}/../.git</dotGitDirectory>
+              <includeOnlyProperties>
+                <includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
+              </includeOnlyProperties>
+              <injectAllReactorProjects>true</injectAllReactorProjects>
+            </configuration>
+          </plugin>
+
+        </plugins>
+      </build>
+
     </profile>
   </profiles>