Merge branch '2.7.x' into 3.0.x

snicoll · snicoll · commit 87569a0d170b · 2023-08-17T16:12:11.000+02:00
Closes gh-37019
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -175,7 +175,7 @@ bom {
 	}
 	library("Couchbase Client", "3.4.8") {
 		prohibit {
-			versionRange "3.4.9"
+			versionRange "[3.4.9]"
 			because "it contains unshaded io.opentelemetry classes that break our Otel integration"
 		}
 		group("com.couchbase.client") {
@@ -1175,7 +1175,7 @@ bom {
 	}
 	library("RSocket", "1.1.3") {
 		prohibit {
-			versionRange "1.1.4"
+			versionRange "[1.1.4]"
 			because "it contains a regression (https://github.com/rsocket/rsocket-java/issues/1092)"
 		}
 		group("io.rsocket") {

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ bom {`
`175`	`175`	`}`
`176`	`176`	`library("Couchbase Client", "3.4.8") {`
`177`	`177`	`prohibit {`
`178`		`- versionRange "3.4.9"`
	`178`	`+ versionRange "[3.4.9]"`
`179`	`179`	`because "it contains unshaded io.opentelemetry classes that break our Otel integration"`
`180`	`180`	`}`
`181`	`181`	`group("com.couchbase.client") {`
`@@ -1175,7 +1175,7 @@ bom {`
`1175`	`1175`	`}`
`1176`	`1176`	`library("RSocket", "1.1.3") {`
`1177`	`1177`	`prohibit {`
`1178`		`- versionRange "1.1.4"`
	`1178`	`+ versionRange "[1.1.4]"`
`1179`	`1179`	`because "it contains a regression (https://github.com/rsocket/rsocket-java/issues/1092)"`
`1180`	`1180`	`}`
`1181`	`1181`	`group("io.rsocket") {`