From 50f86b365936bb62edb3d5c967b3ccddcbe149c0 Mon Sep 17 00:00:00 2001
From: Cheng Pan <379377944@qq.com>
Date: Thu, 14 Jan 2021 16:56:44 +0800
Subject: [PATCH] [KYUUBI#282] Downgrade libthrift:0.9.3 due to THRIFT-4805
 fixes #282 Squashed commit of the following:

commit 6b6f75ce5d0171fc58472d21876ad5fd2a571aa0
Author: Cheng Pan <379377944@qq.com>
Date:   Thu Jan 14 00:25:38 2021 +0800

    downgrade libthrift:0.9.3 due to THRIFT-4805
---
 kyuubi-common/pom.xml | 10 ----------
 pom.xml               | 33 +++++++++++++++------------------
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/kyuubi-common/pom.xml b/kyuubi-common/pom.xml
index 7500c6e4c..c7c6ef310 100644
--- a/kyuubi-common/pom.xml
+++ b/kyuubi-common/pom.xml
@@ -69,16 +69,6 @@
             <artifactId>hive-service-rpc</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libthrift</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libfb303</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-minikdc</artifactId>
diff --git a/pom.xml b/pom.xml
index cb5070146..f6da6098b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,8 +64,6 @@
         <curator.version>2.7.1</curator.version>
         <hadoop.version>2.7.4</hadoop.version>
         <hive.version>2.3.7</hive.version>
-        <libfb303.version>0.9.3</libfb303.version>
-        <libthrift.version>0.12.0</libthrift.version>
         <netty3.version>3.7.0.Final</netty3.version>
         <spark.version>3.0.1</spark.version>
         <slf4j.version>1.7.30</slf4j.version>
@@ -322,36 +320,35 @@
                 <version>${spark.version}</version>
             </dependency>
 
+            <!--
+              because of THRIFT-4805, we don't upgrade to libthrift:0.12.0,
+              because of THRIFT-5274, we don't upgrade to libthrift:0.13.0,
+              so just keep hive-service-rpc:2.3.7 transitive dependency libthrift:0.9.3
+            -->
             <dependency>
                 <groupId>org.apache.hive</groupId>
                 <artifactId>hive-service-rpc</artifactId>
                 <version>${hive.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>*</groupId>
-                        <artifactId>*</artifactId>
+                        <groupId>commons-codec</groupId>
+                        <artifactId>commons-codec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-cli</groupId>
+                        <artifactId>commons-cli</artifactId>
                     </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.thrift</groupId>
-                <artifactId>libthrift</artifactId>
-                <version>${libthrift.version}</version>
-                <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>tomcat</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.thrift</groupId>
-                <artifactId>libfb303</artifactId>
-                <version>${libfb303.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.hive</groupId>
                 <artifactId>hive-jdbc</artifactId>