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/05/11 08:00:42 UTC
[incubator-kyuubi] branch master updated: [KYUUBI #2621] Always use Hadoop shaded client
This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git
The following commit(s) were added to refs/heads/master by this push:
new 981b41619 [KYUUBI #2621] Always use Hadoop shaded client
981b41619 is described below
commit 981b41619bae4a566874eb063e50e89dd520ad04
Author: Cheng Pan <ch...@apache.org>
AuthorDate: Wed May 11 16:00:31 2022 +0800
[KYUUBI #2621] Always use Hadoop shaded client
### _Why are the changes needed?_
There are some deps has low version hadoop deps, we should exclude them and use hadoop shaded client instead.
For engine modules, the shaded client will not be packaged into shaded jar, then nothing changes in the final shaded jar.
### _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 #2621 from pan3793/hdp.
Closes #2621
88399979 [Cheng Pan] nit
d75a5806 [Cheng Pan] Always use Hadoop shaded client
Authored-by: Cheng Pan <ch...@apache.org>
Signed-off-by: Cheng Pan <ch...@apache.org>
---
externals/kyuubi-flink-sql-engine/pom.xml | 6 ------
externals/kyuubi-hive-sql-engine/pom.xml | 12 ++++++++++++
kyuubi-common/pom.xml | 6 ------
pom.xml | 4 ++++
4 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/externals/kyuubi-flink-sql-engine/pom.xml b/externals/kyuubi-flink-sql-engine/pom.xml
index d264a8548..d406027d7 100644
--- a/externals/kyuubi-flink-sql-engine/pom.xml
+++ b/externals/kyuubi-flink-sql-engine/pom.xml
@@ -113,12 +113,6 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-yarn_${scala.binary.version}</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- tests -->
<dependency>
<groupId>org.apache.kyuubi</groupId>
diff --git a/externals/kyuubi-hive-sql-engine/pom.xml b/externals/kyuubi-hive-sql-engine/pom.xml
index 67363930c..5ffcf92aa 100644
--- a/externals/kyuubi-hive-sql-engine/pom.xml
+++ b/externals/kyuubi-hive-sql-engine/pom.xml
@@ -109,6 +109,10 @@
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-registry</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -130,6 +134,14 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/kyuubi-common/pom.xml b/kyuubi-common/pom.xml
index f47686831..9b16527a4 100644
--- a/kyuubi-common/pom.xml
+++ b/kyuubi-common/pom.xml
@@ -77,12 +77,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-runtime</artifactId>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 6dad300f4..f79beb370 100644
--- a/pom.xml
+++ b/pom.xml
@@ -298,6 +298,10 @@
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
</exclusions>
</dependency>