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

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

Merged
merged 2 commits into from
Jul 23, 2018
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40fd67c
Fixes #494 - removed unwanted classes from jaeger-thrift shadowed jar
mdvorak Jul 20, 2018
b78c6b8
Added missing slf4j dependency version
mdvorak Jul 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions jaeger-crossdock/build.gradle
View file
Open in desktop
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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, I think I had to add this in some iteration of the previous work, to get the tests to compile/run. Apparently, it's not needed now :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was your request to remove it :)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Er... oops :)

#494 (comment)

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
View file
Open in desktop
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'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be compileOnly? Try to run a mvn dependency:tree (or ./gradlew dependencies, if that's what your consumer application uses) and check if this version of jaeger-thrift (or jaeger-client) brings this dependency.


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