You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/03/20 11:30:36 UTC
cxf git commit: Updating the cxf-jackson feature to ref a m5 jaxrs2.1
spec bundle
Repository: cxf
Updated Branches:
refs/heads/master 34cc20de2 -> 3fe8e9222
Updating the cxf-jackson feature to ref a m5 jaxrs2.1 spec bundle
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3fe8e922
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3fe8e922
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3fe8e922
Branch: refs/heads/master
Commit: 3fe8e92229ba50dbc6758e6420b44ac16751281e
Parents: 34cc20d
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Mar 20 11:30:21 2017 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Mar 20 11:30:21 2017 +0000
----------------------------------------------------------------------
osgi/karaf/features/src/main/resources/features.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/3fe8e922/osgi/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index dd9c6c6..5edd676 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -269,7 +269,7 @@
</feature>
<feature name="cxf-jackson" version="${project.version}">
<!-- Required by jackson-dataformat-yaml -->
- <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr370-api-m1/${cxf.servicemix.specs.version}</bundle>
+ <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr370-api-m5/${cxf.servicemix.specs.version}</bundle>
<bundle start-level="10" dependency="true">mvn:javax.annotation/javax.annotation-api/${cxf.javax.annotation-api.version}</bundle>
<bundle start-level="35">mvn:org.yaml/snakeyaml/1.17</bundle>
<bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}</bundle>
@@ -278,9 +278,9 @@
<bundle start-level="35">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${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>
+ <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>
</feature>
<feature name="cxf-jsr-json" version="${project.version}">
<bundle start-level="35">mvn:javax.json/javax.json-api/${cxf.json.api.version}</bundle>