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/16 19:15:05 UTC
[cxf] branch 3.3.x-fixes updated (82f8588 -> 5c14244)
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 82f8588 Some OIDC changes relating to public clients
new beeb13f CXF-8157: Update to Jackson Databind 2.9.10.1 (#600)
new 5c14244 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 +
osgi/itests/pom.xml | 22 ++++++++++++++++++----
parent/pom.xml | 2 +-
3 files changed, 20 insertions(+), 5 deletions(-)
[cxf] 01/02: CXF-8157: Update to Jackson Databind 2.9.10.1 (#600)
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 beeb13f0c08cdbdfa63e0bf2d4d2177d79778d56
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Nov 16 12:47:10 2019 -0500
CXF-8157: Update to Jackson Databind 2.9.10.1 (#600)
(cherry picked from commit 2275d49772676ac72bc14ebbc3173719cd72e635)
# Conflicts:
# parent/pom.xml
---
osgi/itests/pom.xml | 22 ++++++++++++++++++----
parent/pom.xml | 2 +-
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 9a369a8..97d8cc0 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -28,8 +28,7 @@
<artifactId>org.apache.cxf.osgi.itests</artifactId>
<name>Apache CXF :: OSGi :: Integration Tests</name>
<packaging>jar</packaging>
- <properties>
- </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -50,7 +49,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
@@ -142,8 +141,23 @@
<artifactId>pax-exam-junit4</artifactId>
<version>${cxf.pax.exam.version}</version>
<scope>test</scope>
+ <!--
+ Excluding bndlib in favor of biz.aQute.bndlib since
+ it is old and fails to process the recent JAR files (fe Jackson
+ Databind 2.9.10.1, ...)
+ -->
+ <exclusions>
+ <exclusion>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bndlib</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>3.5.0</version>
</dependency>
-
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 3f9b06b..1e8c0cd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -129,7 +129,7 @@
<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.9.10</cxf.jackson.version>
- <cxf.jackson.databind.version>2.9.10</cxf.jackson.databind.version>
+ <cxf.jackson.databind.version>2.9.10.1</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 5c142443d8a9f6e7adae5668a5b5beaa0599fb7f
Author: reta <dr...@gmail.com>
AuthorDate: Sat Nov 16 13:28:53 2019 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f631634..e6df64e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -46,6 +46,7 @@ B f54062eb331fcf35d9f3a840f532417fccbb2673
B f9f5d45bbe302697224128d78e8b698928a7514d
M 09ddfdeaef6f32537dba23fa6d7ef36992b3217b
M 160f50ed9bd9391b61417716b3a67653c9e81a98
+M 2275d49772676ac72bc14ebbc3173719cd72e635
M 3b119ca6630f1384b93cd718d0cd95ccabc81e91
M 589e321622b72ae57fab910d76b3e4fb0c160979
M 59ba4821c92146723df063f9eb6e1c3ae0be5834