Fix version upgrading for latestDepTests
MODIFY
dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle
dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle
@@ -39,6 +39,10 @@ dependencies {
testCompile project(':dd-java-agent:testing')
testCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
testCompile group: 'org.cassandraunit', name: 'cassandra-unit', version: '3.1.3.2'
+}
- latestDepTestCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '+'
+configurations.latestDepTestCompile {
+ resolutionStrategy {
+ force group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '+'
+ }
}

MODIFY
dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle
dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle
@@ -35,6 +35,10 @@ dependencies {
testCompile project(':dd-java-agent:instrumentation:java-concurrent')
testCompile project(':dd-java-agent:instrumentation:trace-annotation')
testCompile group: 'com.netflix.hystrix', name: 'hystrix-core', version: '1.4.0'
+}
- latestDepTestCompile group: 'com.netflix.hystrix', name: 'hystrix-core', version: '+'
+configurations.latestDepTestCompile {
+ resolutionStrategy {
+ force group: 'com.netflix.hystrix', name: 'hystrix-core', version: '+'
+ }
}

MODIFY
dd-java-agent/instrumentation/jedis-1.4/jedis-1.4.gradle
dd-java-agent/instrumentation/jedis-1.4/jedis-1.4.gradle
@@ -36,3 +36,9 @@ dependencies {
latestDepTestCompile group: 'redis.clients', name: 'jedis', version: '+'
}
+
+configurations.latestDepTestCompile {
+ resolutionStrategy {
+ force group: 'redis.clients', name: 'jedis', version: '+'
+ }
+}

MODIFY
dd-java-agent/instrumentation/jetty-8/jetty-8.gradle
dd-java-agent/instrumentation/jetty-8/jetty-8.gradle
@@ -35,7 +35,11 @@ dependencies {
testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901'
testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
+}
- latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '+'
- latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '+'
+configurations.latestDepTestCompile {
+ resolutionStrategy {
+ force group: 'org.eclipse.jetty', name: 'jetty-server', version: '+'
+ force group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '+'
+ }
}

MODIFY
dd-java-agent/instrumentation/kafka-clients-0.11/kafka-clients-0.11.gradle
dd-java-agent/instrumentation/kafka-clients-0.11/kafka-clients-0.11.gradle
@@ -35,8 +35,12 @@ dependencies {
testCompile group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
testCompile group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE'
testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
+}
- latestDepTestCompile group: 'org.apache.kafka', name: 'kafka-clients', version: '+'
- latestDepTestCompile group: 'org.springframework.kafka', name: 'spring-kafka', version: '+'
- latestDepTestCompile group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '+'
+configurations.latestDepTestCompile {
+ resolutionStrategy {
+ force group: 'org.apache.kafka', name: 'kafka-clients', version: '+'
+ force group: 'org.springframework.kafka', name: 'spring-kafka', version: '+'
+ force group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '+'
+ }
}

MODIFY
dd-java-agent/instrumentation/kafka-streams-0.11/kafka-streams-0.11.gradle
dd-java-agent/instrumentation/kafka-streams-0.11/kafka-streams-0.11.gradle
@@ -39,9 +39,13 @@ dependencies {
testCompile group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
testCompile group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE'
testCompile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
+}
- latestDepTestCompile group: 'org.apache.kafka', name: 'kafka-clients', version: '+'
- latestDepTestCompile group: 'org.apache.kafka', name: 'kafka-streams', version: '+'
- latestDepTestCompile group: 'org.springframework.kafka', name: 'spring-kafka', version: '+'
- latestDepTestCompile group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '+'
+configurations.latestDepTestCompile {
+ resolutionStrategy {
+ force group: 'org.apache.kafka', name: 'kafka-clients', version: '+'
+ force group: 'org.apache.kafka', name: 'kafka-streams', version: '+'
+ force group: 'org.springframework.kafka', name: 'spring-kafka', version: '+'
+ force group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '+'
+ }
}

MODIFY
dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle
dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle
@@ -32,6 +32,10 @@ dependencies {
testCompile project(':dd-trace-ot')
testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2'
+}
- latestDepTestCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '+'
+configurations.latestDepTestCompile {
+ resolutionStrategy {
+ force group: 'org.mongodb', name: 'mongo-java-driver', version: '+'
+ }
}

MODIFY
dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle
dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle
@@ -37,6 +37,10 @@ dependencies {
testCompile project(':dd-java-agent:testing')
testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0'
+}
- latestDepTestCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '+'
+configurations.latestDepTestCompile {
+ resolutionStrategy {
+ force group: 'com.squareup.okhttp3', name: 'okhttp', version: '+'
+ }
}

MODIFY
dd-java-agent/instrumentation/ratpack-1.4/ratpack-1.4.gradle
dd-java-agent/instrumentation/ratpack-1.4/ratpack-1.4.gradle
@@ -59,8 +59,12 @@ dependencies {
testCompile group: 'io.ratpack', name: 'ratpack-test', version: '1.4.0'
testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
+}
- latestDepTestCompile group: 'io.ratpack', name: 'ratpack-test', version: '+'
+configurations.latestDepTestCompile {
+ resolutionStrategy {
+ force group: 'io.ratpack', name: 'ratpack-test', version: '+'
+ }
}
testJava8Only += '**/RatpackTest.class'

MODIFY
dd-java-agent/instrumentation/servlet-3/servlet-3.gradle
dd-java-agent/instrumentation/servlet-3/servlet-3.gradle
@@ -40,9 +40,13 @@ dependencies {
testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '8.0.41'
testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
+}
- latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '+'
- latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '+'
- latestDepTestCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '+'
- latestDepTestCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '+'
+configurations.latestDepTestCompile {
+ resolutionStrategy {
+ force group: 'org.eclipse.jetty', name: 'jetty-server', version: '+'
+ force group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '+'
+ force group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '+'
+ force group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '+'
+ }
}

MODIFY
dd-java-agent/instrumentation/sparkjava-2.4/sparkjava-2.4.gradle
dd-java-agent/instrumentation/sparkjava-2.4/sparkjava-2.4.gradle
@@ -53,3 +53,9 @@ dependencies {
latestDepTestCompile group: 'com.sparkjava', name: 'spark-core', version: '+'
}
+
+configurations.latestDepTestCompile {
+ resolutionStrategy {
+ force group: 'com.sparkjava', name: 'spark-core', version: '+'
+ }
+}

Fix version upgrading for latestDepTests