Merge branch '3.2.x' into 3.3.x

Closes gh-42440

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"
 }

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/build.gradle

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

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-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"
 }

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

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

spring-boot-tests/spring-boot-integration-tests/spring-boot-sni-tests/build.gradle

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

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

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

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-custom-security/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Actuator custom security smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-log4j2/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Actuator Log4j 2 smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-noweb/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Actuator non-web smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator-ui/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Actuator UI smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Actuator smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 	id "org.springframework.boot.docker-test"
 }
 
@@ -13,6 +12,6 @@ dependencies {
 	dockerTestImplementation("org.awaitility:awaitility")
 	dockerTestImplementation("org.testcontainers:junit-jupiter")
 	dockerTestImplementation("org.testcontainers:rabbitmq")
-	
+
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-amqp"))
 }

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

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

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot AOP smoke test"

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

@@ -1,13 +1,12 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Batch smoke test"
 
 dependencies {
 	implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-batch"))
-	
+
 	runtimeOnly("org.hsqldb:hsqldb")
 
 	testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-bootstrap-registry/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Bootstrap Registry smoke test"

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

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

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/build.gradle

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

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-couchbase/build.gradle

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

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jdbc/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Data JDBC smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Data JPA smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-ldap/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Data LDAP smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-mongo/build.gradle

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

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle

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

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle

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

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Data R2DBC smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-redis/build.gradle

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

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-rest/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Data REST smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot DevTools smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Flyway smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot GraphQL smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot HATEOAS smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Integration smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Jersey smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-jsp/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "war"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Jetty JSP smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty-ssl/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Jetty SSL smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Jetty smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot JPA smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot JUnit Vintage smoke test"

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

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

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Liquibase smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Logback smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-authorization-server/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot OAuth2 Authorization Server smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-client/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot OAuth2 Client smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-resource-server/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot OAuth2 Resource Server smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-parent-context/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot parent context smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot profile smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Prometheus smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-property-validation/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot property validation smoke test"

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

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

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Quartz smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-client/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot reactive OAuth 2 client smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-reactive-oauth2-resource-server/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot reactive OAuth 2 resource server smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot RSocket smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-saml2-service-provider/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot SAML 2 service provider smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-jersey/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot secure Jersey smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-secure-webflux/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot secure WebFlux smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Security smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "war"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Servlet smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Session smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-jdbc/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Session JDBC smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-mongo/build.gradle

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

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-redis/build.gradle

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

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-mongo/build.gradle

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

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-webflux-redis/build.gradle

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

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Simple smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Test no Mockito smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Test smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot TestNG smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-jsp/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "war"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Tomcat JSP smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Tomcat multi-connectors smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-tomcat-ssl/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Tomcat SSL smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Tomcat smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "war"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot traditional deployment smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-undertow-ssl/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Undertow SSL smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Undertow smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "war"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot war smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-application-type/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot web application type smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-freemarker/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot web FreeMarker smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-groovy-templates/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot web Groovy Templates smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-jsp/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "war"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot web JSP smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-method-security/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot web method security smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-mustache/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot web Mustache smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-custom/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot web secure custom smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure-jdbc/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot web secure JDBC smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-secure/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot web secure smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-static/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "war"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot web static smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-web-thymeleaf/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot web Thymeleaf smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-webflux-coroutines/build.gradle

@@ -1,7 +1,6 @@
 plugins {
 	id "org.jetbrains.kotlin.jvm"
 	id "org.jetbrains.kotlin.plugin.spring"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot WebFlux coroutines smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot WebFlux smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot Web Services smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-jetty/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot WebSocket Jetty smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-tomcat/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot WebSocket Tomcat smoke test"

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-websocket-undertow/build.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot WebSocket Undertow smoke test"

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

@@ -1,6 +1,5 @@
 plugins {
 	id "java"
-	id "org.springframework.boot.conventions"
 }
 
 description = "Spring Boot XML smoke test"