From 2b38ebe44db360f626a21f47bc79246676fe9aad Mon Sep 17 00:00:00 2001
From: Steffen Schaefer <steffen.schaefer@sap.com>
Date: Thu, 26 Nov 2015 15:41:19 +0100
Subject: [PATCH] Using git-commit-id-plugin only in non Lean DI environment /
 Using env information on Lead DI to construct a build tag

---
 .../assets_resources/build.info               |  2 +-
 .../pom.xml                                   |  4 --
 .../assets_resources/build.info               |  2 +-
 .../com.sap.sailing.buoy.positioning/pom.xml  |  4 --
 .../assets_resources/build.info               |  2 +-
 .../com.sap.sailing.racecommittee.app/pom.xml |  4 --
 mobile/pom.xml                                | 48 +++++++++++++------
 7 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/assets_resources/build.info b/mobile/com.sap.sailing.android.tracking.app/assets_resources/build.info
index 13f81c9bd79..09957458d4a 100644
--- a/mobile/com.sap.sailing.android.tracking.app/assets_resources/build.info
+++ b/mobile/com.sap.sailing.android.tracking.app/assets_resources/build.info
@@ -1 +1 @@
-${git.branch}-${git.commit.id.abbrev} (${git.commit.time})
+${build.tag}
diff --git a/mobile/com.sap.sailing.android.tracking.app/pom.xml b/mobile/com.sap.sailing.android.tracking.app/pom.xml
index 8e537271046..726151f0ebb 100644
--- a/mobile/com.sap.sailing.android.tracking.app/pom.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/pom.xml
@@ -58,10 +58,6 @@
 		<finalName>${project.artifactId}</finalName>
 		<sourceDirectory>src</sourceDirectory>
 		<plugins>		
-			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-			</plugin>            
 			<plugin>
 				<groupId>com.simpligility.maven.plugins</groupId>
 				<artifactId>android-maven-plugin</artifactId>
diff --git a/mobile/com.sap.sailing.buoy.positioning/assets_resources/build.info b/mobile/com.sap.sailing.buoy.positioning/assets_resources/build.info
index 13f81c9bd79..09957458d4a 100644
--- a/mobile/com.sap.sailing.buoy.positioning/assets_resources/build.info
+++ b/mobile/com.sap.sailing.buoy.positioning/assets_resources/build.info
@@ -1 +1 @@
-${git.branch}-${git.commit.id.abbrev} (${git.commit.time})
+${build.tag}
diff --git a/mobile/com.sap.sailing.buoy.positioning/pom.xml b/mobile/com.sap.sailing.buoy.positioning/pom.xml
index 218a43eba47..bc634ae623c 100644
--- a/mobile/com.sap.sailing.buoy.positioning/pom.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/pom.xml
@@ -51,10 +51,6 @@
 		<finalName>${project.artifactId}</finalName>
 		<sourceDirectory>src</sourceDirectory>
 		<plugins>
-			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-			</plugin>            
 			<plugin>
 				<groupId>com.simpligility.maven.plugins</groupId>
 				<artifactId>android-maven-plugin</artifactId>
diff --git a/mobile/com.sap.sailing.racecommittee.app/assets_resources/build.info b/mobile/com.sap.sailing.racecommittee.app/assets_resources/build.info
index 13f81c9bd79..09957458d4a 100644
--- a/mobile/com.sap.sailing.racecommittee.app/assets_resources/build.info
+++ b/mobile/com.sap.sailing.racecommittee.app/assets_resources/build.info
@@ -1 +1 @@
-${git.branch}-${git.commit.id.abbrev} (${git.commit.time})
+${build.tag}
diff --git a/mobile/com.sap.sailing.racecommittee.app/pom.xml b/mobile/com.sap.sailing.racecommittee.app/pom.xml
index 81249b47b55..f62e15049f3 100644
--- a/mobile/com.sap.sailing.racecommittee.app/pom.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/pom.xml
@@ -74,10 +74,6 @@
 		<finalName>${project.artifactId}</finalName>
 		<sourceDirectory>src</sourceDirectory>
 		<plugins>
-			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>com.simpligility.maven.plugins</groupId>
 				<artifactId>android-maven-plugin</artifactId>
diff --git a/mobile/pom.xml b/mobile/pom.xml
index 491890c55a7..4b65a0aad16 100644
--- a/mobile/pom.xml
+++ b/mobile/pom.xml
@@ -201,21 +201,6 @@
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
           <version>1.9.1</version>
-        </plugin>
-        <plugin>
-          <groupId>pl.project13.maven</groupId>
-          <artifactId>git-commit-id-plugin</artifactId>
-          <version>2.2.0</version>
-          <configuration>
-            <verbose>true</verbose>
-          </configuration>
-          <executions>
-            <execution>
-              <goals>
-                <goal>revision</goal>
-              </goals>
-            </execution>
-          </executions>
         </plugin>
          <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -292,6 +277,18 @@
         </build>
       </profile>
       
+      <profile>
+        <id>non-leandi</id>
+        <activation>
+          <property>
+            <name>ldi.releaseBuild</name>
+          </property>
+        </activation>
+        <properties>
+            <build.tag>${env.BUILD_TAG} (${env.GIT_BRANCH} : ${env.GIT_COMMIT})</build.tag>
+        </properties>
+      </profile>
+      
       <profile>
         <id>non-leandi</id>
         <activation>
@@ -299,7 +296,28 @@
             <name>!ldi.releaseBuild</name>
           </property>
         </activation>
+        <properties>
+            <build.tag>${git.branch}-${git.commit.id.abbrev} (${git.commit.time})</build.tag>
+        </properties>
         <build>
+          <plugins>
+              <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>2.2.0</version>
+                <configuration>
+                  <verbose>true</verbose>
+                  <runOnlyOnce>true</runOnlyOnce>
+                </configuration>
+                <executions>
+                  <execution>
+                    <goals>
+                      <goal>revision</goal>
+                    </goals>
+                  </execution>
+                </executions>
+              </plugin>
+          </plugins>
           <pluginManagement>
             <plugins>