You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2023/01/30 23:11:28 UTC

[cxf] branch 3.4.x-fixes updated (7fccf9df10 -> 3acb1d2513)

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

reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


    from 7fccf9df10 Recording .gitmergeinfo Changes
     new 7384c9824e Update Jackson to 2.14.2
     new 3acb1d2513 Recording .gitmergeinfo Changes

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:
 .gitmergeinfo  | 1 +
 parent/pom.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)


[cxf] 01/02: Update Jackson to 2.14.2

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

reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 7384c9824e70f097b81e7f8c2f624ef95f0a1604
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jan 30 10:02:10 2023 -0500

    Update Jackson to 2.14.2
    
    (cherry picked from commit 65157651638b73115b3623c617b842136acd3946)
    (cherry picked from commit 2d68a2e46debfcc27fc845ea08fbe078a8abff1a)
    
    # Conflicts:
    #       parent/pom.xml
    (cherry picked from commit 532ad5ebeac8c9b3f82ae98dab415a0e4e068ef6)
---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 427c1a545a..e4657b09da 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -132,8 +132,8 @@
         <cxf.httpcomponents.core.version>4.4.15</cxf.httpcomponents.core.version>
         <cxf.httpcomponents.client5.version>5.1.4</cxf.httpcomponents.client5.version>
         <cxf.httpcomponents.core5.version>5.1.5</cxf.httpcomponents.core5.version>
-        <cxf.jackson.version>2.14.1</cxf.jackson.version>
-        <cxf.jackson.databind.version>2.14.1</cxf.jackson.databind.version>
+        <cxf.jackson.version>2.14.2</cxf.jackson.version>
+        <cxf.jackson.databind.version>2.14.2</cxf.jackson.databind.version>
         <cxf.jacorb.version>3.9</cxf.jacorb.version>
         <cxf.jaeger.version>1.8.1</cxf.jaeger.version>
         <cxf.jakarta.activation.version>1.2.2</cxf.jakarta.activation.version>


[cxf] 02/02: Recording .gitmergeinfo Changes

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

reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 3acb1d25136a42bed87247ab8a7110b0da941ab9
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jan 30 18:03:26 2023 -0500

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index f43856208f..5eb8055053 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -95,6 +95,7 @@ B 54fb5c77077f2e905f04cd536306d43015afc31d
 B 55f1b64fc4c3cadc2448171267fa45c224a58abd
 B 561b38bc68eaed880ccfea37797f2b9d5f762c7e
 B 565f4272d21736bd36763df8f3a0f40d04a2354c
+B 56ecaeb37e7cf058264c15d9810ffd682fa6643e
 B 583399f6d9e03c10dbdfb9de2d40e204224b26f0
 B 584df96a050d43bc777cb4613554e5804ed0ac94
 B 58ef7dcb43e5f8daf1f145726d486871bf0dba6b