Apply conventions plugin to all subprojects

Closes gh-42438

Author: philwebb

build.gradle

@@ -24,3 +24,7 @@ allprojects {
 		resolutionStrategy.cacheChangingModulesFor 0, "minutes"
 	}
 }
+
+subprojects {
+	apply plugin: "org.springframework.boot.conventions"
+}

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

@@ -68,23 +68,26 @@ private void configure(KotlinCompile compile) {
 
 	private void configureDokkatoo(Project project) {
 		DokkatooExtension dokkatoo = project.getExtensions().getByType(DokkatooExtension.class);
-		dokkatoo.getDokkatooSourceSets().named(SourceSet.MAIN_SOURCE_SET_NAME).configure((sourceSet) -> {
-			sourceSet.getSourceRoots().setFrom(project.file("src/main/kotlin"));
-			sourceSet.getClasspath()
-				.from(project.getExtensions()
-					.getByType(SourceSetContainer.class)
-					.getByName(SourceSet.MAIN_SOURCE_SET_NAME)
-					.getOutput());
-			sourceSet.getExternalDocumentationLinks().create("spring-boot-javadoc", (link) -> {
-				link.getUrl().set(URI.create("https://docs.spring.io/spring-boot/api/java/"));
-				link.getPackageListUrl().set(URI.create("https://docs.spring.io/spring-boot/api/java/element-list"));
-			});
-			sourceSet.getExternalDocumentationLinks().create("spring-framework-javadoc", (link) -> {
-				String url = "https://docs.spring.io/spring-framework/docs/%s/javadoc-api/"
-					.formatted(project.property("springFrameworkVersion"));
-				link.getUrl().set(URI.create(url));
-				link.getPackageListUrl().set(URI.create(url + "/element-list"));
-			});
+		dokkatoo.getDokkatooSourceSets().configureEach((sourceSet) -> {
+			if (SourceSet.MAIN_SOURCE_SET_NAME.equals(sourceSet.getName())) {
+				sourceSet.getSourceRoots().setFrom(project.file("src/main/kotlin"));
+				sourceSet.getClasspath()
+					.from(project.getExtensions()
+						.getByType(SourceSetContainer.class)
+						.getByName(SourceSet.MAIN_SOURCE_SET_NAME)
+						.getOutput());
+				sourceSet.getExternalDocumentationLinks().create("spring-boot-javadoc", (link) -> {
+					link.getUrl().set(URI.create("https://docs.spring.io/spring-boot/api/java/"));
+					link.getPackageListUrl()
+						.set(URI.create("https://docs.spring.io/spring-boot/api/java/element-list"));
+				});
+				sourceSet.getExternalDocumentationLinks().create("spring-framework-javadoc", (link) -> {
+					String url = "https://docs.spring.io/spring-framework/docs/%s/javadoc-api/"
+						.formatted(project.property("springFrameworkVersion"));
+					link.getUrl().set(URI.create(url));
+					link.getPackageListUrl().set(URI.create(url + "/element-list"));
+				});
+			}
 		});
 	}
 

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

@@ -98,23 +98,35 @@ public void apply(Project project) {
 					.add(AutoConfigurationPlugin.AUTO_CONFIGURATION_METADATA_CONFIGURATION_NAME, task.getOutputFile(),
 							(artifact) -> artifact.builtBy(task));
 			});
-			project.getPlugins().withType(ArchitecturePlugin.class, (architecturePlugin) -> {
-				project.getTasks().named("checkArchitectureMain", ArchitectureCheck.class).configure((task) -> {
-					SourceSet main = project.getExtensions()
-						.getByType(JavaPluginExtension.class)
-						.getSourceSets()
-						.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
-					File resourcesDirectory = main.getOutput().getResourcesDir();
-					task.dependsOn(main.getProcessResourcesTaskName());
-					task.getInputs().files(resourcesDirectory).optional().withPathSensitivity(PathSensitivity.RELATIVE);
-					task.getRules()
-						.add(allClassesAnnotatedWithAutoConfigurationShouldBeListedInAutoConfigurationImports(
-								autoConfigurationImports(project, resourcesDirectory)));
-				});
-			});
+			project.getPlugins()
+				.withType(ArchitecturePlugin.class, (plugin) -> configureArchitecturePluginTasks(project));
 		});
 	}
 
