Merge branch '3.0.x' into 3.1.x

mhalbritter · mhalbritter · commit 7506d2db871f · 2023-10-11T13:35:34.000+02:00
Closes gh-37821
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -210,10 +210,6 @@ bom {
 		}
 	}
 	library("Couchbase Client", "3.4.11") {
-		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,10 +210,6 @@ bom {`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`	`library("Couchbase Client", "3.4.11") {`
`213`		`- prohibit {`
`214`		`- versionRange "[3.4.9]"`
`215`		`- because "it contains unshaded io.opentelemetry classes that break our Otel integration"`
`216`		`- }`
`217`	`213`	`group("com.couchbase.client") {`
`218`	`214`	`modules = [`
`219`	`215`	`"java-client"`