Merge branch '3.2.x' into 3.3.x

Closes gh-42440

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

@@ -3,7 +3,6 @@ plugins {
 	id "org.antora"
 	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

@@ -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-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.antora"
-	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.antora"
-	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-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-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.antora"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.maven-plugin"
 	id "org.springframework.boot.optional-dependencies"
 	id "org.springframework.boot.docker-test"

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"