This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch CAMEL-18560/align-grpc-version in repository https://gitbox.apache.org/repos/asf/camel.git
commit 777a8ae489d2508ec1ebc6df4b7f86359b6da12f Author: Nicolas Filotto <nfilo...@talend.com> AuthorDate: Wed Sep 28 15:13:27 2022 +0200 CAMEL-18560: camel-etcd3 - Align the grpc version of jetcd-grpc with vertx-grpc --- camel-dependencies/pom.xml | 1 + components/camel-etcd3/pom.xml | 12 ++++++++++++ parent/pom.xml | 1 + 3 files changed, 14 insertions(+) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 09e1022d96e..2a07c829066 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -314,6 +314,7 @@ <jcr-version>2.0</jcr-version> <jedis-client-version>3.7.1</jedis-client-version> <jetcd-version>0.7.3</jetcd-version> + <jetcd-grpc-version>1.47.0</jetcd-grpc-version> <jettison-version>1.5.0</jettison-version> <jetty-plugin-version>${jetty-version}</jetty-plugin-version> <jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId> diff --git a/components/camel-etcd3/pom.xml b/components/camel-etcd3/pom.xml index e7449b65751..59bae705d1a 100644 --- a/components/camel-etcd3/pom.xml +++ b/components/camel-etcd3/pom.xml @@ -49,6 +49,18 @@ <groupId>io.etcd</groupId> <artifactId>jetcd-core</artifactId> <version>${jetcd-version}</version> + <exclusions> + <exclusion> + <groupId>io.grpc</groupId> + <artifactId>grpc-core</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>io.grpc</groupId> + <artifactId>grpc-core</artifactId> + <version>${jetcd-grpc-version}</version> </dependency> <!-- testing --> diff --git a/parent/pom.xml b/parent/pom.xml index 0f3adf536dc..857066a126a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -299,6 +299,7 @@ <jcr-version>2.0</jcr-version> <jedis-client-version>3.7.1</jedis-client-version> <jetcd-version>0.7.3</jetcd-version> + <jetcd-grpc-version>1.47.0</jetcd-grpc-version> <jetty9-version>9.4.48.v20220622</jetty9-version> <jetty-version>${jetty9-version}</jetty-version> <jetty-plugin-version>${jetty-version}</jetty-plugin-version>