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 2019/11/13 23:49:16 UTC
[cxf] branch 3.3.x-fixes updated (fb74d32 -> 1bece4e)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from fb74d32 Adding JWT test
new 99028cc Revert "CXF-8155: Update to Jackson 2.10.1"
new 1bece4e 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: Revert "CXF-8155: Update to Jackson 2.10.1"
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 99028cc48e200ea0c36fe2bee87bf813e513a513
Author: reta <dr...@gmail.com>
AuthorDate: Wed Nov 13 18:36:46 2019 -0500
Revert "CXF-8155: Update to Jackson 2.10.1"
This reverts commit a4fc3a0462f09dd6c6c920385b67e621d7e36399.
(cherry picked from commit 7ef814556d727c147d6f625cbb1170edfd24a752)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4bac5a5..3f9b06b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -128,8 +128,8 @@
<cxf.httpcomponents.client.version>4.5.10</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.12</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.9.10</cxf.jackson.version>
+ <cxf.jackson.databind.version>2.9.10</cxf.jackson.databind.version>
<cxf.jaeger.version>0.35.5</cxf.jaeger.version>
<cxf.james.mim4j.version>0.7.2</cxf.james.mim4j.version>
<cxf.javassist.version>3.25.0-GA</cxf.javassist.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.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1bece4e52d9fde576b34883fbabe5ef07fc7db2e
Author: reta <dr...@gmail.com>
AuthorDate: Wed Nov 13 18:48:55 2019 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index d564c32..f631634 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -51,6 +51,7 @@ M 589e321622b72ae57fab910d76b3e4fb0c160979
M 59ba4821c92146723df063f9eb6e1c3ae0be5834
M 5aa0660a9fe324e5c8f36e47e270971d0e85b6f8
M 6b7e50b87d74dc6b7d1e830b373c7e30c04e14a2
+M 7ef814556d727c147d6f625cbb1170edfd24a752
M 9c462e9bd614d529f0a2fd86490243ea1c858651
M a4fc3a0462f09dd6c6c920385b67e621d7e36399
M aabf37788e571426e70250e7a62c7f4502e4d6e9