You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2023/06/28 10:58:31 UTC

[camel] branch main updated: CAMEL-19558 - Manage protobuf to build and test with a single deterministic version

This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 180a4bee666 CAMEL-19558 - Manage protobuf to build and test with a single deterministic version
180a4bee666 is described below

commit 180a4bee6661b8bc880d079c37e7760fc07ef988
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Wed Jun 28 11:22:20 2023 +0200

    CAMEL-19558 - Manage protobuf to build and test with a single
    deterministic version
---
 camel-dependencies/pom.xml                         |  4 ++--
 components/camel-grpc/pom.xml                      |  4 ----
 components/camel-protobuf/pom.xml                  |  2 --
 .../camel-salesforce-component/pom.xml             |  6 ++---
 .../camel/converter/stream/InputStreamCache.java   |  7 +++---
 parent/pom.xml                                     | 26 ++++++++++++++++++++--
 6 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 0c516a2465b..b2ae3684220 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -171,7 +171,6 @@
         <grpc-google-auth-library-version>1.5.3</grpc-google-auth-library-version>
         <grpc-java-jwt-version>4.3.0</grpc-java-jwt-version>
         <grpc-netty-tcnative-boringssl-static-version>2.0.59.Final</grpc-netty-tcnative-boringssl-static-version>
-        <grpc-protobuf-version>3.22.2</grpc-protobuf-version>
         <grpc-version>1.56.0</grpc-version>
         <gson-version>2.10.1</gson-version>
         <guava-version>32.0.1-jre</guava-version>
@@ -373,8 +372,9 @@
         <pooled-jms-version>3.1.0</pooled-jms-version>
         <powermock-version>2.0.7</powermock-version>
         <properties-maven-plugin-version>1.1.0</properties-maven-plugin-version>
+        <proto-google-common-protos-version>2.21.0</proto-google-common-protos-version>
         <protobuf-maven-plugin-version>0.6.1</protobuf-maven-plugin-version>
-        <protobuf-version>3.19.6</protobuf-version>
+        <protobuf-version>3.23.2</protobuf-version>
         <protonpack-version>1.8</protonpack-version>
         <protostream-version>4.6.2.Final</protostream-version>
         <prowide-version>SRU2022-10.0.1</prowide-version>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index dc58353348e..c3c4748b31d 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -32,10 +32,6 @@
     <name>Camel :: gRPC</name>
     <description>Camel component for gRPC (Remote Procedure Call) support</description>
 
-    <properties>
-        <protobuf-version>${grpc-protobuf-version}</protobuf-version>
-    </properties>
-
     <dependencies>
 
         <!-- requires camel-core -->
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index 1f04cf19cc2..cf72a05b087 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -43,12 +43,10 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>${protobuf-version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java-util</artifactId>
-            <version>${protobuf-version}</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index e966b923f6b..ffddaa32fc5 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -288,11 +288,11 @@
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.6.1</version>
+                <version>${protobuf-maven-plugin-version}</version>
                 <configuration>
-                    <protocArtifact>com.google.protobuf:protoc:3.21.12:exe:${os.detected.classifier}</protocArtifact>
+                    <protocArtifact>com.google.protobuf:protoc:${protobuf-version}:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
-                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.56.0:exe:${os.detected.classifier}</pluginArtifact>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc-version}:exe:${os.detected.classifier}</pluginArtifact>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/core/camel-support/src/main/java/org/apache/camel/converter/stream/InputStreamCache.java b/core/camel-support/src/main/java/org/apache/camel/converter/stream/InputStreamCache.java
index 112a8070763..4831e1adee4 100644
--- a/core/camel-support/src/main/java/org/apache/camel/converter/stream/InputStreamCache.java
+++ b/core/camel-support/src/main/java/org/apache/camel/converter/stream/InputStreamCache.java
@@ -26,10 +26,9 @@ import org.apache.camel.StreamCache;
 /**
  * A {@link StreamCache} for caching using an in-memory byte array.
  * <p/>
- * <b>Important:</b>
- * All the classes from the Camel release that implements {@link StreamCache} is NOT intended for end users
- * to create as instances, but they are part of
- * Camels <a href="https://camel.apache.org/manual/stream-caching.html">stream-caching</a> functionality.
+ * <b>Important:</b> All the classes from the Camel release that implements {@link StreamCache} is NOT intended for end
+ * users to create as instances, but they are part of Camels
+ * <a href="https://camel.apache.org/manual/stream-caching.html">stream-caching</a> functionality.
  */
 public final class InputStreamCache extends ByteArrayInputStream implements StreamCache {
 
diff --git a/parent/pom.xml b/parent/pom.xml
index ee7cc003f79..4681b4df816 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -192,7 +192,6 @@
         <grpc-google-auth-library-version>1.5.3</grpc-google-auth-library-version>
         <grpc-java-jwt-version>4.3.0</grpc-java-jwt-version>
         <grpc-netty-tcnative-boringssl-static-version>2.0.59.Final</grpc-netty-tcnative-boringssl-static-version>
-        <grpc-protobuf-version>3.22.2</grpc-protobuf-version>
         <gson-version>2.10.1</gson-version>
         <guava-version>32.0.1-jre</guava-version>
         <guice3-version>3.0</guice3-version>
@@ -396,7 +395,8 @@
         <pooled-jms-version>3.1.0</pooled-jms-version>
         <powermock-version>2.0.7</powermock-version>
         <properties-maven-plugin-version>1.1.0</properties-maven-plugin-version>
-        <protobuf-version>3.19.6</protobuf-version>
+        <proto-google-common-protos-version>2.21.0</proto-google-common-protos-version>
+        <protobuf-version>3.23.2</protobuf-version>
         <protobuf-maven-plugin-version>0.6.1</protobuf-maven-plugin-version>
         <protonpack-version>1.8</protonpack-version>
         <protostream-version>4.6.2.Final</protostream-version>
@@ -2737,6 +2737,12 @@
                 <artifactId>jaxb-runtime</artifactId>
                 <version>${glassfish-jaxb-runtime-version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.google.api.grpc</groupId>
+                <artifactId>proto-google-common-protos</artifactId>
+                <version>${proto-google-common-protos-version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
@@ -2753,6 +2759,22 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>${protobuf-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java-util</artifactId>
+                <version>${protobuf-version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.checkerframework</groupId>
+                        <artifactId>checker-qual</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
         </dependencies>
     </dependencyManagement>