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 <[email protected]> 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>
