You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by co...@apache.org on 2023/07/19 19:21:06 UTC

[camel] branch camel-3.20.x updated: Updating Californium to 2.7.4 (#10737)

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

coheigea pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-3.20.x by this push:
     new 7855994f379 Updating Californium to 2.7.4 (#10737)
7855994f379 is described below

commit 7855994f3791377e7c6c4d6a74ccef2409fd242d
Author: Colm O hEigeartaigh <co...@users.noreply.github.com>
AuthorDate: Wed Jul 19 20:20:58 2023 +0100

    Updating Californium to 2.7.4 (#10737)
    
    * Updating californium to 2.7.4 (#10729)
    
    * Bugfix for californium update, as Netty 2.7.4 dependency isn't in maven central (#10734)
---
 camel-dependencies/pom.xml    | 2 +-
 components/camel-coap/pom.xml | 2 +-
 parent/pom.xml                | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 6519176973e..6ec4dffe42b 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -79,7 +79,7 @@
     <c3p0-version>0.9.5.5</c3p0-version>
     <caffeine-version>3.1.2</caffeine-version>
     <californium-scandium-version>2.7.4</californium-scandium-version>
-    <californium-version>2.7.2</californium-version>
+    <californium-version>2.7.4</californium-version>
     <camel.failsafe.forkTimeout>600</camel.failsafe.forkTimeout>
     <camel.osgi.activator></camel.osgi.activator>
     <camel.osgi.dynamic></camel.osgi.dynamic>
diff --git a/components/camel-coap/pom.xml b/components/camel-coap/pom.xml
index 632da3276dc..2c37caaaf3c 100644
--- a/components/camel-coap/pom.xml
+++ b/components/camel-coap/pom.xml
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>org.eclipse.californium</groupId>
             <artifactId>element-connector-tcp-netty</artifactId>
-            <version>${californium-version}</version>
+            <version>${californium-netty-version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>element-connector</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index b5869a68780..5980bd65c29 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -94,7 +94,9 @@
         <build-helper-maven-plugin-version>3.3.0</build-helper-maven-plugin-version>
         <c3p0-version>0.9.5.5</c3p0-version>
         <caffeine-version>3.1.2</caffeine-version>
-        <californium-version>2.7.2</californium-version>
+        <californium-version>2.7.4</californium-version>
+        <!-- Remove once 2.7.5 comes out -->
+        <californium-netty-version>2.7.2</californium-netty-version>
         <californium-scandium-version>2.7.4</californium-scandium-version>
         <cassandra-driver-version>4.15.0</cassandra-driver-version>
         <cassandra-version>4.0.6</cassandra-version>