From 0851dc4826a2b91e1e9d9624e5eb5575192e6891 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Tue, 21 May 2019 08:39:28 -0400 Subject: [PATCH] Undo Couchbase gradle hack Looks like 2.7.5 has now fully propagated through the mirrors so we can revert hack that made things compile. --- .../couchbase-2.0/couchbase-2.0.gradle | 17 ++++------------- 1 file changed, 4 insertions(+), 13 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 15960d93d8..f7d0d30511 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 @@ -17,15 +17,8 @@ muzzle { pass { group = 'com.couchbase.client' module = 'java-client' - // Looks like 2.7.5 was just released and didn't sync up with mirrors properly causing build failures - // TODO: remove this on a few days. - versions = "[2.0.0,2.7.5)" -// assertInverse = true - } - fail { - group = 'com.couchbase.client' - module = 'java-client' - versions = "(,2.0.0)" + versions = "[2.0.0,)" + assertInverse = true } fail { group = 'com.couchbase.client' @@ -53,8 +46,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.+' - // Looks like 2.7.5 was just released and didn't sync up with mirrors properly causing build failures - // TODO: remove this on a few days. - latestDepTestCompile group: 'com.couchbase.client', name: 'java-client', version: '2.7.4' - latestDepTestCompile group: 'com.couchbase.client', name: 'encryption', version: '1.0.0' + latestDepTestCompile group: 'com.couchbase.client', name: 'java-client', version: '2.6+' + latestDepTestCompile group: 'com.couchbase.client', name: 'encryption', version: '+' }