Merge branch 'main' into 4.0.x

wilkinsona · wilkinsona · commit c2cf60990446 · 2025-06-09T17:01:28.000+01:00
diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle
@@ -151,13 +151,6 @@ bom {
 			]
 		}
 	}
-	library("Micrometer Context Propagation", "1.0.5") {
-		group("io.micrometer") {
-			modules = [
-				"context-propagation"
-			]
-		}
-	}
 	library("MockK", "1.13.5") {
 		group("io.mockk") {
 			modules = [

Original file line number	Diff line number	Diff line change
`@@ -151,13 +151,6 @@ bom {`
`151`	`151`	`]`
`152`	`152`	`}`
`153`	`153`	`}`
`154`		`- library("Micrometer Context Propagation", "1.0.5") {`
`155`		`- group("io.micrometer") {`
`156`		`- modules = [`
`157`		`- "context-propagation"`
`158`		`- ]`
`159`		`- }`
`160`		`- }`
`161`	`154`	`library("MockK", "1.13.5") {`
`162`	`155`	`group("io.mockk") {`
`163`	`156`	`modules = [`