Merge branch '3.0.x' into 3.1.x

snicoll · snicoll · commit a15ae2bd0219 · 2023-08-17T16:12:59.000+02:00
Closes gh-37020
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -211,7 +211,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") {
@@ -1222,7 +1222,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
`@@ -211,7 +211,7 @@ bom {`
`211`	`211`	`}`
`212`	`212`	`library("Couchbase Client", "3.4.8") {`
`213`	`213`	`prohibit {`
`214`		`- versionRange "3.4.9"`
	`214`	`+ versionRange "[3.4.9]"`
`215`	`215`	`because "it contains unshaded io.opentelemetry classes that break our Otel integration"`
`216`	`216`	`}`
`217`	`217`	`group("com.couchbase.client") {`
`@@ -1222,7 +1222,7 @@ bom {`
`1222`	`1222`	`}`
`1223`	`1223`	`library("RSocket", "1.1.3") {`
`1224`	`1224`	`prohibit {`
`1225`		`- versionRange "1.1.4"`
	`1225`	`+ versionRange "[1.1.4]"`
`1226`	`1226`	`because "it contains a regression (https://github.com/rsocket/rsocket-java/issues/1092)"`
`1227`	`1227`	`}`
`1228`	`1228`	`group("io.rsocket") {`