This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch camel-3.19.x in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.19.x by this push: new f5b20f7713d CAMEL-18560: camel-etcd3 - Align the grpc version of jetcd-grpc with vertx-grpc (#8445) f5b20f7713d is described below commit f5b20f7713de2e0ef4b30a55339d2d1a223f6c84 Author: Nicolas Filotto <essob...@users.noreply.github.com> AuthorDate: Wed Sep 28 15:27:47 2022 +0200 CAMEL-18560: camel-etcd3 - Align the grpc version of jetcd-grpc with vertx-grpc (#8445) ## Motivation Merging https://github.com/apache/camel/pull/8436 causes a build failure in camel-spring-boot project with an error or type: ``` [INFO] --- camel-spring-boot-generator-maven-plugin:3.19.0-SNAPSHOT:prepare-spring-boot-starter (generate) @ camel-etcd3-starter --- org.apache.maven.artifact.versioning.OverConstrainedVersionException: The artifact has no valid ranges io.grpc:grpc-core:jar:1.47.0 Path to dependency: 1) org.apache.camel:camel-etcd3:pom:3.19.0-SNAPSHOT 2) io.etcd:jetcd-core:jar:0.7.3 3) io.etcd:jetcd-grpc:jar:0.7.3 ``` ## Modifications This is due to a conflict of grpc version used by jetcd-grpc (1.48.0) and the one used by vertx-grpc (1.47.0). * Align the grpc versions to `1.47.0` * Exclude grpc from jetcd-core --- 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 358ba29581d..1d7bf4c333b 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 5aba118de91..002178ec0ae 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>