Merge branch '2.6.x' into 2.7.x

wilkinsona · wilkinsona · commit 2848593caaed · 2022-11-21T17:47:40.000Z
Closes gh-33133
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1740,10 +1740,7 @@ bom {
 			]
 		}
 	}
-	library("Spring Kafka", "2.8.11-SNAPSHOT") {
-		prohibit("[3.0.0-M1,)") {
-			because "it uses Spring Framework 6"
-		}
+	library("Spring Kafka", "2.8.11") {
 		group("org.springframework.kafka") {
 			modules = [
 				"spring-kafka",

Original file line number	Diff line number	Diff line change
`@@ -1740,10 +1740,7 @@ bom {`
`1740`	`1740`	`]`
`1741`	`1741`	`}`
`1742`	`1742`	`}`
`1743`		`- library("Spring Kafka", "2.8.11-SNAPSHOT") {`
`1744`		`- prohibit("[3.0.0-M1,)") {`
`1745`		`- because "it uses Spring Framework 6"`
`1746`		`- }`
	`1743`	`+ library("Spring Kafka", "2.8.11") {`
`1747`	`1744`	`group("org.springframework.kafka") {`
`1748`	`1745`	`modules = [`
`1749`	`1746`	`"spring-kafka",`