From a0f0d45c746aa0b03848e57540b5ffeb2393a0d1 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Mon, 13 Jan 2020 12:10:57 -0800 Subject: [PATCH 1/2] Adjust version compatibility to only 2.x They recently released 3.0.0 which is not compatible with our instrumentation. --- .../instrumentation/couchbase-2.0/couchbase-2.0.gradle | 2 +- .../instrumentation/couchbase-2.6/couchbase-2.6.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/couchbase-2.0/couchbase-2.0.gradle b/dd-java-agent/instrumentation/couchbase-2.0/couchbase-2.0.gradle index 9688f69594..3011663337 100644 --- a/dd-java-agent/instrumentation/couchbase-2.0/couchbase-2.0.gradle +++ b/dd-java-agent/instrumentation/couchbase-2.0/couchbase-2.0.gradle @@ -29,7 +29,7 @@ muzzle { pass { group = 'com.couchbase.client' module = 'java-client' - versions = "[2.7.9,)" + versions = "[2.7.9,3.0.0)" } fail { group = 'com.couchbase.client' diff --git a/dd-java-agent/instrumentation/couchbase-2.6/couchbase-2.6.gradle b/dd-java-agent/instrumentation/couchbase-2.6/couchbase-2.6.gradle index d7b82e2aa5..6de1660a7f 100644 --- a/dd-java-agent/instrumentation/couchbase-2.6/couchbase-2.6.gradle +++ b/dd-java-agent/instrumentation/couchbase-2.6/couchbase-2.6.gradle @@ -34,7 +34,7 @@ muzzle { pass { group = 'com.couchbase.client' module = 'java-client' - versions = "[2.7.9,)" + versions = "[2.7.9,3.0.0)" } fail { group = 'com.couchbase.client' From 77cdd210c684a89f0ca0a1ad634fc3490b555497 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Mon, 13 Jan 2020 12:31:38 -0800 Subject: [PATCH 2/2] Also update latestDepTest ranges. --- .../instrumentation/couchbase-2.0/couchbase-2.0.gradle | 2 +- .../instrumentation/couchbase-2.6/couchbase-2.6.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/couchbase-2.0/couchbase-2.0.gradle b/dd-java-agent/instrumentation/couchbase-2.0/couchbase-2.0.gradle index 3011663337..c2b8259498 100644 --- a/dd-java-agent/instrumentation/couchbase-2.0/couchbase-2.0.gradle +++ b/dd-java-agent/instrumentation/couchbase-2.0/couchbase-2.0.gradle @@ -59,6 +59,6 @@ dependencies { testCompile group: 'com.couchbase.client', name: 'java-client', version: '2.5.0' latestDepTestCompile group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.+' - latestDepTestCompile group: 'com.couchbase.client', name: 'java-client', version: '2.6+' + latestDepTestCompile group: 'com.couchbase.client', name: 'java-client', version: '2.+' latestDepTestCompile group: 'com.couchbase.client', name: 'encryption', version: '+' } diff --git a/dd-java-agent/instrumentation/couchbase-2.6/couchbase-2.6.gradle b/dd-java-agent/instrumentation/couchbase-2.6/couchbase-2.6.gradle index 6de1660a7f..1da26d145a 100644 --- a/dd-java-agent/instrumentation/couchbase-2.6/couchbase-2.6.gradle +++ b/dd-java-agent/instrumentation/couchbase-2.6/couchbase-2.6.gradle @@ -58,6 +58,6 @@ dependencies { testCompile group: 'com.couchbase.client', name: 'encryption', version: '1.0.0' latestDepTestCompile group: 'org.springframework.data', name: 'spring-data-couchbase', version: '3.1+' - latestDepTestCompile group: 'com.couchbase.client', name: 'java-client', version: '2.6+' + latestDepTestCompile group: 'com.couchbase.client', name: 'java-client', version: '2.+' latestDepTestCompile group: 'com.couchbase.client', name: 'encryption', version: '+' }