+	private void configureArchitecturePluginTasks(Project project) {
+		project.getTasks().configureEach((task) -> {
+			if ("checkArchitectureMain".equals(task.getName()) && task instanceof ArchitectureCheck architectureCheck) {
+				configureCheckArchitectureMain(project, architectureCheck);
+			}
+		});
+	}
+
+	private void configureCheckArchitectureMain(Project project, ArchitectureCheck architectureCheck) {
+		SourceSet main = project.getExtensions()
+			.getByType(JavaPluginExtension.class)
+			.getSourceSets()
+			.getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+		File resourcesDirectory = main.getOutput().getResourcesDir();
+		architectureCheck.dependsOn(main.getProcessResourcesTaskName());
+		architectureCheck.getInputs()
+			.files(resourcesDirectory)
+			.optional()
+			.withPathSensitivity(PathSensitivity.RELATIVE);
+		architectureCheck.getRules()
+			.add(allClassesAnnotatedWithAutoConfigurationShouldBeListedInAutoConfigurationImports(
+					autoConfigurationImports(project, resourcesDirectory)));
+	}
+
 	private ArchRule allClassesAnnotatedWithAutoConfigurationShouldBeListedInAutoConfigurationImports(
 			Provider<AutoConfigurationImports> imports) {
 		return ArchRuleDefinition.classes()

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -3,7 +3,6 @@ plugins {
 	id "org.asciidoctor.jvm.convert"
 	id "org.springframework.boot.auto-configuration"
 	id "org.springframework.boot.configuration-properties"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.optional-dependencies"
 }

spring-boot-project/spring-boot-actuator/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java-library"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.configuration-properties"
 	id "org.springframework.boot.optional-dependencies"
 	id "org.springframework.boot.docker-test"
@@ -11,7 +10,7 @@ description = "Spring Boot Actuator"
 
 dependencies {
 	api(project(":spring-boot-project:spring-boot"))
-	
+
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))

spring-boot-project/spring-boot-autoconfigure/build.gradle

@@ -3,7 +3,6 @@ plugins {
 	id "org.jetbrains.kotlin.jvm"
 	id "org.springframework.boot.auto-configuration"
 	id "org.springframework.boot.configuration-properties"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.docker-test"
 	id "org.springframework.boot.optional-dependencies"

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "org.springframework.boot.bom"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 }
 

spring-boot-project/spring-boot-devtools/build.gradle

@@ -2,7 +2,6 @@ plugins {
 	id "java-library"
 	id "org.springframework.boot.auto-configuration"
 	id "org.springframework.boot.configuration-properties"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.integration-test"
 	id "org.springframework.boot.optional-dependencies"

spring-boot-project/spring-boot-docker-compose/build.gradle

@@ -1,7 +1,6 @@
 plugins {
 	id "java-library"
 	id "org.springframework.boot.configuration-properties"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.docker-test"
 	id "org.springframework.boot.optional-dependencies"
@@ -17,7 +16,7 @@ dependencies {
 	dockerTestImplementation("org.awaitility:awaitility")
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
 	dockerTestImplementation("org.testcontainers:testcontainers")
-	
+
 	dockerTestRuntimeOnly("com.microsoft.sqlserver:mssql-jdbc")
 	dockerTestRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc")
 	dockerTestRuntimeOnly("io.r2dbc:r2dbc-mssql")

spring-boot-project/spring-boot-docs/build.gradle

@@ -2,7 +2,6 @@ plugins {
 	id "dev.adamko.dokkatoo-html"
 	id "java"
 	id "org.asciidoctor.jvm.convert"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 	id 'org.jetbrains.kotlin.jvm'
 }

spring-boot-project/spring-boot-parent/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "org.springframework.boot.bom"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 }
 

spring-boot-project/spring-boot-starters/spring-boot-starter-parent/build.gradle

@@ -1,5 +1,4 @@
 plugins {
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.maven-repository"
 }

spring-boot-project/spring-boot-test-autoconfigure/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java-library"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.docker-test"
 	id "org.springframework.boot.optional-dependencies"

spring-boot-project/spring-boot-test/build.gradle

@@ -2,7 +2,6 @@ plugins {
 	id "dev.adamko.dokkatoo-html"
 	id "java-library"
 	id "org.jetbrains.kotlin.jvm"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.optional-dependencies"
 }

spring-boot-project/spring-boot-testcontainers/build.gradle

@@ -2,7 +2,6 @@ plugins {
 	id "java-library"
 	id "org.springframework.boot.auto-configuration"
 	id "org.springframework.boot.configuration-properties"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.docker-test"
 	id "org.springframework.boot.optional-dependencies"

spring-boot-project/spring-boot-tools/spring-boot-antlib/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java-library"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 }
 

spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java-library"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.annotation-processor"
 }

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java-library"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.docker-test"
 }

spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle

@@ -2,7 +2,6 @@ plugins {
 	id "java"
 	id "eclipse"
 	id "org.springframework.boot.deployed"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.integration-test"
 }
 

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata-changelog-generator/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Configuration Metadata Changelog Generator"

spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java-library"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 }
 

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java-library"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.annotation-processor"
 }

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

