You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/11/22 09:43:45 UTC

[camel] branch main updated (e9b4ab098dd -> 6256b5747c0)

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

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


    from e9b4ab098dd CAMEL-18643 - AWS Health Check: Use AwsServiceException instead of SdkClientException for health check - AWS EC2
     new 6ba50e0dfa2 Upgrade Jackson to version 2.14.1
     new 6256b5747c0 Sync deps and align camel-spark

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     | 3 ++-
 components/camel-spark/pom.xml | 2 +-
 parent/pom.xml                 | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)


[camel] 02/02: Sync deps and align camel-spark

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

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

commit 6256b5747c09e684da8f70cdefa02ac66a22506d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 22 10:43:16 2022 +0100

    Sync deps and align camel-spark
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 camel-dependencies/pom.xml     | 3 ++-
 components/camel-spark/pom.xml | 2 +-
 parent/pom.xml                 | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 56db43980dc..a5f02397438 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -275,7 +275,8 @@
     <jackrabbit-version>2.21.13</jackrabbit-version>
     <jackson-jq-version>1.0.0-preview.20220705</jackson-jq-version>
     <jackson-version>1.9.12</jackson-version>
-    <jackson2-version>2.14.0</jackson2-version>
+    <jackson2-module-scala-version>2.14.0</jackson2-module-scala-version>
+    <jackson2-version>2.14.1</jackson2-version>
     <jakarta-api-version>2.1.5</jakarta-api-version>
     <jakarta-cdi-api-version>2.0.2</jakarta-cdi-api-version>
     <jakarta-jaxb-version>2.3.3</jakarta-jaxb-version>
diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml
index 28c8384af78..d2c3fb2c287 100644
--- a/components/camel-spark/pom.xml
+++ b/components/camel-spark/pom.xml
@@ -137,7 +137,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-scala_2.12</artifactId>
-            <version>${jackson2-version}</version>
+            <version>${jackson2-module-scala-version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.scala-lang</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index ec0a6f6a58b..69351d31f0a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -254,7 +254,8 @@
         <ivy-version>2.5.1</ivy-version>
         <jackson-jq-version>1.0.0-preview.20220705</jackson-jq-version>
         <jackson-version>1.9.12</jackson-version>
-        <jackson2-version>2.14.1</jackson2-version>
+	<jackson2-version>2.14.1</jackson2-version>
+	<jackson2-module-scala-version>2.14.0</jackson2-module-scala-version>
         <jackrabbit-version>2.21.13</jackrabbit-version>
         <jasminb-jsonapi-version>0.11</jasminb-jsonapi-version>
         <jandex-version>3.0.3</jandex-version>


[camel] 01/02: Upgrade Jackson to version 2.14.1

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

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

commit 6ba50e0dfa2f35a2fdb08c48828a4f7e5c1575b2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 22 10:09:59 2022 +0100

    Upgrade Jackson to version 2.14.1
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 231026d2c39..ec0a6f6a58b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -254,7 +254,7 @@
         <ivy-version>2.5.1</ivy-version>
         <jackson-jq-version>1.0.0-preview.20220705</jackson-jq-version>
         <jackson-version>1.9.12</jackson-version>
-        <jackson2-version>2.14.0</jackson2-version>
+        <jackson2-version>2.14.1</jackson2-version>
         <jackrabbit-version>2.21.13</jackrabbit-version>
         <jasminb-jsonapi-version>0.11</jasminb-jsonapi-version>
         <jandex-version>3.0.3</jandex-version>