Add assertion to ensure latestDepTest dependencies are different from test.

tylerbenson · tylerbenson · commit 9bd2b86d2e0a · 2018-11-12T08:15:24.000-08:00
diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/aws-java-sdk-1.11.0.gradle b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/aws-java-sdk-1.11.0.gradle
@@ -95,13 +95,6 @@ configurations.test_1_11_106Compile {
   }
 }
 
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'com.amazonaws', name: 'aws-java-sdk', version: '+'
-  }
-}
-
-
 dependencies {
   compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.0'
 
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-2.3/datastax-cassandra-2.3.gradle b/dd-java-agent/instrumentation/datastax-cassandra-2.3/datastax-cassandra-2.3.gradle
@@ -36,10 +36,6 @@ 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'
-}
 
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '+'
-  }
+  latestDepTestCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/grpc-1.5/grpc-1.5.gradle b/dd-java-agent/instrumentation/grpc-1.5/grpc-1.5.gradle
@@ -60,12 +60,7 @@ dependencies {
   testCompile group: 'io.grpc', name: 'grpc-stub', version: grpcVersion
 
   latestDepTestCompile sourceSets.test.output // include the protobuf generated classes
-}
-
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'io.grpc', name: 'grpc-netty', version: '+'
-    force group: 'io.grpc', name: 'grpc-protobuf', version: '+'
-    force group: 'io.grpc', name: 'grpc-stub', version: '+'
-  }
+  latestDepTestCompile group: 'io.grpc', name: 'grpc-netty', version: '+'
+  latestDepTestCompile group: 'io.grpc', name: 'grpc-protobuf', version: '+'
+  latestDepTestCompile group: 'io.grpc', name: 'grpc-stub', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle b/dd-java-agent/instrumentation/hystrix-1.4/hystrix-1.4.gradle
@@ -32,10 +32,6 @@ 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'
-}
 
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'com.netflix.hystrix', name: 'hystrix-core', version: '+'
-  }
+  latestDepTestCompile group: 'com.netflix.hystrix', name: 'hystrix-core', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/jdbc/jdbc.gradle b/dd-java-agent/instrumentation/jdbc/jdbc.gradle
@@ -33,17 +33,13 @@ dependencies {
   testCompile group: 'org.apache.tomcat', name: 'tomcat-juli', version: '7.0.19'
   testCompile group: 'com.zaxxer', name: 'HikariCP', version: '2.4.0'
   testCompile group: 'com.mchange', name: 'c3p0', version: '0.9.5'
-}
-
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'com.h2database', name: 'h2', version: '+'
-    force group: 'org.apache.derby', name: 'derby', version: '+'
-    force group: 'org.hsqldb', name: 'hsqldb', version: '+'
-
-    force group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '+'
-    force group: 'org.apache.tomcat', name: 'tomcat-juli', version: '+'
-    force group: 'com.zaxxer', name: 'HikariCP', version: '+'
-    force group: 'com.mchange', name: 'c3p0', version: '+'
-  }
+  
+  latestDepTestCompile group: 'com.h2database', name: 'h2', version: '+'
+  latestDepTestCompile group: 'org.apache.derby', name: 'derby', version: '+'
+  latestDepTestCompile group: 'org.hsqldb', name: 'hsqldb', version: '+'
+
+  latestDepTestCompile group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '+'
+  latestDepTestCompile group: 'org.apache.tomcat', name: 'tomcat-juli', version: '+'
+  latestDepTestCompile group: 'com.zaxxer', name: 'HikariCP', version: '+'
+  latestDepTestCompile group: 'com.mchange', name: 'c3p0', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/jedis-1.4/jedis-1.4.gradle b/dd-java-agent/instrumentation/jedis-1.4/jedis-1.4.gradle
@@ -33,9 +33,3 @@ dependencies {
 
   latestDepTestCompile group: 'redis.clients', name: 'jedis', version: '+'
 }
-
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'redis.clients', name: 'jedis', version: '+'
-  }
-}
diff --git a/dd-java-agent/instrumentation/jetty-8/jetty-8.gradle b/dd-java-agent/instrumentation/jetty-8/jetty-8.gradle
@@ -33,11 +33,9 @@ dependencies {
   }
   testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.0.v20110901'
   testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.0.v20110901'
