Upgrade to Gradle 8.12

Closes gh-43649

Author: wilkinsona

build.gradle

@@ -8,7 +8,7 @@ description = "Spring Boot Build"
 defaultTasks 'build'
 
 allprojects {
-	group "org.springframework.boot"
+	group = "org.springframework.boot"
 }
 
 subprojects {
@@ -18,10 +18,14 @@ subprojects {
 		mavenCentral()
 		spring.mavenRepositories()
 		if (version.contains('-')) {
-			maven { url "https://repo.spring.io/milestone" }
+			maven {
+				url = "https://repo.spring.io/milestone"
+			}
 		}
 		if (version.endsWith('-SNAPSHOT')) {
-			maven { url "https://repo.spring.io/snapshot" }
+			maven {
+				url = "https://repo.spring.io/snapshot"
+			}
 		}
 	}
 

buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 the original author or authors.
+ * Copyright 2023-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,7 @@
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.Copy;
 import org.gradle.api.tasks.TaskContainer;
+import org.gradle.api.tasks.TaskProvider;
 
 import org.springframework.boot.build.antora.AntoraAsciidocAttributes;
 import org.springframework.boot.build.antora.GenerateAntoraPlaybook;
@@ -75,16 +76,16 @@ void apply(Project project) {
 	}
 
 	private void apply(Project project, AntoraPlugin antoraPlugin) {
-		ExtractVersionConstraints dependencyVersionsTask = addDependencyVersionsTask(project);
+		TaskProvider<ExtractVersionConstraints> dependencyVersionsTask = addDependencyVersionsTask(project);
 		project.getPlugins().apply(GenerateAntoraYmlPlugin.class);
 		TaskContainer tasks = project.getTasks();
-		GenerateAntoraPlaybook generateAntoraPlaybookTask = tasks.create(GENERATE_ANTORA_PLAYBOOK_TASK_NAME,
-				GenerateAntoraPlaybook.class);
-		configureGenerateAntoraPlaybookTask(project, generateAntoraPlaybookTask);
-		Copy copyAntoraPackageJsonTask = tasks.create("copyAntoraPackageJson", Copy.class);
-		configureCopyAntoraPackageJsonTask(project, copyAntoraPackageJsonTask);
-		NpmInstallTask npmInstallTask = tasks.create("antoraNpmInstall", NpmInstallTask.class);
-		configureNpmInstallTask(project, npmInstallTask, copyAntoraPackageJsonTask);
+		TaskProvider<GenerateAntoraPlaybook> generateAntoraPlaybookTask = tasks.register(
+				GENERATE_ANTORA_PLAYBOOK_TASK_NAME, GenerateAntoraPlaybook.class,
+				(task) -> configureGenerateAntoraPlaybookTask(project, task));
+		TaskProvider<Copy> copyAntoraPackageJsonTask = tasks.register("copyAntoraPackageJson", Copy.class,
+				(task) -> configureCopyAntoraPackageJsonTask(project, task));
+		TaskProvider<NpmInstallTask> npmInstallTask = tasks.register("antoraNpmInstall", NpmInstallTask.class,
+				(task) -> configureNpmInstallTask(project, task, copyAntoraPackageJsonTask));
 		tasks.withType(GenerateAntoraYmlTask.class, (generateAntoraYmlTask) -> configureGenerateAntoraYmlTask(project,
 				generateAntoraYmlTask, dependencyVersionsTask));
 		tasks.withType(AntoraTask.class,
@@ -106,7 +107,8 @@ private void configureCopyAntoraPackageJsonTask(Project project, Copy copyAntora
 			.into(getNodeProjectDir(project));
 	}
 
-	private void configureNpmInstallTask(Project project, NpmInstallTask npmInstallTask, Copy copyAntoraPackageJson) {
+	private void configureNpmInstallTask(Project project, NpmInstallTask npmInstallTask,
+			TaskProvider<Copy> copyAntoraPackageJson) {
 		npmInstallTask.dependsOn(copyAntoraPackageJson);
 		Map<String, String> environment = new HashMap<>();
 		environment.put("npm_config_omit", "optional");
@@ -115,14 +117,14 @@ private void configureNpmInstallTask(Project project, NpmInstallTask npmInstallT
 		npmInstallTask.getNpmCommand().set(List.of("ci", "--silent", "--no-progress"));
 	}
 
-	private ExtractVersionConstraints addDependencyVersionsTask(Project project) {
+	private TaskProvider<ExtractVersionConstraints> addDependencyVersionsTask(Project project) {
 		return project.getTasks()
-			.create("dependencyVersions", ExtractVersionConstraints.class,
+			.register("dependencyVersions", ExtractVersionConstraints.class,
 					(task) -> task.enforcedPlatform(DEPENDENCIES_PATH));
 	}
 
 	private void configureGenerateAntoraYmlTask(Project project, GenerateAntoraYmlTask generateAntoraYmlTask,
-			ExtractVersionConstraints dependencyVersionsTask) {
+			TaskProvider<ExtractVersionConstraints> dependencyVersionsTask) {
 		generateAntoraYmlTask.getOutputs().doNotCacheIf("getAsciidocAttributes() changes output", (task) -> true);
 		generateAntoraYmlTask.dependsOn(dependencyVersionsTask);
 		generateAntoraYmlTask.setProperty("componentName", "boot");
@@ -149,17 +151,16 @@ private void configureGenerateAntoraYmlTask(Project project, GenerateAntoraYmlTa
 	}
 
 	private Provider<Map<String, String>> getAsciidocAttributes(Project project,
-			ExtractVersionConstraints dependencyVersionsTask) {
-		return project.provider(() -> {
+			TaskProvider<ExtractVersionConstraints> dependencyVersionsTask) {
+		return dependencyVersionsTask.map((task) -> task.getVersionConstraints()).map((constraints) -> {
 			BomExtension bom = (BomExtension) project.project(DEPENDENCIES_PATH).getExtensions().getByName("bom");
-			Map<String, String> dependencyVersions = dependencyVersionsTask.getVersionConstraints();
-			AntoraAsciidocAttributes attributes = new AntoraAsciidocAttributes(project, bom, dependencyVersions);
-			return attributes.get();
+			return new AntoraAsciidocAttributes(project, bom, constraints).get();
 		});
 	}
 
-	private void configureAntoraTask(Project project, AntoraTask antoraTask, NpmInstallTask npmInstallTask,
-			GenerateAntoraPlaybook generateAntoraPlaybookTask) {
+	private void configureAntoraTask(Project project, AntoraTask antoraTask,
+			TaskProvider<NpmInstallTask> npmInstallTask,
+			TaskProvider<GenerateAntoraPlaybook> generateAntoraPlaybookTask) {
 		antoraTask.setGroup("Documentation");
 		antoraTask.dependsOn(npmInstallTask, generateAntoraPlaybookTask);
 		antoraTask.setPlaybook("antora-playbook.yml");

buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,6 +44,7 @@
 import org.gradle.api.plugins.quality.CheckstylePlugin;
 import org.gradle.api.tasks.SourceSet;
 import org.gradle.api.tasks.SourceSetContainer;
+import org.gradle.api.tasks.TaskProvider;
 import org.gradle.api.tasks.bundling.Jar;
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.api.tasks.javadoc.Javadoc;
@@ -126,11 +127,12 @@ void apply(Project project) {
 	}
 
 	private void configureJarManifestConventions(Project project) {
-		ExtractResources extractLegalResources = project.getTasks()
-			.create("extractLegalResources", ExtractResources.class);
-		extractLegalResources.getDestinationDirectory().set(project.getLayout().getBuildDirectory().dir("legal"));
-		extractLegalResources.getResourceNames().set(Arrays.asList("LICENSE.txt", "NOTICE.txt"));
-		extractLegalResources.getProperties().put("version", project.getVersion().toString());
+		TaskProvider<ExtractResources> extractLegalResources = project.getTasks()
+			.register("extractLegalResources", ExtractResources.class, (task) -> {
+				task.getDestinationDirectory().set(project.getLayout().getBuildDirectory().dir("legal"));
+				task.getResourceNames().set(Arrays.asList("LICENSE.txt", "NOTICE.txt"));
+				task.getProperties().put("version", project.getVersion().toString());
+			});
 		SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
 		Set<String> sourceJarTaskNames = sourceSets.stream()
 			.map(SourceSet::getSourcesJarTaskName)
@@ -295,10 +297,10 @@ private void createProhibitedDependenciesChecks(Project project, String... confi
 	}
 
 	private void createProhibitedDependenciesCheck(Configuration classpath, Project project) {
-		CheckClasspathForProhibitedDependencies checkClasspathForProhibitedDependencies = project.getTasks()
-			.create("check" + StringUtils.capitalize(classpath.getName() + "ForProhibitedDependencies"),
-					CheckClasspathForProhibitedDependencies.class);
-		checkClasspathForProhibitedDependencies.setClasspath(classpath);
+		TaskProvider<CheckClasspathForProhibitedDependencies> checkClasspathForProhibitedDependencies = project
+			.getTasks()
+			.register("check" + StringUtils.capitalize(classpath.getName() + "ForProhibitedDependencies"),
+					CheckClasspathForProhibitedDependencies.class, (task) -> task.setClasspath(classpath));
 		project.getTasks().getByName(JavaBasePlugin.CHECK_TASK_NAME).dependsOn(checkClasspathForProhibitedDependencies);
 	}
 

buildSrc/src/main/java/org/springframework/boot/build/autoconfigure/AutoConfigurationPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,7 +86,7 @@ public void apply(Project project) {
 				.add(project.getDependencies()
 					.project(Collections.singletonMap("path",
 							":spring-boot-project:spring-boot-tools:spring-boot-configuration-processor")));
-			project.getTasks().create("autoConfigurationMetadata", AutoConfigurationMetadata.class, (task) -> {
+			project.getTasks().register("autoConfigurationMetadata", AutoConfigurationMetadata.class, (task) -> {
 				SourceSet main = project.getExtensions()
 					.getByType(JavaPluginExtension.class)
 					.getSourceSets()

buildSrc/src/main/java/org/springframework/boot/build/bom/BomExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,6 +54,7 @@
 import org.gradle.api.publish.maven.tasks.GenerateMavenPom;
 import org.gradle.api.tasks.Sync;
 import org.gradle.api.tasks.TaskExecutionException;
+import org.gradle.api.tasks.TaskProvider;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
@@ -134,52 +135,56 @@ public void effectiveBomArtifact() {
 		this.project.getTasks()
 			.matching((task) -> task.getName().equals(DeployedPlugin.GENERATE_POM_TASK_NAME))
 			.all((task) -> {
-				Sync syncBom = this.project.getTasks().create("syncBom", Sync.class);
-				syncBom.dependsOn(task);
 				File generatedBomDir = this.project.getLayout()
 					.getBuildDirectory()
 					.dir("generated/bom")
 					.get()
 					.getAsFile();
-				syncBom.setDestinationDir(generatedBomDir);
-				syncBom.from(((GenerateMavenPom) task).getDestination(), (pom) -> pom.rename((name) -> "pom.xml"));
-				try {
-					String settingsXmlContent = FileCopyUtils
-						.copyToString(new InputStreamReader(
-								getClass().getClassLoader().getResourceAsStream("effective-bom-settings.xml"),
-								StandardCharsets.UTF_8))
-						.replace("localRepositoryPath",
-								this.project.getLayout()
-									.getBuildDirectory()
-									.dir("local-m2-repository")
-									.get()
-									.getAsFile()
-									.getAbsolutePath());
-					syncBom.from(this.project.getResources().getText().fromString(settingsXmlContent),
+				TaskProvider<Sync> syncBom = this.project.getTasks().register("syncBom", Sync.class, (sync) -> {
+					sync.dependsOn(task);
+					sync.setDestinationDir(generatedBomDir);
+					sync.from(((GenerateMavenPom) task).getDestination(), (pom) -> pom.rename((name) -> "pom.xml"));
+					sync.from(this.project.getResources().getText().fromString(loadSettingsXml()),
 							(settingsXml) -> settingsXml.rename((name) -> "settings.xml"));
-				}
-				catch (IOException ex) {
-					throw new GradleException("Failed to prepare settings.xml", ex);
-				}
-				MavenExec generateEffectiveBom = this.project.getTasks()
-					.create("generateEffectiveBom", MavenExec.class);
-				generateEffectiveBom.getProjectDir().set(generatedBomDir);
+				});
 				File effectiveBom = this.project.getLayout()
 					.getBuildDirectory()
 					.file("generated/effective-bom/" + this.project.getName() + "-effective-bom.xml")
 					.get()
 					.getAsFile();
-				generateEffectiveBom.args("--settings", "settings.xml", "help:effective-pom",
-						"-Doutput=" + effectiveBom);
-				generateEffectiveBom.dependsOn(syncBom);
-				generateEffectiveBom.getOutputs().file(effectiveBom);
-				generateEffectiveBom.doLast(new StripUnrepeatableOutputAction(effectiveBom));
+				TaskProvider<MavenExec> generateEffectiveBom = this.project.getTasks()
+					.register("generateEffectiveBom", MavenExec.class, (maven) -> {
+						maven.getProjectDir().set(generatedBomDir);
+						maven.args("--settings", "settings.xml", "help:effective-pom", "-Doutput=" + effectiveBom);
+						maven.dependsOn(syncBom);
+						maven.getOutputs().file(effectiveBom);
+						maven.doLast(new StripUnrepeatableOutputAction(effectiveBom));
+					});
 				this.project.getArtifacts()
 					.add(effectiveBomConfiguration.getName(), effectiveBom,
 							(artifact) -> artifact.builtBy(generateEffectiveBom));
 			});
 	}
 
+	private String loadSettingsXml() {
+		try {
+			return FileCopyUtils
+				.copyToString(new InputStreamReader(
+						getClass().getClassLoader().getResourceAsStream("effective-bom-settings.xml"),
+						StandardCharsets.UTF_8))
+				.replace("localRepositoryPath",
+						this.project.getLayout()
+							.getBuildDirectory()
+							.dir("local-m2-repository")
+							.get()
+							.getAsFile()
+							.getAbsolutePath());
+		}
+		catch (IOException ex) {
+			throw new GradleException("Failed to prepare settings.xml", ex);
+		}
+	}
+
 	private String createDependencyNotation(String groupId, String artifactId, DependencyVersion version) {
 		return groupId + ":" + artifactId + ":" + version;
 	}

buildSrc/src/main/java/org/springframework/boot/build/bom/BomPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 import org.gradle.api.publish.PublishingExtension;
 import org.gradle.api.publish.maven.MavenPom;
 import org.gradle.api.publish.maven.MavenPublication;
+import org.gradle.api.tasks.TaskProvider;
 
 import org.springframework.boot.build.DeployedPlugin;
 import org.springframework.boot.build.MavenRepositoryPlugin;
@@ -61,10 +62,10 @@ public void apply(Project project) {
 		javaPlatform.allowDependencies();
 		createApiEnforcedConfiguration(project);
 		BomExtension bom = project.getExtensions().create("bom", BomExtension.class, project);
-		CheckBom checkBom = project.getTasks().create("bomrCheck", CheckBom.class, bom);
+		TaskProvider<CheckBom> checkBom = project.getTasks().register("bomrCheck", CheckBom.class, bom);
 		project.getTasks().named("check").configure((check) -> check.dependsOn(checkBom));
-		project.getTasks().create("bomrUpgrade", UpgradeBom.class, bom);
-		project.getTasks().create("moveToSnapshots", MoveToSnapshots.class, bom);
+		project.getTasks().register("bomrUpgrade", UpgradeBom.class, bom);
+		project.getTasks().register("moveToSnapshots", MoveToSnapshots.class, bom);
 		project.getTasks().register("checkLinks", CheckLinks.class, bom);
 		new PublishingCustomizer(project, bom).customize();
 	}