Skip to content

Commit d5ba8f6

Browse files
committed
Make Spring Boot Antlib's integration tests compatible with JDK 9
Closes gh-10021
1 parent 7a82660 commit d5ba8f6

File tree

1 file changed

+22
-2
lines changed
  • spring-boot-tools/spring-boot-antlib

1 file changed

+22
-2
lines changed

spring-boot-tools/spring-boot-antlib/pom.xml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
</path>
8181
<pathconvert refid="taskpath" />
8282
<typedef resource="org/springframework/boot/ant/antlib.xml" classpathref="taskpath" uri="antlib:org.springframework.boot.ant" />
83-
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
83+
<property name="build.compiler" value="${antBuildCompiler}" />
8484
<antunit xmlns="antlib:org.apache.ant.antunit">
8585
<propertyset>
8686
<propertyref name="build.compiler" />
@@ -120,10 +120,30 @@
120120
<dependency>
121121
<groupId>org.eclipse.jdt.core.compiler</groupId>
122122
<artifactId>ecj</artifactId>
123-
<version>4.4.2</version>
123+
<version>4.6.1</version>
124124
</dependency>
125125
</dependencies>
126126
</plugin>
127127
</plugins>
128128
</build>
129+
<profiles>
130+
<profile>
131+
<id>java-8</id>
132+
<activation>
133+
<jdk>[1.8,1.9)</jdk>
134+
</activation>
135+
<properties>
136+
<antBuildCompiler>org.eclipse.jdt.core.JDTCompilerAdapter</antBuildCompiler>
137+
</properties>
138+
</profile>
139+
<profile>
140+
<id>java-9</id>
141+
<activation>
142+
<jdk>[1.9,)</jdk>
143+
</activation>
144+
<properties>
145+
<antBuildCompiler>modern</antBuildCompiler>
146+
</properties>
147+
</profile>
148+
</profiles>
129149
</project>

0 commit comments

Comments
 (0)