This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git
The following commit(s) were added to refs/heads/branch-1.5 by this push:
new 9ecf135 [KYUUBI #1948][FOLLOWUP] Relocate fb303 classes
9ecf135 is described below
commit 9ecf135aa109ff460028153739b2b738947f2c3d
Author: SteNicholas <[email protected]>
AuthorDate: Fri Mar 11 09:41:24 2022 +0800
[KYUUBI #1948][FOLLOWUP] Relocate fb303 classes
### _Why are the changes needed?_
We should relocate fb303 classes to avoid conflict, fix #2093.
### _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 #2096 from SteNicholas/KYUUBI-2093.
Closes #1948
2095f835 [SteNicholas] [KYUUBI #2093] kyuubi beeline can not connect the
kyuubi server due to exception
Authored-by: SteNicholas <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
(cherry picked from commit 12d56422b1752d68df1072327a09ac7693d965ee)
Signed-off-by: Cheng Pan <[email protected]>
---
externals/kyuubi-flink-sql-engine/pom.xml | 7 +++++++
externals/kyuubi-spark-sql-engine/pom.xml | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/externals/kyuubi-flink-sql-engine/pom.xml
b/externals/kyuubi-flink-sql-engine/pom.xml
index 1bac868..2fa7f12 100644
--- a/externals/kyuubi-flink-sql-engine/pom.xml
+++ b/externals/kyuubi-flink-sql-engine/pom.xml
@@ -221,6 +221,13 @@
</includes>
</relocation>
<relocation>
+ <pattern>com.facebook.fb303</pattern>
+
<shadedPattern>${kyuubi.shade.packageName}.com.facebook.fb303</shadedPattern>
+ <includes>
+ <include>com.facebook.fb303.**</include>
+ </includes>
+ </relocation>
+ <relocation>
<pattern>org.apache.zookeeper</pattern>
<shadedPattern>${kyuubi.shade.packageName}.org.apache.zookeeper</shadedPattern>
<includes>
diff --git a/externals/kyuubi-spark-sql-engine/pom.xml
b/externals/kyuubi-spark-sql-engine/pom.xml
index ac75990..0cf63a8 100644
--- a/externals/kyuubi-spark-sql-engine/pom.xml
+++ b/externals/kyuubi-spark-sql-engine/pom.xml
@@ -212,6 +212,13 @@
</includes>
</relocation>
<relocation>
+ <pattern>com.facebook.fb303</pattern>
+
<shadedPattern>${kyuubi.shade.packageName}.com.facebook.fb303</shadedPattern>
+ <includes>
+ <include>com.facebook.fb303.**</include>
+ </includes>
+ </relocation>
+ <relocation>
<pattern>org.apache.hive.service.rpc</pattern>
<shadedPattern>${kyuubi.shade.packageName}.org.apache.hive.service.rpc</shadedPattern>
<includes>
