(camel) branch main updated: Fix camel-infinispan to not use mixed versions of protostream JARs

[davsclaus]

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

davsclaus 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 198d6af53a7 Fix camel-infinispan to not use mixed versions of 
protostream JARs
198d6af53a7 is described below

commit 198d6af53a7cd5523b4bc26382195846bcc81848
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Jun 4 07:31:38 2025 +0200

    Fix camel-infinispan to not use mixed versions of protostream JARs
---
 components/camel-infinispan/camel-infinispan/pom.xml | 8 ++++----
 parent/pom.xml                                       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/camel-infinispan/camel-infinispan/pom.xml 
b/components/camel-infinispan/camel-infinispan/pom.xml
index c9ed353ba49..9962bc0b326 100644
--- a/components/camel-infinispan/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/camel-infinispan/pom.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.infinispan.protostream</groupId>
             <artifactId>protostream-processor</artifactId>
-            <version>${protostream-version}</version>
+            <version>${infinispan-protostream-version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -134,7 +134,7 @@
         <dependency>
             <groupId>org.infinispan.protostream</groupId>
             <artifactId>protostream</artifactId>
-            <version>${protostream-version}</version>
+            <version>${infinispan-protostream-version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
@@ -173,12 +173,12 @@
             <dependency>
                 <groupId>org.infinispan.protostream</groupId>
                 <artifactId>protostream</artifactId>
-                <version>${protostream-version}</version>
+                <version>${infinispan-protostream-version}</version>
             </dependency>
             <dependency>
                 <groupId>org.infinispan.protostream</groupId>
                 <artifactId>protostream-types</artifactId>
-                <version>${protostream-version}</version>
+                <version>${infinispan-protostream-version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/parent/pom.xml b/parent/pom.xml
index ddfe7c8d771..a334ba0f4c3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -239,6 +239,7 @@
         <ignite-version>2.17.0</ignite-version>
         <impsort-maven-plugin-version>1.12.0</impsort-maven-plugin-version>
         <infinispan-version>15.2.1.Final</infinispan-version>
+        
<infinispan-protostream-version>15.0.13.Final</infinispan-protostream-version>
         <influx-java-driver-version>2.25</influx-java-driver-version>
         
<influx-client-java-driver-version>7.3.0</influx-client-java-driver-version>
         <irclib-version>1.10</irclib-version>
@@ -428,7 +429,6 @@
         <protobuf-version>3.25.5</protobuf-version>
         <protobuf-maven-plugin-version>3.4.0</protobuf-maven-plugin-version>
         <protonpack-version>1.8</protonpack-version>
-        <protostream-version>5.0.12.Final</protostream-version>
         <prowide-version>SRU2024-10.2.7</prowide-version>
         <pubnub-version>10.5.2</pubnub-version>
         <pulsar-version>4.0.5</pulsar-version>