From 16b45b6a9301764755daae06a5d0a522a0d0a874 Mon Sep 17 00:00:00 2001 From: Richard Startin Date: Tue, 21 Apr 2020 09:40:28 +0100 Subject: [PATCH] use etaty/rediscala --- .../rediscala-1.8.0.gradle} | 16 ++++++++-------- .../rediscala/RediscalaClientDecorator.java | 0 .../rediscala/RediscalaInstrumentation.java | 0 .../src/test/groovy/RediscalaClientTest.groovy | 0 settings.gradle | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename dd-java-agent/instrumentation/{rediscala-1.8.1/rediscala-1.8.1.gradle => rediscala-1.8.0/rediscala-1.8.0.gradle} (58%) rename dd-java-agent/instrumentation/{rediscala-1.8.1 => rediscala-1.8.0}/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaClientDecorator.java (100%) rename dd-java-agent/instrumentation/{rediscala-1.8.1 => rediscala-1.8.0}/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java (100%) rename dd-java-agent/instrumentation/{rediscala-1.8.1 => rediscala-1.8.0}/src/test/groovy/RediscalaClientTest.groovy (100%) diff --git a/dd-java-agent/instrumentation/rediscala-1.8.1/rediscala-1.8.1.gradle b/dd-java-agent/instrumentation/rediscala-1.8.0/rediscala-1.8.0.gradle similarity index 58% rename from dd-java-agent/instrumentation/rediscala-1.8.1/rediscala-1.8.1.gradle rename to dd-java-agent/instrumentation/rediscala-1.8.0/rediscala-1.8.0.gradle index aaa20e1345..43f7827f5d 100644 --- a/dd-java-agent/instrumentation/rediscala-1.8.1/rediscala-1.8.1.gradle +++ b/dd-java-agent/instrumentation/rediscala-1.8.0/rediscala-1.8.0.gradle @@ -4,21 +4,21 @@ ext { muzzle { pass { - group = "com.github.Ma27" + group = "com.github.etaty" module = "rediscala_2.11" - versions = "[1.8.1,)" + versions = "[1.8.0,)" assertInverse = true } pass { - group = "com.github.Ma27" + group = "com.github.etaty" module = "rediscala_2.12" - versions = "[1.8.1,)" + versions = "[1.8.0,)" assertInverse = true } pass { - group = "com.github.Ma27" + group = "com.github.etaty" module = "rediscala_2.13" versions = "[1.9.0,)" assertInverse = true @@ -36,10 +36,10 @@ testSets { } dependencies { - compileOnly group: 'com.github.Ma27', name: 'rediscala_2.11', version: '1.8.1' + compileOnly group: 'com.github.etaty', name: 'rediscala_2.11', version: '1.8.0' - testCompile group: 'com.github.Ma27', name: 'rediscala_2.11', version: '1.8.1' + testCompile group: 'com.github.etaty', name: 'rediscala_2.11', version: '1.8.0' testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' - latestDepTestCompile group: 'com.github.Ma27', name: 'rediscala_2.11', version: '+' + latestDepTestCompile group: 'com.github.etaty', name: 'rediscala_2.11', version: '+' } diff --git a/dd-java-agent/instrumentation/rediscala-1.8.1/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaClientDecorator.java b/dd-java-agent/instrumentation/rediscala-1.8.0/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaClientDecorator.java similarity index 100% rename from dd-java-agent/instrumentation/rediscala-1.8.1/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaClientDecorator.java rename to dd-java-agent/instrumentation/rediscala-1.8.0/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaClientDecorator.java diff --git a/dd-java-agent/instrumentation/rediscala-1.8.1/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java b/dd-java-agent/instrumentation/rediscala-1.8.0/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/rediscala-1.8.1/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java rename to dd-java-agent/instrumentation/rediscala-1.8.0/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java diff --git a/dd-java-agent/instrumentation/rediscala-1.8.1/src/test/groovy/RediscalaClientTest.groovy b/dd-java-agent/instrumentation/rediscala-1.8.0/src/test/groovy/RediscalaClientTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/rediscala-1.8.1/src/test/groovy/RediscalaClientTest.groovy rename to dd-java-agent/instrumentation/rediscala-1.8.0/src/test/groovy/RediscalaClientTest.groovy diff --git a/settings.gradle b/settings.gradle index 3bc749fd56..70e04f4566 100644 --- a/settings.gradle +++ b/settings.gradle @@ -126,7 +126,7 @@ include ':dd-java-agent:instrumentation:play-ws-2' include ':dd-java-agent:instrumentation:play-ws-2.1' include ':dd-java-agent:instrumentation:rabbitmq-amqp-2.7' include ':dd-java-agent:instrumentation:ratpack-1.4' -include ':dd-java-agent:instrumentation:rediscala-1.8.1' +include ':dd-java-agent:instrumentation:rediscala-1.8.0' include ':dd-java-agent:instrumentation:reactor-core-3.1' include ':dd-java-agent:instrumentation:rmi' include ':dd-java-agent:instrumentation:rxjava-1'