Adjust thrift shadow configuration and version

Signed-off-by: Juraci Paixão Kröhling <[email protected]>
jaegertracing · Jun 19, 2018 · 331bc04 · 331bc04
1 parent 8b87ab7
commit 331bc04
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -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')

diff --git a/jaeger-thrift/build.gradle b/jaeger-thrift/build.gradle
@@ -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'
 }
 

diff --git a/travis/docker-thrift/thrift b/travis/docker-thrift/thrift
@@ -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"