You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ho...@apache.org on 2022/08/08 06:03:08 UTC
[incubator-kyuubi] branch master updated: [KYUUBI #3189] [BUILD] Bump jetcd 0.7.3 and pin Netty dependencies
This is an automated email from the ASF dual-hosted git repository.
hongdd 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 a46d6550c [KYUUBI #3189] [BUILD] Bump jetcd 0.7.3 and pin Netty dependencies
a46d6550c is described below
commit a46d6550c773d20653b28720662cee9c1e88daba
Author: Cheng Pan <ch...@apache.org>
AuthorDate: Mon Aug 8 14:02:51 2022 +0800
[KYUUBI #3189] [BUILD] Bump jetcd 0.7.3 and pin Netty dependencies
### _Why are the changes needed?_
This PR proposes to upgrade the latest version of jetcd. As https://github.com/etcd-io/jetcd/pull/1074 has been included, https://github.com/apache/incubator-kyuubi/pull/3148 is not required then.
This PR also pin Netty dependecies' version.
### _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 #3189 from pan3793/etcd.
Closes #3189
1b2317af [Cheng Pan] [BUILD] Bump jetcd 0.7.3 and pin Netty dependencies
Authored-by: Cheng Pan <ch...@apache.org>
Signed-off-by: hongdongdong <ho...@cmss.chinamobile.com>
---
dev/dependencyList | 29 +++--
.../kyuubi/engine/spark/WithEtcdCluster.scala | 1 -
.../ha/client/etcd/EtcdDiscoveryClientSuite.scala | 1 -
.../kyuubi/engine/EngineRefWithEtcdSuite.scala | 1 -
pom.xml | 124 +++++++++++++++++----
5 files changed, 116 insertions(+), 40 deletions(-)
diff --git a/dev/dependencyList b/dev/dependencyList
index 30467efd2..4faf54bcd 100644
--- a/dev/dependencyList
+++ b/dev/dependencyList
@@ -86,10 +86,10 @@ jersey-entity-filtering/2.36//jersey-entity-filtering-2.36.jar
jersey-hk2/2.36//jersey-hk2-2.36.jar
jersey-media-json-jackson/2.36//jersey-media-json-jackson-2.36.jar
jersey-server/2.36//jersey-server-2.36.jar
-jetcd-api/0.7.1//jetcd-api-0.7.1.jar
-jetcd-common/0.7.1//jetcd-common-0.7.1.jar
-jetcd-core/0.7.1//jetcd-core-0.7.1.jar
-jetcd-grpc/0.7.1//jetcd-grpc-0.7.1.jar
+jetcd-api/0.7.3//jetcd-api-0.7.3.jar
+jetcd-common/0.7.3//jetcd-common-0.7.3.jar
+jetcd-core/0.7.3//jetcd-core-0.7.3.jar
+jetcd-grpc/0.7.3//jetcd-grpc-0.7.3.jar
jetty-http/9.4.48.v20220622//jetty-http-9.4.48.v20220622.jar
jetty-io/9.4.48.v20220622//jetty-io-9.4.48.v20220622.jar
jetty-security/9.4.48.v20220622//jetty-security-9.4.48.v20220622.jar
@@ -133,24 +133,21 @@ metrics-json/4.2.8//metrics-json-4.2.8.jar
metrics-jvm/4.2.8//metrics-jvm-4.2.8.jar
netty-all/4.1.73.Final//netty-all-4.1.73.Final.jar
netty-buffer/4.1.73.Final//netty-buffer-4.1.73.Final.jar
-netty-codec-dns/4.1.74.Final//netty-codec-dns-4.1.74.Final.jar
-netty-codec-http/4.1.77.Final//netty-codec-http-4.1.77.Final.jar
-netty-codec-http2/4.1.77.Final//netty-codec-http2-4.1.77.Final.jar
-netty-codec-socks/4.1.77.Final//netty-codec-socks-4.1.77.Final.jar
+netty-codec-dns/4.1.73.Final//netty-codec-dns-4.1.73.Final.jar
+netty-codec-http/4.1.73.Final//netty-codec-http-4.1.73.Final.jar
+netty-codec-http2/4.1.73.Final//netty-codec-http2-4.1.73.Final.jar
+netty-codec-socks/4.1.73.Final//netty-codec-socks-4.1.73.Final.jar
netty-codec/4.1.73.Final//netty-codec-4.1.73.Final.jar
netty-common/4.1.73.Final//netty-common-4.1.73.Final.jar
-netty-handler-proxy/4.1.77.Final//netty-handler-proxy-4.1.77.Final.jar
+netty-handler-proxy/4.1.73.Final//netty-handler-proxy-4.1.73.Final.jar
netty-handler/4.1.73.Final//netty-handler-4.1.73.Final.jar
-netty-resolver-dns/4.1.74.Final//netty-resolver-dns-4.1.74.Final.jar
+netty-resolver-dns/4.1.73.Final//netty-resolver-dns-4.1.73.Final.jar
netty-resolver/4.1.73.Final//netty-resolver-4.1.73.Final.jar
netty-tcnative-classes/2.0.46.Final//netty-tcnative-classes-2.0.46.Final.jar
netty-transport-classes-epoll/4.1.73.Final//netty-transport-classes-epoll-4.1.73.Final.jar
-netty-transport-classes-kqueue/4.1.73.Final//netty-transport-classes-kqueue-4.1.73.Final.jar
netty-transport-native-epoll/4.1.73.Final/linux-aarch_64/netty-transport-native-epoll-4.1.73.Final-linux-aarch_64.jar
netty-transport-native-epoll/4.1.73.Final/linux-x86_64/netty-transport-native-epoll-4.1.73.Final-linux-x86_64.jar
-netty-transport-native-kqueue/4.1.73.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.73.Final-osx-aarch_64.jar
-netty-transport-native-kqueue/4.1.73.Final/osx-x86_64/netty-transport-native-kqueue-4.1.73.Final-osx-x86_64.jar
-netty-transport-native-unix-common/4.1.77.Final//netty-transport-native-unix-common-4.1.77.Final.jar
+netty-transport-native-unix-common/4.1.73.Final//netty-transport-native-unix-common-4.1.73.Final.jar
netty-transport/4.1.73.Final//netty-transport-4.1.73.Final.jar
okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.15.0//okio-1.15.0.jar
@@ -177,7 +174,7 @@ swagger-core/2.2.1//swagger-core-2.2.1.jar
swagger-integration/2.2.1//swagger-integration-2.2.1.jar
swagger-jaxrs2/2.2.1//swagger-jaxrs2-2.2.1.jar
swagger-models/2.2.1//swagger-models-2.2.1.jar
-vertx-core/4.2.7//vertx-core-4.2.7.jar
-vertx-grpc/4.2.7//vertx-grpc-4.2.7.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
diff --git a/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/WithEtcdCluster.scala b/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/WithEtcdCluster.scala
index 835131a0f..ee0d01dab 100644
--- a/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/WithEtcdCluster.scala
+++ b/externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/WithEtcdCluster.scala
@@ -39,7 +39,6 @@ trait WithEtcdCluster extends KyuubiFunSuite {
override def beforeAll(): Unit = {
etcdCluster = new Etcd.Builder()
- .withImage("gcr.io/etcd-development/etcd:v3.5.4")
.withNodes(1)
.build()
etcdCluster.start()
diff --git a/kyuubi-ha/src/test/scala/org/apache/kyuubi/ha/client/etcd/EtcdDiscoveryClientSuite.scala b/kyuubi-ha/src/test/scala/org/apache/kyuubi/ha/client/etcd/EtcdDiscoveryClientSuite.scala
index 840d6edc6..5010d0b68 100644
--- a/kyuubi-ha/src/test/scala/org/apache/kyuubi/ha/client/etcd/EtcdDiscoveryClientSuite.scala
+++ b/kyuubi-ha/src/test/scala/org/apache/kyuubi/ha/client/etcd/EtcdDiscoveryClientSuite.scala
@@ -45,7 +45,6 @@ class EtcdDiscoveryClientSuite extends DiscoveryClientTests {
override def beforeAll(): Unit = {
etcdCluster = new Etcd.Builder()
- .withImage("gcr.io/etcd-development/etcd:v3.5.4")
.withNodes(2)
.build()
etcdCluster.start()
diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/EngineRefWithEtcdSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/EngineRefWithEtcdSuite.scala
index c3c6c2f6d..fadb2741a 100644
--- a/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/EngineRefWithEtcdSuite.scala
+++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/engine/EngineRefWithEtcdSuite.scala
@@ -41,7 +41,6 @@ class EngineRefWithEtcdSuite extends EngineRefTests {
override def beforeAll(): Unit = {
etcdCluster = new Etcd.Builder()
- .withImage("gcr.io/etcd-development/etcd:v3.5.4")
.withNodes(1)
.build()
etcdCluster.start()
diff --git a/pom.xml b/pom.xml
index bb00e7a18..48aba8b41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.10</commons-lang3.version>
<curator.version>2.12.0</curator.version>
- <etcd.version>0.7.1</etcd.version>
+ <etcd.version>0.7.3</etcd.version>
<delta.version>2.0.0</delta.version>
<failsafe.verion>2.4.4</failsafe.verion>
<fb303.version>0.9.3</fb303.version>
@@ -853,22 +853,10 @@
<artifactId>netty-all</artifactId>
<version>${netty.version}</version>
<exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-dns</artifactId>
- </exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-haproxy</artifactId>
</exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- </exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http2</artifactId>
- </exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-memcache</artifactId>
@@ -885,10 +873,6 @@
<groupId>io.netty</groupId>
<artifactId>netty-codec-smtp</artifactId>
</exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-socks</artifactId>
- </exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-stomp</artifactId>
@@ -899,19 +883,19 @@
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
- <artifactId>netty-handler-proxy</artifactId>
+ <artifactId>netty-resolver-dns-classes-macos</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns</artifactId>
+ <artifactId>netty-resolver-dns-native-macos</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns-classes-macos</artifactId>
+ <artifactId>netty-transport-classes-kqueue</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns-native-macos</artifactId>
+ <artifactId>netty-transport-native-kqueue</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
@@ -928,6 +912,104 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-dns</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-socks</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler-proxy</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-classes-epoll</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <version>${netty.version}</version>
+ <classifier>linux-aarch_64</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-epoll</artifactId>
+ <version>${netty.version}</version>
+ <classifier>linux-x86_64</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-unix-common</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>