From d5ba8f671a331a581382ee4cf34adfdb90a308d6 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Tue, 9 May 2017 13:16:11 +0200
Subject: [PATCH] Make Spring Boot Antlib's integration tests compatible with
 JDK 9

Closes gh-10021
---
 spring-boot-tools/spring-boot-antlib/pom.xml | 24 ++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/spring-boot-tools/spring-boot-antlib/pom.xml b/spring-boot-tools/spring-boot-antlib/pom.xml
index 878663750e..be5911287a 100644
--- a/spring-boot-tools/spring-boot-antlib/pom.xml
+++ b/spring-boot-tools/spring-boot-antlib/pom.xml
@@ -80,7 +80,7 @@
 								</path>
 								<pathconvert refid="taskpath" />
 								<typedef resource="org/springframework/boot/ant/antlib.xml" classpathref="taskpath" uri="antlib:org.springframework.boot.ant" />
-								<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
+								<property name="build.compiler" value="${antBuildCompiler}" />
 								<antunit xmlns="antlib:org.apache.ant.antunit">
 									<propertyset>
 										<propertyref name="build.compiler" />
@@ -120,10 +120,30 @@
 					<dependency>
 						<groupId>org.eclipse.jdt.core.compiler</groupId>
 						<artifactId>ecj</artifactId>
-						<version>4.4.2</version>
+						<version>4.6.1</version>
 					</dependency>
 				</dependencies>
 			</plugin>
 		</plugins>
 	</build>
+	<profiles>
+		<profile>
+			<id>java-8</id>
+			<activation>
+				<jdk>[1.8,1.9)</jdk>
+			</activation>
+			<properties>
+				<antBuildCompiler>org.eclipse.jdt.core.JDTCompilerAdapter</antBuildCompiler>
+			</properties>
+		</profile>
+		<profile>
+			<id>java-9</id>
+			<activation>
+				<jdk>[1.9,)</jdk>
+			</activation>
+			<properties>
+				<antBuildCompiler>modern</antBuildCompiler>
+			</properties>
+		</profile>
+	</profiles>
 </project>