Move mock/assert deps out of common dependencies

dd-java-agent-ittests/dd-java-agent-ittests.gradle

@@ -18,6 +18,8 @@ dependencies {
   testCompile deps.opentracingMock
   testCompile deps.testLogging
   testCompile deps.guava
+  testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
+  testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
 
   testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.4.2'
   testCompile group: 'org.mongodb', name: 'mongodb-driver-async', version: '3.4.2'

dd-java-agent/instrumentation/kafka-clients-0.11/kafka-clients-0.11.gradle

@@ -32,6 +32,8 @@ 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'
+  testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
+  testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
 
   // Include latest version of kafka itself along with latest version of client libs.
   // This seems to help with jar compatibility hell.

dd-java-agent/instrumentation/kafka-streams-0.11/kafka-streams-0.11.gradle

@@ -35,6 +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'
+  testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
+  testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
+
 
   // Include latest version of kafka itself along with latest version of client libs.
   // This seems to help with jar compatibility hell.

dd-java-agent/instrumentation/mongo-3.1/mongo-3.1.gradle

@@ -28,6 +28,8 @@ dependencies {
   implementation deps.autoservice
 
   testCompile project(':dd-trace-ot')
+  testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
+  testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
   testCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '3.1.0'
   latestDepTestCompile group: 'org.mongodb', name: 'mongo-java-driver', version: '+'
 }

dd-trace-ot/dd-trace-ot.gradle

@@ -40,6 +40,8 @@ dependencies {
   testImplementation deps.autoservice
 
   testCompile project(":dd-java-agent:testing")
+  testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
+  testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
   testCompile group: 'org.objenesis', name: 'objenesis', version: '2.6'
   testCompile group: 'cglib', name: 'cglib-nodep', version: '3.2.5'
   testCompile 'com.github.stefanbirkner:system-rules:1.17.1'

gradle/java.gradle

@@ -64,10 +64,6 @@ repositories {
 }
 
 dependencies {
-  testCompile deps.junit
-  testCompile group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
-  testCompile group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
-
   testCompile deps.spock
   testCompile deps.groovy
   testCompile deps.testLogging