Merge branch '3.0.x' into 3.1.x

Closes gh-36923
1 year ago · 490c6d744c
parent d48aa806c2 bcc904cc1c
commit 490c6d744c
1 changed files with 4 additions and 0 deletions
--- 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"