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

Adjust thrift shadow configuration and version #458

Merged
merged 1 commit into from
Jun 19, 2018
Merged

Adjust thrift shadow configuration and version #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ext.developmentVersion = getProperty('developmentVersion','0.29.1-SNAPSHOT')

ext.opentracingVersion = getProperty('opentracingVersion','0.31.0')
ext.guavaVersion = getProperty('guavaVersion','18.0')
ext.apacheThriftVersion = getProperty('apacheThriftVersion','0.9.2')
ext.apacheThriftVersion = getProperty('apacheThriftVersion','0.11.0')
ext.jerseyVersion = getProperty('jerseyVersion','2.22.2')
ext.slf4jVersion = getProperty('slf4jVersion','1.7.25')
ext.gsonVersion = getProperty('gsonVersion','2.8.2')
Expand Down
7 changes: 5 additions & 2 deletions jaeger-thrift/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@ checkstyleTest.enabled = false

shadowJar {
baseName = 'jaeger-thrift'
relocate 'org.apache.thrift', 'org.shadow.apache.thrift92'
relocate 'okhttp', 'jaeger.okhttp'
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'
classifier 'shadow'
Copy link
Contributor

Choose a reason for hiding this comment

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

I thought the idea was to make it the main artifact, not have a classifier?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good point, I think that's indeed what we discussed last Friday.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Created #460 and #461

}

Expand Down
2 changes: 1 addition & 1 deletion travis/docker-thrift/thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pwd=$(dirname ${PWD})

THRIFT_VER=0.9.2
THRIFT_VER=0.11.0
THRIFT_IMG=thrift:${THRIFT_VER}
THRIFT="docker run --rm -u $(id -u) -v ${pwd}:/data ${THRIFT_IMG} thrift"

Expand Down