Merge branch '3.2.x' into 3.3.x

wilkinsona · wilkinsona · commit 7f2e8f85aea6 · 2024-06-28T11:40:48.000+01:00
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
@@ -42,7 +42,7 @@ dependencies {
 		exclude(group: "javax.inject", module: "javax.inject")
 	}
 	implementation("org.sonatype.plexus:plexus-build-api") {
-		exclude(group: "org.codehaus.plexus:plexus-utils")
+		exclude(group: "org.codehaus.plexus", module: "plexus-utils")
 	}
 	implementation("org.springframework:spring-core")
 	implementation("org.springframework:spring-context")

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ dependencies {`
`42`	`42`	`exclude(group: "javax.inject", module: "javax.inject")`
`43`	`43`	`}`
`44`	`44`	`implementation("org.sonatype.plexus:plexus-build-api") {`
`45`		`- exclude(group: "org.codehaus.plexus:plexus-utils")`
	`45`	`+ exclude(group: "org.codehaus.plexus", module: "plexus-utils")`
`46`	`46`	`}`
`47`	`47`	`implementation("org.springframework:spring-core")`
`48`	`48`	`implementation("org.springframework:spring-context")`