-}
+  testCompile group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '8.0.0.v20110901'
 
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'org.eclipse.jetty', name: 'jetty-server', version: '+'
-    force group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '+'
-  }
+  latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '+'
+  latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '+'
+  latestDepTestCompile group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/jetty-8/src/main/java/datadog/trace/instrumentation/jetty8/HandlerInstrumentation.java b/dd-java-agent/instrumentation/jetty-8/src/main/java/datadog/trace/instrumentation/jetty8/HandlerInstrumentation.java
@@ -16,7 +16,6 @@
 
 @AutoService(Instrumenter.class)
 public final class HandlerInstrumentation extends Instrumenter.Default {
-  public static final String SERVLET_OPERATION_NAME = "jetty.request";
 
   public HandlerInstrumentation() {
     super("jetty", "jetty-8");
diff --git a/dd-java-agent/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy b/dd-java-agent/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy
@@ -80,14 +80,13 @@ class JettyHandlerTest extends AgentTestRunner {
     tags.size() == 10
   }
 
-
   def "handler instrumentation clears state after async request"() {
     setup:
     Handler handler = new AbstractHandler() {
       @Override
       void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
         final Continuation continuation = ContinuationSupport.getContinuation(request)
-        continuation.suspend()
+        continuation.suspend(response)
         // By the way, this is a terrible async server
         new Thread() {
           @Override
diff --git a/dd-java-agent/instrumentation/jsp-2.3/jsp-2.3.gradle b/dd-java-agent/instrumentation/jsp-2.3/jsp-2.3.gradle
@@ -38,14 +38,10 @@ dependencies {
   testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.37'
   testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '7.0.37'
   testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '7.0.37'
-}
 
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '+'
-    force group: 'javax.servlet', name: 'javax.servlet-api', version: '+'
-    force group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '+'
-    force group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '+'
-    force group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '+'
-  }
+  latestDepTestCompile group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '+'
+  latestDepTestCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '+'
+  latestDepTestCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '+'
+  latestDepTestCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '+'
+  latestDepTestCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/kafka-clients-0.11.gradle b/dd-java-agent/instrumentation/kafka-clients-0.11/kafka-clients-0.11.gradle
@@ -32,12 +32,9 @@ 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'
-}
 
-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: '+'
-  }
+  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: '+'
+  latestDepTestCompile group: 'org.assertj', name: 'assertj-core', version: '3.+'
 }
diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy b/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTest.groovy
@@ -7,7 +7,6 @@ import org.springframework.kafka.core.DefaultKafkaProducerFactory
 import org.springframework.kafka.core.KafkaTemplate
 import org.springframework.kafka.listener.KafkaMessageListenerContainer
 import org.springframework.kafka.listener.MessageListener
-import org.springframework.kafka.listener.config.ContainerProperties
 import org.springframework.kafka.test.rule.KafkaEmbedded
 import org.springframework.kafka.test.utils.ContainerTestUtils
 import org.springframework.kafka.test.utils.KafkaTestUtils
@@ -36,7 +35,12 @@ class KafkaClientTest extends AgentTestRunner {
     def consumerFactory = new DefaultKafkaConsumerFactory<String, String>(consumerProperties)
 
     // set the topic that needs to be consumed
-    ContainerProperties containerProperties = new ContainerProperties(SHARED_TOPIC)
+    def containerProperties = null
+    try {
+      containerProperties = Class.forName("org.springframework.kafka.listener.config.ContainerProperties").newInstance(SHARED_TOPIC)
+    } catch (ClassNotFoundException | NoClassDefFoundError e) {
+      containerProperties = Class.forName("org.springframework.kafka.listener.ContainerProperties").newInstance(SHARED_TOPIC)
+    }
 
     // create a Kafka MessageListenerContainer
     def container = new KafkaMessageListenerContainer<>(consumerFactory, containerProperties)
@@ -126,7 +130,7 @@ class KafkaClientTest extends AgentTestRunner {
 
     cleanup:
     producerFactory.stop()
-    container.stop()
+    container?.stop()
   }
 
 }
diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/kafka-streams-0.11.gradle b/dd-java-agent/instrumentation/kafka-streams-0.11/kafka-streams-0.11.gradle
@@ -35,13 +35,9 @@ 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'
-}
 
