Skip to content

Commit ecf7c81

Browse files
committed
Build and test the Gradle plugin with Java 11 and 12
Closes gh-12333
1 parent 86380ab commit ecf7c81

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ javadoc {
5050
'https://docs.oracle.com/javase/8/docs/api/',
5151
'https://docs.gradle.org/current/javadoc/'
5252
]
53+
source = '8'
5354
}
5455
title = "${project.description} $version API"
5556
}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml

-16
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<main.basedir>${basedir}/../../..</main.basedir>
1616
<gradle.executable>./gradlew</gradle.executable>
1717
<gradle.task>build</gradle.task>
18-
<skip.gradle.build>false</skip.gradle.build>
1918
<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
2019
</properties>
2120
<dependencies>
@@ -142,7 +141,6 @@
142141
<argument>-Pdescription=${project.description}</argument>
143142
<argument>-S</argument>
144143
</arguments>
145-
<skip>${skip.gradle.build}</skip>
146144
</configuration>
147145
<goals>
148146
<goal>exec</goal>
@@ -177,7 +175,6 @@
177175
<classifier>sources</classifier>
178176
</artifact>
179177
</artifacts>
180-
<skipAttach>${skip.gradle.build}</skipAttach>
181178
</configuration>
182179
</execution>
183180
</executions>
@@ -250,9 +247,6 @@
250247
<version>3.2.10</version>
251248
</dependency>
252249
</dependencies>
253-
<configuration>
254-
<skip>${skip.gradle.build}</skip>
255-
</configuration>
256250
<executions>
257251
<execution>
258252
<id>set-up-maven-properties</id>
@@ -391,22 +385,12 @@
391385
<classifier>docs</classifier>
392386
</artifact>
393387
</artifacts>
394-
<skipAttach>${skip.gradle.build}</skipAttach>
395388
</configuration>
396389
</execution>
397390
</executions>
398391
</plugin>
399392
</plugins>
400393
</build>
401394
</profile>
402-
<profile>
403-
<id>java9</id>
404-
<activation>
405-
<jdk>[9,)</jdk>
406-
</activation>
407-
<properties>
408-
<skip.gradle.build>true</skip.gradle.build>
409-
</properties>
410-
</profile>
411395
</profiles>
412396
</project>

0 commit comments

Comments
 (0)