root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Test our Gradle plugin against 7.1-rc-1 

7.1-rc-1 deprecates JavaExec's main property in favor of mainClass
which was introduced in Gradle 6.4. This commit updates some tests
to use mainClass rather than main that would otherwise have failed
due to deprecation warnings in their output.

Closes gh-26793
This commit is contained in:
Andy Wilkinson 2021-06-07 10:48:10 +01:00
parent 15721595fe
commit 87d35250a5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
View File

@ -48,10 +48,10 @@ final class GradleCompatibilityExtension implements TestTemplateInvocationContex
static { static {
JavaVersion javaVersion = JavaVersion.current(); JavaVersion javaVersion = JavaVersion.current();
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) { if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) {
GRADLE_VERSIONS = Arrays.asList("7.0.2"); GRADLE_VERSIONS = Arrays.asList("7.0.2", "7.1-rc-1");
} }
else { else {
GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.2"); GRADLE_VERSIONS = Arrays.asList("6.8.3", "current", "7.0.2", "7.1-rc-1");
} }
} }

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-explodedApplicationClasspath.gradle
View File

@ -21,5 +21,5 @@ task explode(type: Sync) {
task launch(type: JavaExec) { task launch(type: JavaExec) {
classpath = files(explode) classpath = files(explode)
main = 'org.springframework.boot.loader.JarLauncher' mainClass = 'org.springframework.boot.loader.JarLauncher'
} }

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/run/BootRunIntegrationTests-applicationPluginMainClassNameIsNotUsedWhenItIsNull.gradle
View File

@ -5,6 +5,6 @@ plugins {
bootRun { bootRun {
doFirst { doFirst {
println "Main class name = ${bootRun.main}" println "Main class name = ${bootRun.mainClass.get()}"
} }
} }