From 607d1afb42e1b9e50f343339e2ba976d18eee0a8 Mon Sep 17 00:00:00 2001
From: Peter Palaga <ppalaga@redhat.com>
Date: Tue, 13 Jun 2023 21:15:33 +0200
Subject: [PATCH] CAMEL-19451 - Import grpc-bom to build and test with a single
 deterministic set of gRPC dependencies

---
 camel-dependencies/pom.xml                    |  2 --
 components/camel-etcd3/pom.xml                | 19 +------------------
 components/camel-grpc/pom.xml                 | 19 -------------------
 components/camel-opentelemetry/pom.xml        |  1 -
 .../camel-salesforce-component/pom.xml        |  7 ++-----
 parent/pom.xml                                | 10 ++++++++--
 6 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 0498560aa3e9f..0f85b3b2a5de1 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -278,8 +278,6 @@
         <jcommander-version>1.72</jcommander-version>
         <jcr-version>2.0</jcr-version>
         <jedis-client-version>4.4.2</jedis-client-version>
-        <jetcd-grpc-version>1.47.0</jetcd-grpc-version>
-        <jetcd-guava-version>32.0.0-jre</jetcd-guava-version>
         <jetcd-version>0.7.5</jetcd-version>
         <jetty-version>11.0.15</jetty-version>
         <jetty-plugin-version>${jetty-version}</jetty-plugin-version>
diff --git a/components/camel-etcd3/pom.xml b/components/camel-etcd3/pom.xml
index 0576891815468..cb7a49dd8b569 100644
--- a/components/camel-etcd3/pom.xml
+++ b/components/camel-etcd3/pom.xml
@@ -64,23 +64,6 @@
             <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>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${jetcd-guava-version}</version>
         </dependency>
 
         <!-- testing -->
@@ -123,5 +106,5 @@
             </plugin>
         </plugins>
     </build>
- 
+
 </project>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 23aef1a489dd4..806ca8701a90d 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -47,7 +47,6 @@
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-auth</artifactId>
-            <version>${grpc-version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.code.findbugs</groupId>
@@ -58,32 +57,20 @@
         <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>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.code.findbugs</groupId>
                     <artifactId>jsr305</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>${protobuf-version}</version>
-        </dependency>
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-stub</artifactId>
-            <version>${grpc-version}</version>
         </dependency>
 
         <dependency>
@@ -92,12 +79,6 @@
             <version>${javassist-version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-tcnative-boringssl-static</artifactId>
-            <version>${grpc-netty-tcnative-boringssl-static-version}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.google.auth</groupId>
             <artifactId>google-auth-library-oauth2-http</artifactId>
diff --git a/components/camel-opentelemetry/pom.xml b/components/camel-opentelemetry/pom.xml
index 7cd79936426dd..4c2e3c89f15b7 100644
--- a/components/camel-opentelemetry/pom.xml
+++ b/components/camel-opentelemetry/pom.xml
@@ -57,7 +57,6 @@
         <dependency>
             <groupId>io.grpc</groupId>
             <artifactId>grpc-netty-shaded</artifactId>
-            <version>${grpc-version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.code.findbugs</groupId>
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index a048b5124799b..c5aff841fa36e 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -127,7 +127,7 @@
             <artifactId>jaxb-impl</artifactId>
             <version>${jaxb-impl-version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
@@ -138,17 +138,14 @@
         <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>org.apache.avro</groupId>
@@ -332,7 +329,7 @@
                                             </files>
                                             <message><![CDATA[Salesforce Migration Tool required
 
-You need to download the Salesforce Migration Tool (ZIP file) and 
+You need to download the Salesforce Migration Tool (ZIP file) and
 extract the `ant-salesforce.jar` out of it to:
 
 ${salesforce.component.root}/it/resources/migration-tool/ant-salesforce.jar
diff --git a/parent/pom.xml b/parent/pom.xml
index e04aaae63fbbd..78786f9cdb76e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -273,8 +273,6 @@
         <jcommander-version>1.72</jcommander-version>
         <jcr-version>2.0</jcr-version>
         <jedis-client-version>4.4.2</jedis-client-version>
-        <jetcd-grpc-version>1.47.0</jetcd-grpc-version>
-        <jetcd-guava-version>32.0.0-jre</jetcd-guava-version>
         <jetcd-version>0.7.5</jetcd-version>
         <jetty-version>11.0.15</jetty-version>
         <jetty-plugin-version>${jetty-version}</jetty-plugin-version>
@@ -2721,6 +2719,14 @@
                 <type>pom</type>
             </dependency>
 
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-bom</artifactId>
+                <version>${grpc-version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
             <dependency>
                 <groupId>com.github.ben-manes.caffeine</groupId>
                 <artifactId>caffeine</artifactId>