-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: '+'
-  }
+  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: '+'
 }
diff --git a/dd-java-agent/instrumentation/lettuce-5/lettuce-5.gradle b/dd-java-agent/instrumentation/lettuce-5/lettuce-5.gradle
@@ -61,10 +61,6 @@ dependencies {
 
   testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6'
   testCompile group: 'io.lettuce', name: 'lettuce-core', version: '5.0.0.RELEASE'
-}
 
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'io.lettuce', name: 'lettuce-core', version: '+'
-  }
+  latestDepTestCompile group: 'io.lettuce', name: 'lettuce-core', version: '+'
 }
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
@@ -29,10 +29,5 @@ dependencies {
 
   testCompile project(':dd-trace-ot')
   testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0'
-}
-
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'org.mongodb', name: 'mongo-java-driver', version: '+'
-  }
+  latestDepTestCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/netty-4.0/netty-4.0.gradle b/dd-java-agent/instrumentation/netty-4.0/netty-4.0.gradle
@@ -44,6 +44,9 @@ dependencies {
 
   testCompile group: 'io.netty', name: 'netty-codec-http', version: '4.0.0.Final'
   testCompile group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.0'
+
+  latestDepTestCompile group: 'io.netty', name: 'netty-codec-http', version: '4.0.56.Final'
+  latestDepTestCompile group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.+'
 }
 
 // We need to force the dependency to the earliest supported version because other libraries declare newer versions.
@@ -57,11 +60,3 @@ configurations.testCompile {
     }
   }
 }
-
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'io.netty', name: 'netty-codec-http', version: '4.0.56.Final'
-    force group: 'org.asynchttpclient', name: 'async-http-client', version: '2.0.+'
-  }
-}
-
diff --git a/dd-java-agent/instrumentation/netty-4.1/netty-4.1.gradle b/dd-java-agent/instrumentation/netty-4.1/netty-4.1.gradle
@@ -42,6 +42,9 @@ dependencies {
   testCompile project(':dd-java-agent:instrumentation:java-concurrent')
   testCompile group: 'io.netty', name: 'netty-codec-http', version: '4.1.0.Final'
   testCompile group: 'org.asynchttpclient', name: 'async-http-client', version: '2.1.0'
+
+  latestDepTestCompile group: 'io.netty', name: 'netty-codec-http', version: '+'
+  latestDepTestCompile group: 'org.asynchttpclient', name: 'async-http-client', version: '+'
 }
 
 // We need to force the dependency to the earliest supported version because other libraries declare newer versions.
@@ -55,11 +58,3 @@ configurations.testCompile {
     }
   }
 }
-
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'io.netty', name: 'netty-codec-http', version: '+'
-    force group: 'org.asynchttpclient', name: 'async-http-client', version: '+'
-  }
-}
-
diff --git a/dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle b/dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle
@@ -29,10 +29,5 @@ dependencies {
 
   testCompile project(':dd-java-agent:testing')
   testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.0.0'
-}
-
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'com.squareup.okhttp3', name: 'okhttp', version: '+'
-  }
+  latestDepTestCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/ratpack-1.4/ratpack-1.4.gradle b/dd-java-agent/instrumentation/ratpack-1.4/ratpack-1.4.gradle
@@ -66,10 +66,5 @@ dependencies {
 
   testCompile project(':dd-java-agent:testing')
   testCompile group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.4.0'
-}
-
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'io.ratpack', name: 'ratpack-groovy-test', version: '+'
-  }
+  latestDepTestCompile group: 'io.ratpack', name: 'ratpack-groovy-test', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/servlet-3/servlet-3.gradle b/dd-java-agent/instrumentation/servlet-3/servlet-3.gradle
@@ -41,13 +41,9 @@ dependencies {
   testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.2.0.v20160908'
   testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '8.0.41'
   testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '8.0.41'
-}
 
-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: '+'
-  }
+  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: '+'
 }
