From 202e32425ee34b927aa8293f2ca665ad6f66db79 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@gopivotal.com>
Date: Thu, 7 Nov 2013 11:03:51 -0800
Subject: [PATCH] Reinstate git commit ID in loader tools manifest

Add Spring-Boot-Commit-Id to MANIFEST.MF of spring-boot-loader-tools.
The reinstates functionality of 498ca076989742b2d95fa9c3da0950d0f0f3669c
but does not cause issues in eclipse.
---
 spring-boot-dependencies/pom.xml              |  5 +++
 .../spring-boot-loader-tools/pom.xml          | 33 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 3102bca35c..aeac8b6002 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -595,6 +595,11 @@
 					<artifactId>versions-maven-plugin</artifactId>
 					<version>2.0</version>
 				</plugin>
+				<plugin>
+					<groupId>pl.project13.maven</groupId>
+					<artifactId>git-commit-id-plugin</artifactId>
+					<version>2.1.7</version>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
diff --git a/spring-boot-tools/spring-boot-loader-tools/pom.xml b/spring-boot-tools/spring-boot-loader-tools/pom.xml
index c9f1f4620f..6f4878de27 100644
--- a/spring-boot-tools/spring-boot-loader-tools/pom.xml
+++ b/spring-boot-tools/spring-boot-loader-tools/pom.xml
@@ -34,6 +34,29 @@
 	</dependencies>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>pl.project13.maven</groupId>
+				<artifactId>git-commit-id-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>include-git-properties</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>revision</goal>
+						</goals>
+						<configuration>
+							<dotGitDirectory>${main.basedir}/.git</dotGitDirectory>
+							<verbose>true</verbose>
+							<gitDescribe>
+								<skip>true</skip>
+							</gitDescribe>
+						</configuration>
+					</execution>
+				</executions>
+				<configuration>
+					<failOnNoGitDirectory>false</failOnNoGitDirectory>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -80,6 +103,16 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Spring-Boot-Commit-Id>${git.commit.id}</Spring-Boot-Commit-Id>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>