From 331bc0468aba9eec8e345cc8615d806f768c414e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= <juraci@kroehling.de>
Date: Tue, 19 Jun 2018 14:24:00 +0200
Subject: [PATCH] Adjust thrift shadow configuration and version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
---
 build.gradle                | 2 +-
 jaeger-thrift/build.gradle  | 7 +++++--
 travis/docker-thrift/thrift | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index fc8a74669..a9aa00e09 100644
--- 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
index 055de92fe..097e15253 100644
--- 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
index d56c8ad8e..3a90ccb0c 100755
--- 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"