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/20 23:49:42 UTC
[cxf] 01/02: CXF-8155: Update to Jackson 2.10.1 (#602)
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
View the commit online:
https://github.com/apache/cxf/commit/ade931373e70e8dbe720c8ba036f5d72152b3f59
commit ade931373e70e8dbe720c8ba036f5d72152b3f59
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Nov 19 21:52:22 2019 -0500
CXF-8155: Update to Jackson 2.10.1 (#602)
(cherry picked from commit f6ee8880f961974da0aa2406d415627f6a382aaa)
# Conflicts:
# parent/pom.xml
---
osgi/itests/pom.xml | 16 ----------------
osgi/karaf/features/src/main/resources/features.xml | 8 ++------
parent/pom.xml | 4 ++--
3 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 97d8cc0..3ee61c5 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -141,22 +141,6 @@
<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>
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 88fee35..1baead1 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -284,12 +284,8 @@
<bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}</bundle>
<bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.databind.version}</bundle>
<bundle start-level="35">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${cxf.jackson.version}</bundle>
- <bundle start-level="35">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${cxf.jackson.version}</bundle>
- <!-- <bundle start-level="35">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}</bundle> -->
- <!-- <bundle start-level="35">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}</bundle> -->
- <feature prerequisite="true">wrap</feature>
- <bundle>wrap:mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}$overwrite=merge&Import-Package=javax.ws.rs*;version="[2.0,3)",com.fasterxml.jackson*;version="[2.8,3)"</bundle>
- <bundle>wrap:mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}$overwrite=merge&Import-Package=javax.ws.rs*;version="[2.0,3)",com.fasterxml.jackson.module.jaxb;resolution:=optional;version="[2.8,3)",com.fasterxml.jackson*;version="[2.8,3)"</bundle>
+ <bundle start-level="35">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}</bundle>
+ <bundle start-level="35">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}</bundle>
</feature>
<feature name="cxf-jsr-json" version="${project.version}">
<bundle dependency="true" start-level="30">mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${cxf.aries.fly.version}</bundle>
diff --git a/parent/pom.xml b/parent/pom.xml
index 7ed2ee1..153cd54 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.9.10</cxf.jackson.version>
- <cxf.jackson.databind.version>2.9.10.1</cxf.jackson.databind.version>
+ <cxf.jackson.version>2.10.1</cxf.jackson.version>
+ <cxf.jackson.databind.version>2.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>