This is an automated email from the ASF dual-hosted git repository. zhonghongsheng pushed a commit to branch 5.4.1-release in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
commit 6d954275da941cf14c2695303ad4b3a5681d6b47 Author: Hongsheng Zhong <[email protected]> AuthorDate: Tue Oct 17 10:36:13 2023 +0800 Upgrade jetcd dependency version to 0.7.6; (#28780) Replace grpc-all dependency to separated ones (cherry picked from commit 5c6a9685bb579f5fd39a6b38bf693d0fdc4fa42c) --- .../proxy-native/src/main/release-docs/LICENSE | 8 +++---- distribution/proxy/src/main/release-docs/LICENSE | 8 +++---- mode/type/cluster/repository/provider/etcd/pom.xml | 4 ---- pom.xml | 28 +++++++++++++++++----- 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/distribution/proxy-native/src/main/release-docs/LICENSE b/distribution/proxy-native/src/main/release-docs/LICENSE index 5bed3db28bf..dea86439e86 100644 --- a/distribution/proxy-native/src/main/release-docs/LICENSE +++ b/distribution/proxy-native/src/main/release-docs/LICENSE @@ -259,10 +259,10 @@ The text of each license is the standard Apache 2.0 license. jackson-dataformat-yaml 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0 jackson-datatype-jsr310 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0 jcl-over-slf4j 1.7.36: https://github.com/qos-ch/slf4j, Apache 2.0 - jetcd-api 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0 - jetcd-common 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0 - jetcd-core 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0 - jetcd-grpc 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0 + jetcd-api 0.7.6: https://github.com/etcd-io/jetcd, Apache 2.0 + jetcd-common 0.7.6: https://github.com/etcd-io/jetcd, Apache 2.0 + jetcd-core 0.7.6: https://github.com/etcd-io/jetcd, Apache 2.0 + jetcd-grpc 0.7.6: https://github.com/etcd-io/jetcd, Apache 2.0 json-path 2.8.0: https://github.com/jayway/JsonPath, Apache 2.0 json-smart 2.4.10: https://www.minidev.net/, Apache 2.0 json-simple 1.1.1: https://code.google.com/archive/p/json-simple/, Apache 2.0 diff --git a/distribution/proxy/src/main/release-docs/LICENSE b/distribution/proxy/src/main/release-docs/LICENSE index 5bed3db28bf..dea86439e86 100644 --- a/distribution/proxy/src/main/release-docs/LICENSE +++ b/distribution/proxy/src/main/release-docs/LICENSE @@ -259,10 +259,10 @@ The text of each license is the standard Apache 2.0 license. jackson-dataformat-yaml 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0 jackson-datatype-jsr310 2.14.0: http://github.com/FasterXML/jackson, Apache 2.0 jcl-over-slf4j 1.7.36: https://github.com/qos-ch/slf4j, Apache 2.0 - jetcd-api 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0 - jetcd-common 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0 - jetcd-core 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0 - jetcd-grpc 0.7.5: https://github.com/etcd-io/jetcd, Apache 2.0 + jetcd-api 0.7.6: https://github.com/etcd-io/jetcd, Apache 2.0 + jetcd-common 0.7.6: https://github.com/etcd-io/jetcd, Apache 2.0 + jetcd-core 0.7.6: https://github.com/etcd-io/jetcd, Apache 2.0 + jetcd-grpc 0.7.6: https://github.com/etcd-io/jetcd, Apache 2.0 json-path 2.8.0: https://github.com/jayway/JsonPath, Apache 2.0 json-smart 2.4.10: https://www.minidev.net/, Apache 2.0 json-simple 1.1.1: https://code.google.com/archive/p/json-simple/, Apache 2.0 diff --git a/mode/type/cluster/repository/provider/etcd/pom.xml b/mode/type/cluster/repository/provider/etcd/pom.xml index ff846395d5c..50b9ac89329 100644 --- a/mode/type/cluster/repository/provider/etcd/pom.xml +++ b/mode/type/cluster/repository/provider/etcd/pom.xml @@ -44,9 +44,5 @@ <groupId>io.etcd</groupId> <artifactId>jetcd-core</artifactId> </dependency> - <dependency> - <groupId>io.grpc</groupId> - <artifactId>grpc-all</artifactId> - </dependency> </dependencies> </project> diff --git a/pom.xml b/pom.xml index 2c819228684..df951f684d9 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ <zookeeper.version>3.9.0</zookeeper.version> <curator.version>5.5.0</curator.version> - <jetcd.version>0.7.5</jetcd.version> + <jetcd.version>0.7.6</jetcd.version> <grpc.version>1.58.0</grpc.version> <elasticjob.version>3.0.3</elasticjob.version> @@ -427,15 +427,31 @@ <groupId>io.netty</groupId> <artifactId>netty-transport-native-unix-common</artifactId> </exclusion> - <exclusion> - <groupId>io.grpc</groupId> - <artifactId>*</artifactId> - </exclusion> </exclusions> </dependency> <dependency> <groupId>io.grpc</groupId> - <artifactId>grpc-all</artifactId> + <artifactId>grpc-core</artifactId> + <version>${grpc.version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-netty</artifactId> + <version>${grpc.version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-protobuf</artifactId> + <version>${grpc.version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-stub</artifactId> + <version>${grpc.version}</version> + </dependency> + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-grpclb</artifactId> <version>${grpc.version}</version> </dependency>
