Skip to content
This repository has been archived by the owner on Jul 1, 2022. It is now read-only.

Commit

Permalink
Fixes #494 - removed unwanted classes from jaeger-thrift shadowed jar (
Browse files Browse the repository at this point in the history
…#498)

* Fixes #494 - removed unwanted classes from jaeger-thrift shadowed jar

Moved relocated packages to io.jaegertracing.vendor
Excluded lombok and animal-sniffer from shadow plugin in jaeger-thrift
Added slf4j as runtime non-relocated dependency
Removed unused dependencies from jaeger-crossdock (change suggested by @jpkrohling)

Signed-off-by: Michal Dvorak <mikee@mdvorak.org>

* Added missing slf4j dependency version

Signed-off-by: Michal Dvorak <mikee@mdvorak.org>
  • Loading branch information
mdvorak authored and jpkrohling committed Jul 23, 2018
1 parent a16cd8b commit efd00c9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
3 changes: 0 additions & 3 deletions jaeger-crossdock/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ compileJava {
dependencies {
compile project(':jaeger-client')

compile group: 'org.apache.thrift', name: 'libthrift', version: apacheThriftVersion
compile group: 'com.squareup.okhttp3', name: 'okhttp', version: okhttpVersion

compile group: 'io.opentracing.contrib', name: 'opentracing-jaxrs2', version: '0.1.4'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
compile group: 'org.glassfish.jersey.containers', name: 'jersey-container-grizzly2-http', version: jerseyVersion
Expand Down
17 changes: 12 additions & 5 deletions jaeger-thrift/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ description = 'Library to send data to Jaeger backend components via Thrift'
dependencies {
compile project(':jaeger-core')

compile group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion

compileOnly group: 'org.apache.thrift', name: 'libthrift', version: apacheThriftVersion
compileOnly group: 'com.squareup.okhttp3', name: 'okhttp', version: okhttpVersion

Expand Down Expand Up @@ -51,13 +53,18 @@ jar {

shadowJar {
baseName = 'jaeger-thrift'
relocate 'com.google.gson' , 'jaeger.com.google.gson'
relocate 'com.twitter' , 'jaeger.com.twitter'
relocate 'okhttp' , 'jaeger.okhttp'
relocate 'okio' , 'jaeger.okio'
relocate 'org.apache' , 'jaeger.org.apache'
relocate 'com.google.gson' , 'io.jaegertracing.vendor.com.google.gson'
relocate 'com.twitter' , 'io.jaegertracing.vendor.com.twitter'
relocate 'okhttp' , 'io.jaegertracing.vendor.okhttp'
relocate 'okio' , 'io.jaegertracing.vendor.okio'
relocate 'org.apache' , 'io.jaegertracing.vendor.org.apache'
classifier null
configurations = [project.configurations.compileOnly]
dependencies {
exclude(dependency('org.slf4j:slf4j-api'))
exclude(dependency('org.projectlombok:lombok'))
exclude(dependency('org.codehaus.mojo:animal-sniffer-annotations'))
}
}

task testJar(type: Jar, dependsOn: testClasses) {
Expand Down

0 comments on commit efd00c9

Please sign in to comment.