From b8c472007a77d41fd1483de5ddfc7dee35c19c31 Mon Sep 17 00:00:00 2001
From: Trevor Menagh <trevor_menagh@comcast.com>
Date: Sat, 15 Mar 2014 00:17:13 -0400
Subject: [PATCH] Make Spring Boot work in Java 1.6 on Mac OS X

Currently Spring Boot fails in Java 1.6 on Mac OS X due to the
"tools.jar" being integrated into classes.jar in the Apple version of
Java 6.

Apple fixed this with Java 7, but we should still support Java 6. We had
to roll back to maven-plugin-plugin 3.1 to make this work with Java 6
and 7.

All tests pass with Java 6 and Java 7.
---
 .../spring-boot-loader-tools/pom.xml          | 26 ++++++++++++++++-
 .../spring-boot-maven-plugin/pom.xml          | 29 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/spring-boot-tools/spring-boot-loader-tools/pom.xml b/spring-boot-tools/spring-boot-loader-tools/pom.xml
index 0ab99b5b6a3..40f93dd0b70 100644
--- a/spring-boot-tools/spring-boot-loader-tools/pom.xml
+++ b/spring-boot-tools/spring-boot-loader-tools/pom.xml
@@ -11,6 +11,30 @@
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
+	<profiles>
+		<profile>
+			<id>standard-jdk</id>
+			<activation>
+				<file>
+					<exists>${java.home}/../lib/tools.jar</exists>
+				</file>
+			</activation>
+			<properties>
+				<tools-jar>${java.home}/../lib/tools.jar</tools-jar>
+			</properties>
+		</profile>
+		<profile>
+			<id>apple-jdk</id>
+			<activation>
+				<file>
+					<exists>${java.home}/../Classes/classes.jar</exists>
+				</file>
+			</activation>
+			<properties>
+				<tools-jar>${java.home}/../Classes/classes.jar</tools-jar>
+			</properties>
+		</profile>
+	</profiles>
 	<dependencies>
 		<!-- Compile -->
 		<dependency>
@@ -18,7 +42,7 @@
 			<artifactId>tools</artifactId>
 			<version>${java.version}</version>
 			<scope>system</scope>
-			<systemPath>${java.home}/../lib/tools.jar</systemPath>
+			<systemPath>${tools-jar}</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/spring-boot-tools/spring-boot-maven-plugin/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/pom.xml
index a8ec9898268..2796c6af5fb 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/pom.xml
+++ b/spring-boot-tools/spring-boot-maven-plugin/pom.xml
@@ -12,6 +12,28 @@
 		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<profiles>
+		<profile>
+			<id>standard-jdk</id>
+			<activation>
+				<file>
+					<exists>${java.home}/../lib/tools.jar</exists>
+				</file>
+			</activation>
+			<properties>
+				<tools-jar>${java.home}/../lib/tools.jar</tools-jar>
+			</properties>
+		</profile>
+		<profile>
+			<id>apple-jdk</id>
+			<activation>
+				<file>
+					<exists>${java.home}/../Classes/classes.jar</exists>
+				</file>
+			</activation>
+			<properties>
+				<tools-jar>${java.home}/../Classes/classes.jar</tools-jar>
+			</properties>
+		</profile>
 		<profile>
 			<id>integration</id>
 			<activation>
@@ -46,6 +68,13 @@
 	</profiles>
 	<dependencies>
 		<!-- Compile -->
+		<dependency>
+			<groupId>com.sun</groupId>
+			<artifactId>tools</artifactId>
+			<version>${java.version}</version>
+			<scope>system</scope>
+			<systemPath>${tools-jar}</systemPath>
+		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-boot-loader-tools</artifactId>