Make Spring Boot Antlib's integration tests compatible with JDK 9

Closes gh-10021
pull/10012/merge
Stephane Nicoll 8 years ago
parent 7a82660bb1
commit d5ba8f671a

@ -80,7 +80,7 @@
</path> </path>
<pathconvert refid="taskpath" /> <pathconvert refid="taskpath" />
<typedef resource="org/springframework/boot/ant/antlib.xml" classpathref="taskpath" uri="antlib:org.springframework.boot.ant" /> <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"> <antunit xmlns="antlib:org.apache.ant.antunit">
<propertyset> <propertyset>
<propertyref name="build.compiler" /> <propertyref name="build.compiler" />
@ -120,10 +120,30 @@
<dependency> <dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId> <groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId> <artifactId>ecj</artifactId>
<version>4.4.2</version> <version>4.6.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
</plugins> </plugins>
</build> </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> </project>

Loading…
Cancel
Save