Skip to content

Commit

Permalink
[KYUUBI #1716] Unify Hive deps for server and client
Browse files Browse the repository at this point in the history 
<!--
Thanks for sending a pull request!

Here are some tips for you:
  1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/contributions.html
  2. If the PR is related to an issue in https://github.com/apache/incubator-kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
  3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'.
-->

### _Why are the changes needed?_
<!--
Please clarify why the changes are needed. For instance,
  1. If you add a feature, you can talk about the use case of it.
  2. If you fix a bug, you can clarify why it is a bug.
-->

This PR make the hive deps be consistent between server and clients for a single release, we shall not play client-server compatibility tricky in one release

### _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.readthedocs.io/en/latest/develop_tools/testing.html#running-tests) locally before make a pull request

Closes #1716 from yaooqinn/hive.

Closes #1716

2eb3bdf [Kent Yao] Merge branch 'master' into hive
c1bf636 [Kent Yao] dep
c7f0f26 [Kent Yao] dep
645d76a [Kent Yao] fix test
3ac4f55 [Kent Yao] Merge branch 'master' into hive
f1ca475 [Kent Yao] delta test
01d3029 [Kent Yao] refine
1e93f33 [Kent Yao] Merge branch 'master' of github.com:apache/incubator-kyuubi into hive
5bd9631 [Kent Yao] Unify Hive deps for server and client

Authored-by: Kent Yao <yao@apache.org>
Signed-off-by: ulysses-you <ulyssesyou@apache.org>
  • Loading branch information
@yaooqinn @ulysses-you
yaooqinn authored and ulysses-you committed Jan 12, 2022
1 parent 90e9746 commit c1a6cd5
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 278 deletions.
1 change: 0 additions & 1 deletion dev/dependencyList
View file
Expand Up @@ -23,7 +23,6 @@ commons-lang3/3.10//commons-lang3-3.10.jar
curator-client/2.12.0//curator-client-2.12.0.jar
curator-framework/2.12.0//curator-framework-2.12.0.jar
curator-recipes/2.12.0//curator-recipes-2.12.0.jar
failureaccess/1.0.1//failureaccess-1.0.1.jar
guava/30.1-jre//guava-30.1-jre.jar
hadoop-client-api/3.3.1//hadoop-client-api-3.3.1.jar
hadoop-client-runtime/3.3.1//hadoop-client-runtime-3.3.1.jar
Expand Down
6 changes: 6 additions & 0 deletions kyuubi-assembly/pom.xml
View file
Expand Up @@ -94,6 +94,12 @@
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions kyuubi-common/pom.xml
View file
Expand Up @@ -120,6 +120,12 @@
<artifactId>jul-to-slf4j</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
72 changes: 2 additions & 70 deletions kyuubi-hive-beeline/pom.xml
View file
Expand Up @@ -44,19 +44,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-beeline</artifactId>
<version>${hive.client.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-common</artifactId>
<version>${hive.client.version}</version>
<version>${hive.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -68,19 +56,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc</artifactId>
<version>${hive.client.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-service-rpc</artifactId>
<version>${hive.client.version}</version>
<version>${hive.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -89,50 +65,6 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-service</artifactId>
<version>${hive.client.version}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>${hive.client.thrift.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libfb303</artifactId>
<version>${hive.client.fb303.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>

<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
Expand Down
80 changes: 6 additions & 74 deletions kyuubi-hive-jdbc-shaded/pom.xml
View file
Expand Up @@ -57,20 +57,12 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-service-rpc</artifactId>
<version>${hive.client.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.hive.shims</groupId>
<artifactId>hive-shims-common</artifactId>
<version>${hive.client.version}</version>
<version>${hive.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
Expand All @@ -83,7 +75,7 @@
<dependency>
<groupId>org.apache.hive.shims</groupId>
<artifactId>hive-shims-0.23</artifactId>
<version>${hive.client.version}</version>
<version>${hive.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
Expand All @@ -96,7 +88,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-common</artifactId>
<version>${hive.client.version}</version>
<version>${hive.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
Expand All @@ -109,7 +101,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
<version>${hive.client.version}</version>
<version>${hive.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
Expand All @@ -122,7 +114,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-serde</artifactId>
<version>${hive.client.version}</version>
<version>${hive.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
Expand All @@ -135,7 +127,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-service</artifactId>
<version>${hive.client.version}</version>
<version>${hive.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
Expand All @@ -149,47 +141,21 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${hive.client.commons-codec.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${hive.client.commons-lang.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${hive.client.guava.version}</version>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>${hive.client.curator.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-client</artifactId>
<version>${hive.client.curator.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -212,43 +178,9 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>${hive.client.thrift.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libfb303</artifactId>
<version>${hive.client.fb303.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${hive.client.zookeeper.version}</version>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down

0 comments on commit c1a6cd5

Please sign in to comment.