Merge branch '3.0.x' into 3.1.x

wilkinsona · wilkinsona · commit 5384872cbd8a · 2023-06-21T11:02:47.000+01:00
Closes gh-36003
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1217,6 +1217,10 @@ bom {
 		}
 	}
 	library("RSocket", "1.1.3") {
+		prohibit {
+			versionRange "1.1.4"
+			because "it contains a regression (https://github.com/rsocket/rsocket-java/issues/1092)"
+		}
 		group("io.rsocket") {
 			imports = [
 				"rsocket-bom"

Original file line number	Diff line number	Diff line change
`@@ -1217,6 +1217,10 @@ bom {`
`1217`	`1217`	`}`
`1218`	`1218`	`}`
`1219`	`1219`	`library("RSocket", "1.1.3") {`
	`1220`	`+ prohibit {`
	`1221`	`+ versionRange "1.1.4"`
	`1222`	`+ because "it contains a regression (https://github.com/rsocket/rsocket-java/issues/1092)"`
	`1223`	`+ }`
`1220`	`1224`	`group("io.rsocket") {`
`1221`	`1225`	`imports = [`
`1222`	`1226`	`"rsocket-bom"`