From b6771488350dcb4f1022dc3264ddf2f5e6b46a62 Mon Sep 17 00:00:00 2001
From: Yikf <yikaifei1@gmail.com>
Date: Wed, 28 Sep 2022 18:35:54 +0800
Subject: [PATCH] [KYUUBI #3566] Shade Zookeeper into spark engine jar

### _Why are the changes needed?_

Close https://github.com/apache/incubator-kyuubi/issues/3566.

### _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

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

Closes #3570 from Yikf/shade-spark-engine.

Closes #3566

0290cbc9 [Yikf] shade zookeeper in spark-engine

Authored-by: Yikf <yikaifei1@gmail.com>
Signed-off-by: Cheng Pan <chengpan@apache.org>
---
 externals/kyuubi-spark-sql-engine/pom.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/externals/kyuubi-spark-sql-engine/pom.xml b/externals/kyuubi-spark-sql-engine/pom.xml
index b215c2aa6..55709cd79 100644
--- a/externals/kyuubi-spark-sql-engine/pom.xml
+++ b/externals/kyuubi-spark-sql-engine/pom.xml
@@ -222,6 +222,7 @@
                             <include>org.apache.curator:curator-client</include>
                             <include>org.apache.curator:curator-framework</include>
                             <include>org.apache.curator:curator-recipes</include>
+                            <include>org.apache.zookeeper:zookeeper</include>
                             <include>org.apache.hive:hive-service-rpc</include>
                             <include>org.apache.thrift:*</include>
                         </includes>
@@ -252,6 +253,20 @@
                                 <include>org.apache.curator.**</include>
                             </includes>
                         </relocation>
+                        <relocation>
+                            <pattern>org.apache.zookeeper</pattern>
+                            <shadedPattern>${kyuubi.shade.packageName}.org.apache.zookeeper</shadedPattern>
+                            <includes>
+                                <include>org.apache.zookeeper.**</include>
+                            </includes>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.apache.jute</pattern>
+                            <shadedPattern>${kyuubi.shade.packageName}.org.apache.jute</shadedPattern>
+                            <includes>
+                                <include>org.apache.jute.**</include>
+                            </includes>
+                        </relocation>
                         <relocation>
                             <pattern>org.apache.hive.service.rpc.thrift</pattern>
                             <shadedPattern>${kyuubi.shade.packageName}.org.apache.hive.service.rpc.thrift</shadedPattern>