Merge branch '3.2.x' into 3.3.x

Closes gh-41249
This commit is contained in:
Andy Wilkinson 2024-06-26 17:00:58 +01:00
commit 2dd6c1c3a0

View File

@ -14,7 +14,6 @@ configurations {
dependencies {
compileOnly("org.apache.maven.plugin-tools:maven-plugin-annotations")
compileOnly("org.sonatype.plexus:plexus-build-api")
compileOnly("org.apache.maven:maven-core") {
exclude(group: "javax.annotation", module: "javax.annotation-api")
exclude(group: "javax.inject", module: "javax.inject")
@ -32,6 +31,9 @@ dependencies {
exclude(group: "javax.enterprise", module: "cdi-api")
exclude(group: "javax.inject", module: "javax.inject")
}
implementation("org.sonatype.plexus:plexus-build-api") {
exclude(group: "org.codehaus.plexus:plexus-utils")
}
implementation("org.springframework:spring-core")
implementation("org.springframework:spring-context")
@ -72,8 +74,6 @@ dependencies {
mavenRepository(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "mavenRepository"))
mavenRepository(project(path: ":spring-boot-project:spring-boot-docker-compose", configuration: "mavenRepository"))
runtimeOnly("org.sonatype.plexus:plexus-build-api")
versionProperties(project(path: ":spring-boot-project:spring-boot-dependencies", configuration: "effectiveBom"))
}