From 5eb83b4c7c657a99ff59dc94ec9dee97508a6b34 Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@apache.org>
Date: Mon, 4 Jul 2022 14:19:39 +0800
Subject: [PATCH] [KYUUBI #2999] Fix Kyuubi Hive Beeline dependencies

### _Why are the changes needed?_

Before https://github.com/apache/incubator-kyuubi/pull/1715, `kyuubi-hive-beeline` and `kyuubi-hive-jdbc` managed dependencies in-self, after https://github.com/apache/incubator-kyuubi/pull/1715 and https://github.com/apache/incubator-kyuubi/issues/1716, `kyuubi-hive-beeline` uses some transitive dependencies of `kyuubi-hive-jdbc`, the recent dependencies change of `kyuubi-hive-jdbc` breaks `kyuubi-hive-beeline`.

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [ ] Add screenshots for manual tests if appropriate

- [x] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request

Closes #2999 from pan3793/beeline.

Closes #2999

b92b8a17 [Cheng Pan] Fix Kyuubi Hive Beeline dependencies

Authored-by: Cheng Pan <chengpan@apache.org>
Signed-off-by: Cheng Pan <chengpan@apache.org>
---
 dev/dependencyList              |  2 +-
 kyuubi-hive-beeline/pom.xml     | 43 +++++++++++++++++++++++++++------
 kyuubi-hive-jdbc-shaded/pom.xml |  4 +--
 kyuubi-hive-jdbc/pom.xml        | 15 +-----------
 kyuubi-rest-client/pom.xml      |  1 -
 pom.xml                         | 29 +++++++++++++++++++---
 6 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/dev/dependencyList b/dev/dependencyList
index 91d8877f4..b7264579d 100644
--- a/dev/dependencyList
+++ b/dev/dependencyList
@@ -46,7 +46,7 @@ hk2-locator/2.6.1//hk2-locator-2.6.1.jar
 hk2-utils/2.6.1//hk2-utils-2.6.1.jar
 htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
 httpclient/4.5.13//httpclient-4.5.13.jar
-httpcore/4.4.13//httpcore-4.4.13.jar
+httpcore/4.4.15//httpcore-4.4.15.jar
 jackson-annotations/2.13.3//jackson-annotations-2.13.3.jar
 jackson-core/2.13.3//jackson-core-2.13.3.jar
 jackson-databind/2.13.3//jackson-databind-2.13.3.jar
diff --git a/kyuubi-hive-beeline/pom.xml b/kyuubi-hive-beeline/pom.xml
index a7259d851..0b62dc55f 100644
--- a/kyuubi-hive-beeline/pom.xml
+++ b/kyuubi-hive-beeline/pom.xml
@@ -54,6 +54,18 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-common</artifactId>
+            <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-jdbc</artifactId>
@@ -66,16 +78,33 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-service-rpc</artifactId>
+            <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-service</artifactId>
+            <version>${hive.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
-            <version>${hive.client.commons-cli.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/kyuubi-hive-jdbc-shaded/pom.xml b/kyuubi-hive-jdbc-shaded/pom.xml
index 843a12fbe..031120234 100644
--- a/kyuubi-hive-jdbc-shaded/pom.xml
+++ b/kyuubi-hive-jdbc-shaded/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-storage-api</artifactId>
-            <version>${hive.client.storage-api.version}</version>
+            <version>${hive.storage-api.version}</version>
             <optional>true</optional>
             <exclusions>
                 <exclusion>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>${hive.client.httpcomponents-core.version}</version>
+            <version>${httpcore.version}</version>
             <optional>true</optional>
         </dependency>
 
diff --git a/kyuubi-hive-jdbc/pom.xml b/kyuubi-hive-jdbc/pom.xml
index 8fd938d25..da751da0a 100644
--- a/kyuubi-hive-jdbc/pom.xml
+++ b/kyuubi-hive-jdbc/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-storage-api</artifactId>
-            <version>${hive.client.storage-api.version}</version>
+            <version>${hive.storage-api.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -116,19 +116,6 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>${hive.client.httpcomponents-core.version}</version>
         </dependency>
 
         <dependency>
diff --git a/kyuubi-rest-client/pom.xml b/kyuubi-rest-client/pom.xml
index a44468132..d4821170e 100644
--- a/kyuubi-rest-client/pom.xml
+++ b/kyuubi-rest-client/pom.xml
@@ -59,7 +59,6 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index e16ca59bd..9619e0452 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,6 +104,7 @@
         <apache.archive.dist>https://archive.apache.org/dist</apache.archive.dist>
         <bouncycastle.version>1.67</bouncycastle.version>
         <codahale.metrics.version>4.2.8</codahale.metrics.version>
+        <commons-cli.version>1.5.0</commons-cli.version>
         <commons-codec.version>1.15</commons-codec.version>
         <commons-collections.version>3.2.2</commons-collections.version>
         <commons-io.version>2.8.0</commons-io.version>
@@ -133,6 +134,7 @@
         <hive.archive.mirror>${apache.archive.dist}/hive/hive-${hive.engine.hive.version}</hive.archive.mirror>
         <hive.archive.download.skip>false</hive.archive.download.skip>
         <httpclient.version>4.5.13</httpclient.version>
+        <httpcore.version>4.4.15</httpcore.version>
         <hudi.version>0.11.1</hudi.version>
         <iceberg.name>iceberg-spark-runtime-3.2_${scala.binary.version}</iceberg.name>
         <iceberg.version>0.13.2</iceberg.version>
@@ -176,10 +178,7 @@
         <zookeeper.version>3.4.14</zookeeper.version>
 
         <!-- apply to kyuubi-hive-jdbc/kyuubi-hive-beeline module -->
-        <hive.client.commons-cli.version>1.2</hive.client.commons-cli.version>
-        <hive.client.httpcomponents-core.version>4.4.13</hive.client.httpcomponents-core.version>
         <hive.client.jline.version>2.12</hive.client.jline.version>
-        <hive.client.storage-api.version>2.7.2</hive.client.storage-api.version>
         <hive.client.supercsv.version>2.2.0</hive.client.supercsv.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -361,6 +360,12 @@
                 <version>${google.jsr305.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</artifactId>
+                <version>${commons-cli.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
@@ -794,6 +799,24 @@
                 <version>${jackson.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${httpclient.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpcore</artifactId>
+                <version>${httpcore.version}</version>
+            </dependency>
+
             <!--
               compatible with dropwizard 3.1.x, 3.2.x, 4.0.x, 4.1.x, 4.2.x
               see https://github.com/prometheus/client_java/issues/662