Merge branch '3.0.x' into 3.1.x

snicoll · snicoll · commit 490c6d744c4c · 2023-08-10T14:50:29.000+02:00
Closes gh-36923
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -210,6 +210,10 @@ bom {
 		}
 	}
 	library("Couchbase Client", "3.4.7") {
+		prohibit {
+			versionRange "3.4.9"
+			because "it contains unshaded io.opentelemetry classes that break our Otel integration"
+		}
 		group("com.couchbase.client") {
 			modules = [
 				"java-client"

Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,10 @@ bom {`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`	`library("Couchbase Client", "3.4.7") {`
	`213`	`+ prohibit {`
	`214`	`+ versionRange "3.4.9"`
	`215`	`+ because "it contains unshaded io.opentelemetry classes that break our Otel integration"`
	`216`	`+ }`
`213`	`217`	`group("com.couchbase.client") {`
`214`	`218`	`modules = [`
`215`	`219`	`"java-client"`