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-project/spring-boot-docs/build.gradle
+++ b/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'
 }