Merge branch '3.2.x' into 3.3.x

Closes gh-42440
2024-09-24 14:29:09 -07:00
parent de2e5eeb22 ad72411e2b
commit 100bedc07d
131 changed files with 62 additions and 167 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle
+++ b/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"
 }