diff --git a/dd-java-agent/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle b/dd-java-agent/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle
@@ -54,9 +54,3 @@ dependencies {
 
   latestDepTestCompile group: 'com.sparkjava', name: 'spark-core', version: '+'
 }
-
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'com.sparkjava', name: 'spark-core', version: '+'
-  }
-}
diff --git a/dd-java-agent/instrumentation/spring-webflux/spring-webflux.gradle b/dd-java-agent/instrumentation/spring-webflux/spring-webflux.gradle
@@ -74,12 +74,8 @@ dependencies {
   testCompile group: 'org.spockframework', name: 'spock-spring', version: '1.1-groovy-2.4'
   testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.0.0.RELEASE'
   testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: '2.0.0.RELEASE'
-}
 
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '+'
-    force group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '+'
-    force group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: '+'
-  }
+  latestDepTestCompile group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '+'
+  latestDepTestCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '+'
+  latestDepTestCompile group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: '+'
 }
diff --git a/dd-java-agent/instrumentation/spymemcached-2.12/spymemcached-2.12.gradle b/dd-java-agent/instrumentation/spymemcached-2.12/spymemcached-2.12.gradle
@@ -33,11 +33,6 @@ dependencies {
 
   testCompile group: 'net.spy', name: 'spymemcached', version: '2.12.0'
   testCompile deps.testcontainers
-}
 
-configurations.latestDepTestCompile {
-  resolutionStrategy {
-    force group: 'net.spy', name: 'spymemcached', version: '+'
-  }
+  latestDepTestCompile group: 'net.spy', name: 'spymemcached', version: '+'
 }
-
diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/OkHttpUtils.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/OkHttpUtils.groovy
@@ -7,10 +7,11 @@ import java.util.concurrent.TimeUnit
 class OkHttpUtils {
 
   static clientBuilder() {
+    def unit = TimeUnit.MINUTES
     new OkHttpClient.Builder()
-      .connectTimeout(1, TimeUnit.MINUTES)
-      .writeTimeout(1, TimeUnit.MINUTES)
-      .readTimeout(1, TimeUnit.MINUTES)
+      .connectTimeout(1, unit)
+      .writeTimeout(1, unit)
+      .readTimeout(1, unit)
   }
 
   static client() {
diff --git a/gradle/java.gradle b/gradle/java.gradle
@@ -118,6 +118,18 @@ artifacts {
   archives javaDocJar
 }
 
+project.afterEvaluate {
+  if (project.plugins.hasPlugin('org.unbroken-dome.test-sets')) {
+    tasks.withType(Test) {
+      doFirst{
+        def testArtifacts = configurations.testRuntime.resolvedConfiguration.resolvedArtifacts
+        def latestTestArtifacts = configurations.latestDepTestRuntime.resolvedConfiguration.resolvedArtifacts
+        assert testArtifacts != latestTestArtifacts : "latestDepTest dependencies are identical to test"
+      }
+    }
+  }
+}
+
 if (project.plugins.hasPlugin('com.github.johnrengelman.shadow')) {
   // Remove the no-deps jar from the archives to prevent publication
   configurations.archives.with {

Original file line number	Diff line number	Diff line change
`@@ -95,13 +95,6 @@ configurations.test_1_11_106Compile {`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`-configurations.latestDepTestCompile {`
`99`		`- resolutionStrategy {`
`100`		`- force group: 'com.amazonaws', name: 'aws-java-sdk', version: '+'`
`101`		`- }`
`102`		`-}`
`103`		`-`
`104`		`-`
`105`	`98`	`dependencies {`
`106`	`99`	`compileOnly group: 'com.amazonaws', name: 'aws-java-sdk-core', version: '1.11.0'`
`107`	`100`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,3 @@ dependencies {`
`33`	`33`
`34`	`34`	`latestDepTestCompile group: 'redis.clients', name: 'jedis', version: '+'`
`35`	`35`	`}`
`36`		`-`
`37`		`-configurations.latestDepTestCompile {`
`38`		`- resolutionStrategy {`
`39`		`- force group: 'redis.clients', name: 'jedis', version: '+'`
`40`		`- }`
`41`		`-}`