Merge branch '3.5.x'

Closes gh-46255

Author: wilkinsona

settings.gradle

@@ -19,7 +19,7 @@ pluginManagement {
 	repositories {
 		mavenCentral()
 		gradlePluginPortal()
-		spring.mavenRepositories();
+		spring.mavenRepositories()
 	}
 	resolutionStrategy {
 		eachPlugin {

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/dockerTest/resources/org/springframework/boot/gradle/tasks/bundling/BootBuildImageIntegrationTests-buildsImageWithPullPolicy.gradle

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import org.springframework.boot.buildpack.platform.build.PullPolicy;
+import org.springframework.boot.buildpack.platform.build.PullPolicy
 
 plugins {
 	id 'java'

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle

@@ -80,8 +80,8 @@ dependencies {
 	undertow("org.springframework.boot:spring-boot-starter-undertow")
 }
 
-def boolean isWindows() {
-	return File.separatorChar == '\\';
+static boolean isWindows() {
+	return File.separatorChar == '\\'
 }
 
 ["jetty", "tomcat", "undertow"].each { webServer ->

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-ant/build.gradle

@@ -74,7 +74,7 @@ tasks.register("syncAntSources", Sync) {
 tasks.register("antRun", JavaExec) {
 	workingDir = layout.buildDirectory.dir("ant")
 	dependsOn syncTestRepository, syncAntSources, configurations.antDependencies
-	classpath = configurations.antDependencies;
+	classpath = configurations.antDependencies
 	mainClass = "org.apache.tools.ant.launch.Launcher"
 	args = [ "clean", "build" ]
 	systemProperties = [