You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/01/21 13:23:52 UTC

[cxf] branch 3.3.x-fixes updated (9c9fe8e -> 3267d13)

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

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


    from 9c9fe8e  Recording .gitmergeinfo Changes
     new f62b344  Updating Jackson
     new 3267d13  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  | 3 +++
 parent/pom.xml | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)


[cxf] 01/02: Updating Jackson

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

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

commit f62b344a5e9189bc19eabbaa88412538fe94c16b
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jan 21 12:39:42 2020 +0000

    Updating Jackson
    
    (cherry picked from commit 4699995c6ef392a98615382a5824dda0d1bbe9bf)
---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index e42f654..8df6f32 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -128,8 +128,8 @@
         <cxf.httpcomponents.client.version>4.5.11</cxf.httpcomponents.client.version>
         <cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
         <cxf.httpcomponents.core.version>4.4.13</cxf.httpcomponents.core.version>
-        <cxf.jackson.version>2.10.1</cxf.jackson.version>
-        <cxf.jackson.databind.version>2.10.1</cxf.jackson.databind.version>
+        <cxf.jackson.version>2.10.2</cxf.jackson.version>
+        <cxf.jackson.databind.version>2.10.2</cxf.jackson.databind.version>
         <cxf.jacorb.version>3.9</cxf.jacorb.version>
         <cxf.jaeger.version>0.35.5</cxf.jaeger.version>
         <cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>


[cxf] 02/02: Recording .gitmergeinfo Changes

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

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

commit 3267d1344940066a1b2a91c5565985ba1c4a6a2c
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jan 21 12:40:29 2020 +0000

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7106c6d..2bb44ff 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -36,6 +36,7 @@ B 39e26e3b2d3059664cc9aca6c8a4ea7f60bab3f1
 B 3b96065d50dbfda39b6f09d641893fe50a74c786
 B 3bf2dcafccb3d8243dea1afdedc333e307dddde0
 B 3e5825057de2a8aacc06a5707649424cc62043df
+B 3fc146580f43a0d7edad85318cdb6953922bdd5d
 B 407eeb0dea157eaa0635d0c37a7ed95463b5638f
 B 411fb51bccd3869a97e9e807f14f50ca6b1f2a10
 B 4213f7508f14d7cc8c489981831458619418921b
@@ -92,6 +93,7 @@ B bc4ea132eafb8d6668b07667f7acfcd94f1f7d62
 B bed309fcae7514d6bd7fccbc6c9d9835a7a39625
 B c49b6d578e4f33df736eeec46e10950c46a9278b
 B c9a2275276c6f8099585519372c24fda1cd7c3e0
+B cc4ea93826655c45eb5dd65290300ee42fe8d596
 B d076d4494d96d268a196d4d48602b36d7086680d
 B d4d4b1e740a48103811e33094adb19d5c22ca108
 B da4dfeed6867ed628dc05c9a2dbedbebdf33db21
@@ -112,6 +114,7 @@ M 160f50ed9bd9391b61417716b3a67653c9e81a98
 M 2275d49772676ac72bc14ebbc3173719cd72e635
 M 325ed0436bc9cfa9150b3504a54b5911b47e3266
 M 3b119ca6630f1384b93cd718d0cd95ccabc81e91
+M 4699995c6ef392a98615382a5824dda0d1bbe9bf
 M 528b35178ec31860cf5ad2095d6f3cc3c951d914
 M 55abc6f8416fd81f26627fa42a37f903f9ef7965
 M 589e321622b72ae57fab910d76b3e4fb0c160979