You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ch...@apache.org on 2022/09/28 10:36:27 UTC
[incubator-kyuubi] branch branch-1.6 updated: [KYUUBI #3566] Shade Zookeeper into spark engine jar
This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch branch-1.6
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git
The following commit(s) were added to refs/heads/branch-1.6 by this push:
new 8ff7d74b3 [KYUUBI #3566] Shade Zookeeper into spark engine jar
8ff7d74b3 is described below
commit 8ff7d74b3c20ad02054ea71e3c7fd8642b3465a6
Author: Yikf <yi...@gmail.com>
AuthorDate: Wed Sep 28 18:35:54 2022 +0800
[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 <yi...@gmail.com>
Signed-off-by: Cheng Pan <ch...@apache.org>
(cherry picked from commit b6771488350dcb4f1022dc3264ddf2f5e6b46a62)
Signed-off-by: Cheng Pan <ch...@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 0181cfa52..6b5f0c414 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>