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/09 04:32:06 UTC
[incubator-kyuubi] branch master updated: [KYUUBI #2041] Bump Zookeeper from 3.4.14 to 3.6.3
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 812ea2bdf [KYUUBI #2041] Bump Zookeeper from 3.4.14 to 3.6.3
812ea2bdf is described below
commit 812ea2bdfe4d3569579ebaf8cc42efd84288334d
Author: Cheng Pan <ch...@apache.org>
AuthorDate: Fri Sep 9 12:31:55 2022 +0800
[KYUUBI #2041] Bump Zookeeper from 3.4.14 to 3.6.3
### _Why are the changes needed?_
#2040 adds the test to verify the compatibility for Zookeeper Server 3.4, I will rebase this PR after #2040 get merged.
Close #1941
### _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 #2041 from pan3793/zk.
Closes #2041
d6722f11 [Cheng Pan] license
eb7101a0 [Cheng Pan] fix
d9ce7c29 [Cheng Pan] Bump Zookeeper 3.6.3
Authored-by: Cheng Pan <ch...@apache.org>
Signed-off-by: Cheng Pan <ch...@apache.org>
---
LICENSE-binary | 3 +++
dev/dependencyList | 7 +++++--
kyuubi-assembly/pom.xml | 5 +++++
kyuubi-zookeeper/pom.xml | 12 ++++++++++++
pom.xml | 25 ++++++++++++++++++++++---
5 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 4ea04cdea..57e41280c 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -209,6 +209,7 @@ Apache License Version 2.0
--------------------------
com.zaxxer:HikariCP
com.google.android:annotations
+commons-cli:commons-cli
commons-lang:commons-lang
commons-logging:commons-logging
org.apache.commons:commons-lang3
@@ -277,6 +278,7 @@ org.apache.logging.log4j:log4j-api
org.apache.logging.log4j:log4j-core
org.apache.logging.log4j:log4j-slf4j-impl
org.webjars:swagger-ui
+org.xerial.snappy:snappy-java
org.yaml:snakeyaml
io.dropwizard.metrics:metrics-core
io.dropwizard.metrics:metrics-jmx
@@ -319,6 +321,7 @@ io.swagger.core.v3:swagger-jaxrs2
io.swagger.core.v3:swagger-models
io.vertx:vertx-core
io.vertx:vertx-grpc
+org.apache.zookeeper:zookeeper-jute
org.apache.zookeeper:zookeeper
diff --git a/dev/dependencyList b/dev/dependencyList
index 7a6bcf812..0cf554c3d 100644
--- a/dev/dependencyList
+++ b/dev/dependencyList
@@ -21,6 +21,7 @@ annotations/4.1.1.4//annotations-4.1.1.4.jar
aopalliance-repackaged/2.6.1//aopalliance-repackaged-2.6.1.jar
automaton/1.11-8//automaton-1.11-8.jar
classgraph/4.8.138//classgraph-4.8.138.jar
+commons-cli/1.5.0//commons-cli-1.5.0.jar
commons-codec/1.15//commons-codec-1.15.jar
commons-collections/3.2.2//commons-collections-3.2.2.jar
commons-lang/2.6//commons-lang-2.6.jar
@@ -96,7 +97,7 @@ jetty-server/9.4.48.v20220622//jetty-server-9.4.48.v20220622.jar
jetty-servlet/9.4.48.v20220622//jetty-servlet-9.4.48.v20220622.jar
jetty-util-ajax/9.4.48.v20220622//jetty-util-ajax-9.4.48.v20220622.jar
jetty-util/9.4.48.v20220622//jetty-util-9.4.48.v20220622.jar
-jline/0.9.94//jline-0.9.94.jar
+jline/2.14.6//jline-2.14.6.jar
jul-to-slf4j/1.7.35//jul-to-slf4j-1.7.35.jar
kubernetes-client/5.12.1//kubernetes-client-5.12.1.jar
kubernetes-model-admissionregistration/5.12.1//kubernetes-model-admissionregistration-5.12.1.jar
@@ -168,6 +169,7 @@ simpleclient_tracer_otel/0.16.0//simpleclient_tracer_otel-0.16.0.jar
simpleclient_tracer_otel_agent/0.16.0//simpleclient_tracer_otel_agent-0.16.0.jar
slf4j-api/1.7.35//slf4j-api-1.7.35.jar
snakeyaml/1.30//snakeyaml-1.30.jar
+snappy-java/1.1.8.4//snappy-java-1.1.8.4.jar
swagger-annotations/2.2.1//swagger-annotations-2.2.1.jar
swagger-core/2.2.1//swagger-core-2.2.1.jar
swagger-integration/2.2.1//swagger-integration-2.2.1.jar
@@ -176,4 +178,5 @@ swagger-models/2.2.1//swagger-models-2.2.1.jar
vertx-core/4.3.2//vertx-core-4.3.2.jar
vertx-grpc/4.3.2//vertx-grpc-4.3.2.jar
zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
-zookeeper/3.4.14//zookeeper-3.4.14.jar
+zookeeper-jute/3.6.3//zookeeper-jute-3.6.3.jar
+zookeeper/3.6.3//zookeeper-3.6.3.jar
diff --git a/kyuubi-assembly/pom.xml b/kyuubi-assembly/pom.xml
index 2cd24ec06..79d6f6240 100644
--- a/kyuubi-assembly/pom.xml
+++ b/kyuubi-assembly/pom.xml
@@ -107,6 +107,11 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
diff --git a/kyuubi-zookeeper/pom.xml b/kyuubi-zookeeper/pom.xml
index a3fdd429f..27c0eb2f1 100644
--- a/kyuubi-zookeeper/pom.xml
+++ b/kyuubi-zookeeper/pom.xml
@@ -43,6 +43,18 @@
<artifactId>zookeeper</artifactId>
</dependency>
+ <!-- Required by org.apache.zookeeper.metrics.impl.DefaultMetricsProvider -->
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </dependency>
+
+ <!-- Required by org.apache.zookeeper.server.persistence.SnapStream -->
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-common_${scala.binary.version}</artifactId>
diff --git a/pom.xml b/pom.xml
index afc721288..3e5ebe465 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
<jakarta.activation.version>1.2.1</jakarta.activation.version>
<jersey.version>2.36</jersey.version>
<jetty.version>9.4.48.v20220622</jetty.version>
- <jline.version>0.9.94</jline.version>
+ <jline.version>2.14.6</jline.version>
<junit.version>4.13.1</junit.version>
<kubernetes-client.version>5.12.1</kubernetes-client.version>
<kudu.version>1.15.0</kudu.version>
@@ -164,6 +164,7 @@
<scopt.version>4.1.0</scopt.version>
<slf4j.version>1.7.35</slf4j.version>
<snakeyaml.version>1.30</snakeyaml.version>
+ <snappy.version>1.1.8.4</snappy.version>
<!--
DO NOT forget to change the following properties when change the minor version of Spark:
`delta.version`, `maven.plugin.scalatest.exclude.tags`
@@ -179,7 +180,7 @@
<trino.client.version>363</trino.client.version>
<trino.tpcds.version>1.4</trino.tpcds.version>
<trino.tpch.version>1.1</trino.tpch.version>
- <zookeeper.version>3.4.14</zookeeper.version>
+ <zookeeper.version>3.6.3</zookeeper.version>
<!-- apply to kyuubi-hive-jdbc/kyuubi-hive-beeline module -->
<hive.client.jline.version>2.12</hive.client.jline.version>
@@ -1119,9 +1120,21 @@
<version>${zookeeper.version}</version>
<exclusions>
<exclusion>
- <groupId>*</groupId>
+ <groupId>io.netty</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.yetus</groupId>
+ <artifactId>audience-annotations</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1489,6 +1502,12 @@
<version>${mysql.jdbc.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ <version>${snappy.version}</version>
+ </dependency>
+
<!-- flink -->
<dependency>
<groupId>org.apache.flink</groupId>