Merge branch '3.0.x' into 3.1.x

wilkinsona · wilkinsona · commit 20cfc3c9d0fa · 2023-07-05T09:19:49.000+01:00
Closes gh-36235
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1367,12 +1367,8 @@ bom {
 	}
 	library("Spring AMQP", "3.0.5") {
 		group("org.springframework.amqp") {
-			modules = [
-				"spring-amqp",
-				"spring-rabbit",
-				"spring-rabbit-stream",
-				"spring-rabbit-junit",
-				"spring-rabbit-test"
+			imports = [
+				"spring-amqp-bom"
 			]
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1367,12 +1367,8 @@ bom {`
`1367`	`1367`	`}`
`1368`	`1368`	`library("Spring AMQP", "3.0.5") {`
`1369`	`1369`	`group("org.springframework.amqp") {`
`1370`		`- modules = [`
`1371`		`- "spring-amqp",`
`1372`		`- "spring-rabbit",`
`1373`		`- "spring-rabbit-stream",`
`1374`		`- "spring-rabbit-junit",`
`1375`		`- "spring-rabbit-test"`
	`1370`	`+ imports = [`
	`1371`	`+ "spring-amqp-bom"`
`1376`	`1372`	`]`
`1377`	`1373`	`}`
`1378`	`1374`	`}`