From 1be834a6ae88f693a2741b98bd61c7a29ae96336 Mon Sep 17 00:00:00 2001
From: wgzhao <wgzhao@gmail.com>
Date: Fri, 22 Sep 2023 10:10:30 +0800
Subject: [PATCH] [improve][hive-reader] Add support for CDH 6.2.1 (#922)

---
 plugin/reader/hivereader/package.xml |  1 -
 plugin/reader/hivereader/pom.xml     | 44 ++++++++++++++++++----------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/plugin/reader/hivereader/package.xml b/plugin/reader/hivereader/package.xml
index b400613e9..2a1917d52 100644
--- a/plugin/reader/hivereader/package.xml
+++ b/plugin/reader/hivereader/package.xml
@@ -31,7 +31,6 @@
             <scope>runtime</scope>
             <excludes>
                 <exclude>com.wgzhao.addax:*</exclude>
-                <exclude>org.apache.commons:*</exclude>
             </excludes>
         </dependencySet>
     </dependencySets>
diff --git a/plugin/reader/hivereader/pom.xml b/plugin/reader/hivereader/pom.xml
index c1c0cb7b2..b29bb0b45 100644
--- a/plugin/reader/hivereader/pom.xml
+++ b/plugin/reader/hivereader/pom.xml
@@ -11,6 +11,12 @@
     <name>hive-reader</name>
     <packaging>jar</packaging>
 
+    <properties>
+        <hadoop.version>2.7.5</hadoop.version>
+        <hive.jdbc.version>2.1.1</hive.jdbc.version>
+        <curator.version>4.2.0</curator.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.wgzhao.addax</groupId>
@@ -64,6 +70,24 @@
             <version>${commons.configuration2.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-client</artifactId>
+            <version>${curator.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+            <version>${curator.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-recipes</artifactId>
+            <version>${curator.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
@@ -133,6 +157,10 @@
                     <groupId>org.apache.zookeeper</groupId>
                     <artifactId>zookeeper</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -253,10 +281,6 @@
                     <groupId>io.netty</groupId>
                     <artifactId>netty-buffer</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.apache.zookeeper</groupId>
-                    <artifactId>zookeeper</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 
@@ -266,18 +290,6 @@
             <version>${libthrift.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-            <version>${zookeeper.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper-jute</artifactId>
-            <version>${zookeeper.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.xerial.snappy</groupId>
             <artifactId>snappy-java</artifactId>