Merge branch '3.2.x' into 3.3.x

Closes gh-42440
This commit is contained in:
Phillip Webb
2024-09-24 14:29:09 -07:00
131 changed files with 62 additions and 167 deletions

View File

@@ -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"))