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 15:05:36 UTC

[camel] branch camel-3.21.x updated (d85e633e522 -> fbb7e0fd964)

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

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


    from d85e633e522 Upgrade batik version to 1.16 (#9718) (#10722) (#10724)
     new 581e3fe710a Updating californium to 2.7.4 (#10729)
     new fbb7e0fd964 Bugfix for californium update, as Netty 2.7.4 dependency isn't in maven central (#10734)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 camel-dependencies/pom.xml    | 2 +-
 components/camel-coap/pom.xml | 2 +-
 parent/pom.xml                | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)


[camel] 01/02: Updating californium to 2.7.4 (#10729)

Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 581e3fe710a2026d1ce5b910e71bc82117a62772
Author: Colm O hEigeartaigh <co...@users.noreply.github.com>
AuthorDate: Wed Jul 19 14:36:46 2023 +0100

    Updating californium to 2.7.4 (#10729)
---
 camel-dependencies/pom.xml | 2 +-
 parent/pom.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 5f8f1334dd6..db4f82f3f0f 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/parent/pom.xml b/parent/pom.xml
index b177429ef18..50793f9ab9d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -94,7 +94,7 @@
         <build-helper-maven-plugin-version>3.2.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>
         <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>


[camel] 02/02: Bugfix for californium update, as Netty 2.7.4 dependency isn't in maven central (#10734)

Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit fbb7e0fd9642623a5102fbd38e6ce8f4466a486d
Author: Colm O hEigeartaigh <co...@users.noreply.github.com>
AuthorDate: Wed Jul 19 16:04:03 2023 +0100

    Bugfix for californium update, as Netty 2.7.4 dependency isn't in maven central (#10734)
---
 components/camel-coap/pom.xml | 2 +-
 parent/pom.xml                | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/camel-coap/pom.xml b/components/camel-coap/pom.xml
index e3e52f14387..0acb9858694 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 50793f9ab9d..e9fff89b6e4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -95,6 +95,8 @@
         <c3p0-version>0.9.5.5</c3p0-version>
         <caffeine-version>3.1.2</caffeine-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>