Fix transitive dependencies

New instrumentation was bringing in their dependencies into the jar, resulting in a much larger jar file.  This should resolve that.
This commit is contained in:
Tyler Benson 2017-11-10 11:45:00 -05:00
parent 66355feddb
commit ff4f39779e
7 changed files with 32 additions and 22 deletions

View File

@ -21,15 +21,23 @@ dependencies {
compile project(':dd-java-agent:tooling') compile project(':dd-java-agent:tooling')
compile project(':dd-trace-annotations') compile project(':dd-trace-annotations')
compile project(':dd-java-agent:integrations:aws-sdk') compile(project(':dd-java-agent:integrations:aws-sdk')) {
compile project(':dd-java-agent:integrations:servlet-2') transitive = false
compile project(':dd-java-agent:integrations:servlet-3') }
compile project(':dd-java-agent:integrations:spring-web') compile(project(':dd-java-agent:integrations:servlet-2')) {
transitive = false
}
compile(project(':dd-java-agent:integrations:servlet-3')) {
transitive = false
}
compile(project(':dd-java-agent:integrations:spring-web')) {
transitive = false
}
compile deps.bytebuddy compile deps.bytebuddy
compile group: 'org.jboss.byteman', name: 'byteman', version: '3.0.10' compile group: 'org.jboss.byteman', name: 'byteman', version: '3.0.10'
compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3' compile deps.autoservice
compile deps.slf4j compile deps.slf4j
compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25' compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'

View File

@ -23,7 +23,7 @@ dependencies {
compile deps.bytebuddy compile deps.bytebuddy
compile deps.opentracing compile deps.opentracing
compile deps.autoservice
compile group: 'io.opentracing.contrib', name: 'opentracing-aws-sdk', version: '0.0.2' compile group: 'io.opentracing.contrib', name: 'opentracing-aws-sdk', version: '0.0.2'
compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
} }

View File

@ -21,6 +21,5 @@ dependencies {
compile deps.bytebuddy compile deps.bytebuddy
compile deps.opentracing compile deps.opentracing
compile deps.autoservice
compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
} }

View File

@ -22,6 +22,5 @@ dependencies {
compile deps.bytebuddy compile deps.bytebuddy
compile deps.opentracing compile deps.opentracing
compile deps.autoservice
compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
} }

View File

@ -24,6 +24,5 @@ dependencies {
compile deps.bytebuddy compile deps.bytebuddy
compile deps.opentracing compile deps.opentracing
compile deps.autoservice
compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'
} }

View File

@ -24,7 +24,7 @@ dependencies {
compile deps.jackson compile deps.jackson
compile deps.slf4j compile deps.slf4j
compile group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3' compile deps.autoservice
compile group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.8.13' compile group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.8.13'
testCompile deps.testLogging testCompile deps.testLogging

View File

@ -23,21 +23,26 @@ ext {
opentracingMock: dependencies.create(group: 'io.opentracing', name: 'opentracing-mock', version: version.opentracing), opentracingMock: dependencies.create(group: 'io.opentracing', name: 'opentracing-mock', version: version.opentracing),
// General // General
slf4j : "org.slf4j:slf4j-api:${version.slf4j}", slf4j : "org.slf4j:slf4j-api:${version.slf4j}",
guava : "com.google.guava:guava:$version.guava", guava : "com.google.guava:guava:$version.guava",
jackson : [ jackson : [
dependencies.create(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: version.jackson), dependencies.create(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: version.jackson),
dependencies.create(group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: version.jackson), dependencies.create(group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: version.jackson),
], ],
bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: '1.7.6'), bytebuddy : dependencies.create(group: 'net.bytebuddy', name: 'byte-buddy', version: '1.7.6'),
autoservice: [
dependencies.create(group: 'com.google.auto.service', name: 'auto-service', version: '1.0-rc3'),
dependencies.create(group: 'com.google.auto', name: 'auto-common', version: '0.3'),
dependencies.create(group: 'com.google.guava', name: 'guava', version: '19.0'),
],
// Testing // Testing
spock : dependencies.create("org.spockframework:spock-core:${version.spock}", { spock : dependencies.create("org.spockframework:spock-core:${version.spock}", {
exclude group: "org.codehaus.groovy", module: "groovy-all" exclude group: "org.codehaus.groovy", module: "groovy-all"
}), }),
groovy : "org.codehaus.groovy:groovy-all:${version.groovy}", groovy : "org.codehaus.groovy:groovy-all:${version.groovy}",
junit : "junit:junit:${version.junit}", junit : "junit:junit:${version.junit}",
testLogging : [ testLogging: [
dependencies.create(group: 'ch.qos.logback', name: 'logback-classic', version: version.logback), dependencies.create(group: 'ch.qos.logback', name: 'logback-classic', version: version.logback),
dependencies.create(group: 'org.slf4j', name: 'log4j-over-slf4j', version: version.slf4j), dependencies.create(group: 'org.slf4j', name: 'log4j-over-slf4j', version: version.slf4j),
dependencies.create(group: 'org.slf4j', name: 'jcl-over-slf4j', version: version.slf4j), dependencies.create(group: 'org.slf4j', name: 'jcl-over-slf4j', version: version.slf4j),