diff --git a/dd-java-agent/agent-bootstrap/agent-bootstrap.gradle b/dd-java-agent/agent-bootstrap/agent-bootstrap.gradle index 27d932ee615..facd73c5faa 100644 --- a/dd-java-agent/agent-bootstrap/agent-bootstrap.gradle +++ b/dd-java-agent/agent-bootstrap/agent-bootstrap.gradle @@ -5,7 +5,7 @@ plugins { apply from: "${rootDir}/gradle/java.gradle" -excludedClassesConverage += [ 'datadog.trace.bootstrap.*' ] +excludedClassesConverage += ['datadog.trace.bootstrap.*'] dependencies { compile project(':dd-trace-api') diff --git a/dd-java-agent/agent-tooling/agent-tooling.gradle b/dd-java-agent/agent-tooling/agent-tooling.gradle index d84a956fdf8..b44748192ea 100644 --- a/dd-java-agent/agent-tooling/agent-tooling.gradle +++ b/dd-java-agent/agent-tooling/agent-tooling.gradle @@ -1,6 +1,6 @@ apply from: "${rootDir}/gradle/java.gradle" -excludedClassesConverage += [ 'datadog.trace.agent.tooling.*' ] +excludedClassesConverage += ['datadog.trace.agent.tooling.*'] configurations { // classpath used by the instrumentation muzzle plugin diff --git a/dd-java-agent/benchmark-integration/jetty-perftest/jetty-perftest.gradle b/dd-java-agent/benchmark-integration/jetty-perftest/jetty-perftest.gradle index c6821fb988b..59f5e8fff92 100644 --- a/dd-java-agent/benchmark-integration/jetty-perftest/jetty-perftest.gradle +++ b/dd-java-agent/benchmark-integration/jetty-perftest/jetty-perftest.gradle @@ -2,7 +2,7 @@ dependencies { compile project(':dd-trace-api') compile project(':dd-java-agent:benchmark-integration') compile deps.opentracing - + compile group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.1.v20170120' compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.1.v20170120' } diff --git a/dd-java-agent/dd-java-agent.gradle b/dd-java-agent/dd-java-agent.gradle index 61c585e04b8..af1409c9223 100644 --- a/dd-java-agent/dd-java-agent.gradle +++ b/dd-java-agent/dd-java-agent.gradle @@ -14,6 +14,7 @@ jacocoTestReport.dependsOn ':dd-java-agent-ittests:test' * Note jarname must end in .zip, or its classes will be on the classpath of * the dd-java-agent jar. */ + def includeShadowJar(subproject, jarname) { def agent_project = project subproject.afterEvaluate { diff --git a/dd-java-agent/instrumentation/classloaders/classloaders.gradle b/dd-java-agent/instrumentation/classloaders/classloaders.gradle index 24e24ba3f35..2f31d65c653 100644 --- a/dd-java-agent/instrumentation/classloaders/classloaders.gradle +++ b/dd-java-agent/instrumentation/classloaders/classloaders.gradle @@ -8,6 +8,6 @@ dependencies { compile deps.opentracing annotationProcessor deps.autoservice implementation deps.autoservice - + testCompile project(':dd-java-agent:testing') } diff --git a/dd-java-agent/instrumentation/instrumentation.gradle b/dd-java-agent/instrumentation/instrumentation.gradle index 68793d1547f..23df6353188 100644 --- a/dd-java-agent/instrumentation/instrumentation.gradle +++ b/dd-java-agent/instrumentation/instrumentation.gradle @@ -40,7 +40,7 @@ subprojects { subProj -> } } -excludedClassesConverage += [ 'datadog.trace.instrumentation.*' ] +excludedClassesConverage += ['datadog.trace.instrumentation.*'] dependencies { compile(project(':dd-java-agent:agent-tooling')) { diff --git a/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle b/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle index fbcbd36dd50..415b310aa50 100644 --- a/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle +++ b/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle @@ -1,7 +1,7 @@ apply from: "${rootDir}/gradle/java.gradle" apply plugin: 'scala' -excludedClassesConverage += [ '*' ] +excludedClassesConverage += ['*'] dependencies { compile project(':dd-trace-api') 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 index 7f6ce7ac441..dfb262f2795 100644 --- 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 @@ -5,7 +5,7 @@ versionScan { module = "kafka-streams" versions = "[0.11.0.0,)" verifyPresent = [ - 'org.apache.kafka.streams.state.internals.OrderedBytes' : null + 'org.apache.kafka.streams.state.internals.OrderedBytes': null ] } diff --git a/dd-java-agent/instrumentation/lettuce-5/lettuce-5.gradle b/dd-java-agent/instrumentation/lettuce-5/lettuce-5.gradle index 8f4699b02a1..64f92894175 100644 --- a/dd-java-agent/instrumentation/lettuce-5/lettuce-5.gradle +++ b/dd-java-agent/instrumentation/lettuce-5/lettuce-5.gradle @@ -51,7 +51,7 @@ dependencies { compile deps.opentracing annotationProcessor deps.autoservice implementation deps.autoservice - + testCompile project(':dd-java-agent:testing') testCompile group: 'com.github.kstyrc', name: 'embedded-redis', version: '0.6' 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 3970abbb984..364da95300d 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 @@ -6,7 +6,7 @@ versionScan { scanMethods = true versions = "[3.3,)" verifyPresent = [ - 'com.mongodb.async.client.MongoClientSettings$Builder': 'addCommandListener' + 'com.mongodb.async.client.MongoClientSettings$Builder': 'addCommandListener' ] } diff --git a/dd-java-agent/instrumentation/spring-web/spring-web.gradle b/dd-java-agent/instrumentation/spring-web/spring-web.gradle index 8eec6895a45..288a205b0ca 100644 --- a/dd-java-agent/instrumentation/spring-web/spring-web.gradle +++ b/dd-java-agent/instrumentation/spring-web/spring-web.gradle @@ -33,7 +33,7 @@ dependencies { testCompile group: 'javax.validation', name: 'validation-api', version: '1.1.0.Final' testCompile group: 'org.hibernate', name: 'hibernate-validator', version: '5.4.2.Final' - + testCompile group: 'org.spockframework', name: 'spock-spring', version: '1.1-groovy-2.4' testCompile group: 'org.springframework', name: 'spring-web', version: '4.3.14.RELEASE' 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 index d2e46778437..f615c4eac8e 100644 --- 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,8 +33,8 @@ dependencies { testCompile project(':dd-java-agent:testing') testCompile group: 'net.spy', name: 'spymemcached', version: '2.12.0' - testCompile group: 'org.spockframework', name:'spock-core', version:'1.1-groovy-2.4' - testCompile group: 'org.testcontainers', name:'testcontainers', version:'1.7.3' + testCompile group: 'org.spockframework', name: 'spock-core', version: '1.1-groovy-2.4' + testCompile group: 'org.testcontainers', name: 'testcontainers', version: '1.7.3' } configurations.latestDepTestCompile { diff --git a/dd-java-agent/testing/testing.gradle b/dd-java-agent/testing/testing.gradle index ed8cdd1c288..77a89f5458e 100644 --- a/dd-java-agent/testing/testing.gradle +++ b/dd-java-agent/testing/testing.gradle @@ -24,7 +24,7 @@ dependencies { compile project(':dd-trace-ot') compile project(':dd-java-agent:agent-tooling') - + annotationProcessor deps.autoservice implementation deps.autoservice diff --git a/dd-trace-ot/dd-trace-ot.gradle b/dd-trace-ot/dd-trace-ot.gradle index 0a30dc72896..14b376137b4 100644 --- a/dd-trace-ot/dd-trace-ot.gradle +++ b/dd-trace-ot/dd-trace-ot.gradle @@ -27,7 +27,7 @@ testSets { dependencies { annotationProcessor deps.autoservice implementation deps.autoservice - + compile project(':dd-trace-api') compile deps.opentracing compile group: 'io.opentracing.contrib', name: 'opentracing-tracerresolver', version: '0.1.0' diff --git a/gradle/test-with-scala.gradle b/gradle/test-with-scala.gradle index a036594a70d..5ac675ebb6b 100644 --- a/gradle/test-with-scala.gradle +++ b/gradle/test-with-scala.gradle @@ -3,6 +3,6 @@ apply plugin: 'scala' compileTestGroovy { - classpath = classpath.plus(files(compileTestScala.destinationDir)) - dependsOn compileTestScala + classpath = classpath.plus(files(compileTestScala.destinationDir)) + dependsOn compileTestScala }