Skip to content

Commit a46d655

Browse files
pan3793hddong
pan3793
authored and
hddong
committed
[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 etcd-io/jetcd#1074 has been included, #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 1b2317a [Cheng Pan] [BUILD] Bump jetcd 0.7.3 and pin Netty dependencies Authored-by: Cheng Pan <chengpan@apache.org> Signed-off-by: hongdongdong <hongdongdong@cmss.chinamobile.com>
1 parent ea47cbc commit a46d655

File tree

5 files changed

+116
-40
lines changed

5 files changed

+116
-40
lines changed

‎dev/dependencyList

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ jersey-entity-filtering/2.36//jersey-entity-filtering-2.36.jar
8686
jersey-hk2/2.36//jersey-hk2-2.36.jar
8787
jersey-media-json-jackson/2.36//jersey-media-json-jackson-2.36.jar
8888
jersey-server/2.36//jersey-server-2.36.jar
89-
jetcd-api/0.7.1//jetcd-api-0.7.1.jar
90-
jetcd-common/0.7.1//jetcd-common-0.7.1.jar
91-
jetcd-core/0.7.1//jetcd-core-0.7.1.jar
92-
jetcd-grpc/0.7.1//jetcd-grpc-0.7.1.jar
89+
jetcd-api/0.7.3//jetcd-api-0.7.3.jar
90+
jetcd-common/0.7.3//jetcd-common-0.7.3.jar
91+
jetcd-core/0.7.3//jetcd-core-0.7.3.jar
92+
jetcd-grpc/0.7.3//jetcd-grpc-0.7.3.jar
9393
jetty-http/9.4.48.v20220622//jetty-http-9.4.48.v20220622.jar
9494
jetty-io/9.4.48.v20220622//jetty-io-9.4.48.v20220622.jar
9595
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
133133
metrics-jvm/4.2.8//metrics-jvm-4.2.8.jar
134134
netty-all/4.1.73.Final//netty-all-4.1.73.Final.jar
135135
netty-buffer/4.1.73.Final//netty-buffer-4.1.73.Final.jar
136-
netty-codec-dns/4.1.74.Final//netty-codec-dns-4.1.74.Final.jar
137-
netty-codec-http/4.1.77.Final//netty-codec-http-4.1.77.Final.jar
138-
netty-codec-http2/4.1.77.Final//netty-codec-http2-4.1.77.Final.jar
139-
netty-codec-socks/4.1.77.Final//netty-codec-socks-4.1.77.Final.jar
136+
netty-codec-dns/4.1.73.Final//netty-codec-dns-4.1.73.Final.jar
137+
netty-codec-http/4.1.73.Final//netty-codec-http-4.1.73.Final.jar
138+
netty-codec-http2/4.1.73.Final//netty-codec-http2-4.1.73.Final.jar
139+
netty-codec-socks/4.1.73.Final//netty-codec-socks-4.1.73.Final.jar
140140
netty-codec/4.1.73.Final//netty-codec-4.1.73.Final.jar
141141
netty-common/4.1.73.Final//netty-common-4.1.73.Final.jar
142-
netty-handler-proxy/4.1.77.Final//netty-handler-proxy-4.1.77.Final.jar
142+
netty-handler-proxy/4.1.73.Final//netty-handler-proxy-4.1.73.Final.jar
143143
netty-handler/4.1.73.Final//netty-handler-4.1.73.Final.jar
144-
netty-resolver-dns/4.1.74.Final//netty-resolver-dns-4.1.74.Final.jar
144+
netty-resolver-dns/4.1.73.Final//netty-resolver-dns-4.1.73.Final.jar
145145
netty-resolver/4.1.73.Final//netty-resolver-4.1.73.Final.jar
146146
netty-tcnative-classes/2.0.46.Final//netty-tcnative-classes-2.0.46.Final.jar
147147
netty-transport-classes-epoll/4.1.73.Final//netty-transport-classes-epoll-4.1.73.Final.jar
148-
netty-transport-classes-kqueue/4.1.73.Final//netty-transport-classes-kqueue-4.1.73.Final.jar
149148
netty-transport-native-epoll/4.1.73.Final/linux-aarch_64/netty-transport-native-epoll-4.1.73.Final-linux-aarch_64.jar
150149
netty-transport-native-epoll/4.1.73.Final/linux-x86_64/netty-transport-native-epoll-4.1.73.Final-linux-x86_64.jar
151-
netty-transport-native-kqueue/4.1.73.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.73.Final-osx-aarch_64.jar
152-
netty-transport-native-kqueue/4.1.73.Final/osx-x86_64/netty-transport-native-kqueue-4.1.73.Final-osx-x86_64.jar
153-
netty-transport-native-unix-common/4.1.77.Final//netty-transport-native-unix-common-4.1.77.Final.jar
150+
netty-transport-native-unix-common/4.1.73.Final//netty-transport-native-unix-common-4.1.73.Final.jar
154151
netty-transport/4.1.73.Final//netty-transport-4.1.73.Final.jar
155152
okhttp/3.12.12//okhttp-3.12.12.jar
156153
okio/1.15.0//okio-1.15.0.jar
@@ -177,7 +174,7 @@ swagger-core/2.2.1//swagger-core-2.2.1.jar
177174
swagger-integration/2.2.1//swagger-integration-2.2.1.jar
178175
swagger-jaxrs2/2.2.1//swagger-jaxrs2-2.2.1.jar
179176
swagger-models/2.2.1//swagger-models-2.2.1.jar
180-
vertx-core/4.2.7//vertx-core-4.2.7.jar
181-
vertx-grpc/4.2.7//vertx-grpc-4.2.7.jar
177+
vertx-core/4.3.2//vertx-core-4.3.2.jar
178+
vertx-grpc/4.3.2//vertx-grpc-4.3.2.jar
182179
zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
183180
zookeeper/3.4.14//zookeeper-3.4.14.jar

‎externals/kyuubi-spark-sql-engine/src/test/scala/org/apache/kyuubi/engine/spark/WithEtcdCluster.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ trait WithEtcdCluster extends KyuubiFunSuite {
3939

4040
override def beforeAll(): Unit = {
4141
etcdCluster = new Etcd.Builder()
42-
.withImage("gcr.io/etcd-development/etcd:v3.5.4")
4342
.withNodes(1)
4443
.build()
4544
etcdCluster.start()

‎kyuubi-ha/src/test/scala/org/apache/kyuubi/ha/client/etcd/EtcdDiscoveryClientSuite.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class EtcdDiscoveryClientSuite extends DiscoveryClientTests {
4545

4646
override def beforeAll(): Unit = {
4747
etcdCluster = new Etcd.Builder()
48-
.withImage("gcr.io/etcd-development/etcd:v3.5.4")
4948
.withNodes(2)
5049
.build()
5150
etcdCluster.start()

‎kyuubi-server/src/test/scala/org/apache/kyuubi/engine/EngineRefWithEtcdSuite.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class EngineRefWithEtcdSuite extends EngineRefTests {
4141

4242
override def beforeAll(): Unit = {
4343
etcdCluster = new Etcd.Builder()
44-
.withImage("gcr.io/etcd-development/etcd:v3.5.4")
4544
.withNodes(1)
4645
.build()
4746
etcdCluster.start()

‎pom.xml

Lines changed: 103 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<commons-lang.version>2.6</commons-lang.version>
112112
<commons-lang3.version>3.10</commons-lang3.version>
113113
<curator.version>2.12.0</curator.version>
114-
<etcd.version>0.7.1</etcd.version>
114+
<etcd.version>0.7.3</etcd.version>
115115
<delta.version>2.0.0</delta.version>
116116
<failsafe.verion>2.4.4</failsafe.verion>
117117
<fb303.version>0.9.3</fb303.version>
@@ -853,22 +853,10 @@
853853
<artifactId>netty-all</artifactId>
854854
<version>${netty.version}</version>
855855
<exclusions>
856-
<exclusion>
857-
<groupId>io.netty</groupId>
858-
<artifactId>netty-codec-dns</artifactId>
859-
</exclusion>
860856
<exclusion>
861857
<groupId>io.netty</groupId>
862858
<artifactId>netty-codec-haproxy</artifactId>
863859
</exclusion>
864-
<exclusion>
865-
<groupId>io.netty</groupId>
866-
<artifactId>netty-codec-http</artifactId>
867-
</exclusion>
868-
<exclusion>
869-
<groupId>io.netty</groupId>
870-
<artifactId>netty-codec-http2</artifactId>
871-
</exclusion>
872860
<exclusion>
873861
<groupId>io.netty</groupId>
874862
<artifactId>netty-codec-memcache</artifactId>
@@ -885,10 +873,6 @@
885873
<groupId>io.netty</groupId>
886874
<artifactId>netty-codec-smtp</artifactId>
887875
</exclusion>
888-
<exclusion>
889-
<groupId>io.netty</groupId>
890-
<artifactId>netty-codec-socks</artifactId>
891-
</exclusion>
892876
<exclusion>
893877
<groupId>io.netty</groupId>
894878
<artifactId>netty-codec-stomp</artifactId>
@@ -899,19 +883,19 @@
899883
</exclusion>
900884
<exclusion>
901885
<groupId>io.netty</groupId>
902-
<artifactId>netty-handler-proxy</artifactId>
886+
<artifactId>netty-resolver-dns-classes-macos</artifactId>
903887
</exclusion>
904888
<exclusion>
905889
<groupId>io.netty</groupId>
906-
<artifactId>netty-resolver-dns</artifactId>
890+
<artifactId>netty-resolver-dns-native-macos</artifactId>
907891
</exclusion>
908892
<exclusion>
909893
<groupId>io.netty</groupId>
910-
<artifactId>netty-resolver-dns-classes-macos</artifactId>
894+
<artifactId>netty-transport-classes-kqueue</artifactId>
911895
</exclusion>
912896
<exclusion>
913897
<groupId>io.netty</groupId>
914-
<artifactId>netty-resolver-dns-native-macos</artifactId>
898+
<artifactId>netty-transport-native-kqueue</artifactId>
915899
</exclusion>
916900
<exclusion>
917901
<groupId>io.netty</groupId>
@@ -928,6 +912,104 @@
928912
</exclusions>
929913
</dependency>
930914

915+
<dependency>
916+
<groupId>io.netty</groupId>
917+
<artifactId>netty-buffer</artifactId>
918+
<version>${netty.version}</version>
919+
</dependency>
920+
921+
<dependency>
922+
<groupId>io.netty</groupId>
923+
<artifactId>netty-codec-dns</artifactId>
924+
<version>${netty.version}</version>
925+
</dependency>
926+
927+
<dependency>
928+
<groupId>io.netty</groupId>
929+
<artifactId>netty-codec-http</artifactId>
930+
<version>${netty.version}</version>
931+
</dependency>
932+
933+
<dependency>
934+
<groupId>io.netty</groupId>
935+
<artifactId>netty-codec-http2</artifactId>
936+
<version>${netty.version}</version>
937+
</dependency>
938+
939+
<dependency>
940+
<groupId>io.netty</groupId>
941+
<artifactId>netty-codec-socks</artifactId>
942+
<version>${netty.version}</version>
943+
</dependency>
944+
945+
<dependency>
946+
<groupId>io.netty</groupId>
947+
<artifactId>netty-codec</artifactId>
948+
<version>${netty.version}</version>
949+
</dependency>
950+
951+
<dependency>
952+
<groupId>io.netty</groupId>
953+
<artifactId>netty-common</artifactId>
954+
<version>${netty.version}</version>
955+
</dependency>
956+
957+
<dependency>
958+
<groupId>io.netty</groupId>
959+
<artifactId>netty-handler-proxy</artifactId>
960+
<version>${netty.version}</version>
961+
</dependency>
962+
963+
<dependency>
964+
<groupId>io.netty</groupId>
965+
<artifactId>netty-handler</artifactId>
966+
<version>${netty.version}</version>
967+
</dependency>
968+
969+
<dependency>
970+
<groupId>io.netty</groupId>
971+
<artifactId>netty-resolver-dns</artifactId>
972+
<version>${netty.version}</version>
973+
</dependency>
974+
975+
<dependency>
976+
<groupId>io.netty</groupId>
977+
<artifactId>netty-resolver</artifactId>
978+
<version>${netty.version}</version>
979+
</dependency>
980+
981+
<dependency>
982+
<groupId>io.netty</groupId>
983+
<artifactId>netty-transport-classes-epoll</artifactId>
984+
<version>${netty.version}</version>
985+
</dependency>
986+
987+
<dependency>
988+
<groupId>io.netty</groupId>
989+
<artifactId>netty-transport-native-epoll</artifactId>
990+
<version>${netty.version}</version>
991+
<classifier>linux-aarch_64</classifier>
992+
</dependency>
993+
994+
<dependency>
995+
<groupId>io.netty</groupId>
996+
<artifactId>netty-transport-native-epoll</artifactId>
997+
<version>${netty.version}</version>
998+
<classifier>linux-x86_64</classifier>
999+
</dependency>
1000+
1001+
<dependency>
1002+
<groupId>io.netty</groupId>
1003+
<artifactId>netty-transport-native-unix-common</artifactId>
1004+
<version>${netty.version}</version>
1005+
</dependency>
1006+
1007+
<dependency>
1008+
<groupId>io.netty</groupId>
1009+
<artifactId>netty-transport</artifactId>
1010+
<version>${netty.version}</version>
1011+
</dependency>
1012+
9311013
<dependency>
9321014
<groupId>jakarta.servlet</groupId>
9331015
<artifactId>jakarta.servlet-api</artifactId>

0 commit comments

Comments
 (0)