@@ -6,7 +6,6 @@ plugins {
 	id "java-gradle-plugin"
 	id "maven-publish"
 	id "org.asciidoctor.jvm.convert"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.docker-test"
 	id "org.springframework.boot.maven-repository"
 	id "org.springframework.boot.optional-dependencies"

spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java-library"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Gradle Testing Support"

spring-boot-project/spring-boot-tools/spring-boot-jarmode-layertools/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java-library"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 }
 

spring-boot-project/spring-boot-tools/spring-boot-loader-classic/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java-library"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 }
 
@@ -22,6 +21,8 @@ dependencies {
 	testRuntimeOnly("org.springframework:spring-webmvc")
 }
 
-tasks.named("checkArchitectureMain").configure {
-	prohibitObjectsRequireNonNull = false
+tasks.configureEach {
+	if ("checkArchitectureMain".equals(it.name)) {
+		prohibitObjectsRequireNonNull = false
+	}
 }

spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java-library"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 }
 

spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java-library"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 }
 
@@ -22,6 +21,8 @@ dependencies {
 	testRuntimeOnly("org.springframework:spring-webmvc")
 }
 
-tasks.named("checkArchitectureMain").configure {
-	prohibitObjectsRequireNonNull = false
+tasks.configureEach {
+	if ("checkArchitectureMain".equals(it.name)) {
+		prohibitObjectsRequireNonNull = false
+	}
 }

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "org.asciidoctor.jvm.convert"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.maven-plugin"
 	id "org.springframework.boot.optional-dependencies"
 	id "org.springframework.boot.docker-test"
@@ -26,7 +25,7 @@ dependencies {
 		exclude(group: "javax.enterprise", module: "cdi-api")
 		exclude(group: "javax.inject", module: "javax.inject")
 	}
-	
+
 	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
 	dockerTestImplementation("org.apache.maven.shared:maven-invoker") {
 		exclude(group: "javax.inject", module: "javax.inject")

spring-boot-project/spring-boot-tools/spring-boot-properties-migrator/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.deployed"
 }
 

spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java-library"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.optional-dependencies"
 }
 

spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java-library"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.optional-dependencies"
 }
 

spring-boot-project/spring-boot/build.gradle

@@ -2,7 +2,6 @@ plugins {
 	id "dev.adamko.dokkatoo-html"
 	id "java-library"
 	id "org.jetbrains.kotlin.jvm"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.configuration-properties"
 	id "org.springframework.boot.deployed"
 	id "org.springframework.boot.optional-dependencies"

spring-boot-system-tests/spring-boot-deployment-tests/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "war"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.system-test"
 }
 

spring-boot-system-tests/spring-boot-image-tests/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id 'java-gradle-plugin'
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.system-test"
 }
 

spring-boot-tests/spring-boot-integration-tests/spring-boot-configuration-processor-tests/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Configuration Processor Tests"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.docker-test"
 	id "de.undercouch.download"
 }