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

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

commit d0e8a5be80899d531e97365e707cf92226d3e9ac
Author: Jiří Ondrušek <[email protected]>
AuthorDate: Wed Aug 19 09:50:42 2026 +0000

    Fixed salesforce test module
    
    Pin com.google.protobuf:protobuf-java to the version used by Camel's
    protobuf generated code (4.35.1) via a new protobuf.version property
    synced from camel-dependencies. quarkus-bom 3.39.0.CR1 manages 4.35.0
    and protobuf refuses to load generated code newer than the runtime
    (ProtobufRuntimeVersionException when loading ReplayPreset in
    camel-salesforce). The direct dependencyManagement entry in
    build-parent-it takes precedence over the quarkus-bom import; remove
    it when quarkus-bom manages protobuf-java >= 4.35.1.
    
    Co-Authored-By: Claude Fable 5 <[email protected]>
---
 pom.xml                      | 1 +
 poms/build-parent-it/pom.xml | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/pom.xml b/pom.xml
index 3e756576ad..a53c5cf3b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,6 +160,7 @@
         <opencensus.version>0.31.0</opencensus.version><!-- Mess in Google 
cloud. Keep in sync with version used in 
com.google.http-client:google-http-client -->
         
<opentelemetry-semconv-legacy.version>1.29.0-alpha</opentelemetry-semconv-legacy.version><!--
 Alignment for camel-opentelemetry and google-pubsub -->
         <org.json.version>20240303</org.json.version><!-- Used by 
google-cloud-bigquery and com.ibm.mq.jakarta.client -->
+        <protobuf.version>4.35.1</protobuf.version><!-- @sync 
org.apache.camel:camel-dependencies:${camel.version} prop:protobuf-version -->
         <reactor-core.version>3.7.11</reactor-core.version><!-- @sync 
com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core 
-->
         <reactor-netty.version>${reactor-netty-version}</reactor-netty.version>
         <retrofit.version>3.0.0</retrofit.version><!-- @sync 
org.kiwiproject:consul-client:${consul-client-version} prop:retrofit.version -->
diff --git a/poms/build-parent-it/pom.xml b/poms/build-parent-it/pom.xml
index b7a0b3bb5e..4f46307b60 100644
--- a/poms/build-parent-it/pom.xml
+++ b/poms/build-parent-it/pom.xml
@@ -70,6 +70,14 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- Direct entry to win over the older protobuf-java managed by 
the quarkus-bom import above.
+                 camel-salesforce protobuf generated code requires runtime >= 
camel's protobuf-version.
+                 Remove when quarkus-bom manages protobuf-java >= 
${protobuf.version} -->
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>${protobuf.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

Reply via email to