Merge branch '2.4.x'

Closes gh-25524

buildSrc/src/main/java/org/springframework/boot/build/toolchain/ToolchainPlugin.java

@@ -22,6 +22,7 @@ import java.util.List;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.JavaPluginExtension;
+import org.gradle.api.tasks.GradleBuild;
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.api.tasks.javadoc.Javadoc;
 import org.gradle.api.tasks.testing.Test;
@@ -70,6 +71,7 @@ public class ToolchainPlugin implements Plugin<Project> {
 		project.getTasks().withType(JavaCompile.class, (task) -> task.setEnabled(false));
 		project.getTasks().withType(Javadoc.class, (task) -> task.setEnabled(false));
 		project.getTasks().withType(Test.class, (task) -> task.setEnabled(false));
+		project.getTasks().withType(GradleBuild.class, (task) -> task.setEnabled(false));
 	}
 
 	private void configureJavaCompileToolchain(Project project, ToolchainExtension toolchain) {

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle

@@ -6,6 +6,10 @@ plugins {
 
 description = "Spring Boot Launch Script Integration Tests"
 
+toolchain {
+	maximumCompatibleJavaVersion = JavaLanguageVersion.of(15)
+}
+
 configurations {
 	app
 }

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle

@@ -6,6 +6,10 @@ plugins {
 
 description = "Spring Boot Loader Integration Tests"
 
+toolchain {
+	maximumCompatibleJavaVersion = JavaLanguageVersion.of(15)
+}
+
 configurations {
 	app
 }