Merge branch '2.5.x' into 2.6.x

Closes gh-28880

Author: wilkinsona

build.gradle

@@ -1,4 +1,5 @@
 plugins {
+	id "base"
 	id "org.jetbrains.kotlin.jvm" apply false // https://youtrack.jetbrains.com/issue/KT-30276
 	id "io.spring.nohttp" version "0.0.10"
 }
@@ -16,7 +17,7 @@ nohttp {
 	source.exclude "spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/resources/org/springframework/boot/buildpack/platform/docker/export.tar"
 }
 
-task build {
+check {
 	dependsOn checkstyleNohttp
 }
 

settings.gradle

@@ -36,12 +36,12 @@ settings.gradle.projectsLoaded {
 				value('Toolchain version', toolchainVersion)
 				tag("JDK-$toolchainVersion")
 			}
-
-			settings.gradle.rootProject.getBuildDir().mkdirs()
-			new File(settings.gradle.rootProject.getBuildDir(), "build-scan-uri.txt").text = "build scan not generated"
-
+			def buildDir = settings.gradle.rootProject.getBuildDir()
+			buildDir.mkdirs()
+			new File(buildDir, "build-scan-uri.txt").text = "build scan not generated"
 			buildScanPublished { scan ->
-				new File(settings.gradle.rootProject.getBuildDir(), "build-scan-uri.txt").text = "<${scan.buildScanUri}|build scan>\n"
+				buildDir.mkdirs()
+				new File(buildDir, "build-scan-uri.txt").text = "<${scan.buildScanUri}|build scan>\n"
 			}
 		}
 	}