Merge branch '2.7.x' into 3.0.x

wilkinsona · wilkinsona · commit 2fd5319eda8a · 2023-06-21T11:02:34.000+01:00
Closes gh-36002
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1170,6 +1170,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
`@@ -1170,6 +1170,10 @@ bom {`
`1170`	`1170`	`}`
`1171`	`1171`	`}`
`1172`	`1172`	`library("RSocket", "1.1.3") {`
	`1173`	`+ prohibit {`
	`1174`	`+ versionRange "1.1.4"`
	`1175`	`+ because "it contains a regression (https://github.com/rsocket/rsocket-java/issues/1092)"`
	`1176`	`+ }`
`1173`	`1177`	`group("io.rsocket") {`
`1174`	`1178`	`imports = [`
`1175`	`1179`	`"rsocket-bom"`