diff --git a/dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle b/dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle index a505f5058c..eaaaf956c7 100644 --- a/dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle +++ b/dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle @@ -1,13 +1,10 @@ -apply plugin: 'version-scan' - -versionScan { - group = "org.mongodb" - module = "mongo-java-driver" - scanMethods = true - versions = "[3.1,)" - verifyPresent = [ - 'com.mongodb.MongoClientOptions$Builder': 'addCommandListener' - ] +muzzle { + pass { + group = "org.mongodb" + module = "mongo-java-driver" + versions = "[3.1,)" + assertInverse = true + } } apply from: "${rootDir}/gradle/java.gradle" @@ -21,7 +18,7 @@ testSets { } dependencies { - compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2' + compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' compile project(':dd-java-agent:agent-tooling') @@ -31,7 +28,7 @@ dependencies { implementation deps.autoservice testCompile project(':dd-trace-ot') - testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2' + testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0' } configurations.latestDepTestCompile { diff --git a/dd-java-agent/instrumentation/mongo-async-3.3/mongo-async-3.3.gradle b/dd-java-agent/instrumentation/mongo-async-3.3/mongo-async-3.3.gradle index 364da95300..df7028ecb5 100644 --- a/dd-java-agent/instrumentation/mongo-async-3.3/mongo-async-3.3.gradle +++ b/dd-java-agent/instrumentation/mongo-async-3.3/mongo-async-3.3.gradle @@ -1,13 +1,11 @@ -apply plugin: 'version-scan' - -versionScan { - group = "org.mongodb" - module = "mongodb-driver-async" - scanMethods = true - versions = "[3.3,)" - verifyPresent = [ - 'com.mongodb.async.client.MongoClientSettings$Builder': 'addCommandListener' - ] +muzzle { + pass { + group = "org.mongodb" + module = "mongodb-driver-async" + versions = "[3.3,)" + extraDependency 'org.mongodb:mongo-java-driver:3.3.0' + assertInverse = true + } } apply from: "${rootDir}/gradle/java.gradle" @@ -17,8 +15,8 @@ dependencies { compile(project(':dd-java-agent:instrumentation:mongo-3.1')) { transitive = false } - compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2' - compileOnly group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.4.2' + compileOnly group: 'org.mongodb', name: 'mongo-java-driver', version: '3.3.0' + compileOnly group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.3.0' compile project(':dd-java-agent:agent-tooling')