Merge branch '3.3.x'

Closes gh-42441
2024-09-24 14:31:40 -07:00
parent 0c1a042173 100bedc07d
commit 7b3077280c
135 changed files with 61 additions and 170 deletions
--- a/spring-boot-system-tests/spring-boot-deployment-tests/build.gradle
+++ b/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"
 }

--- a/spring-boot-system-tests/spring-boot-image-tests/build.gradle
+++ b/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"
 }