You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cs...@apache.org on 2017/02/01 18:19:54 UTC
cxf git commit: Only depend on cxf specs
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 402e89f5f -> 3f57636a4
Only depend on cxf specs
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3f57636a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3f57636a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3f57636a
Branch: refs/heads/3.1.x-fixes
Commit: 3f57636a454757504055ab0973ec2a461fb954be
Parents: 402e89f
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Wed Feb 1 19:19:47 2017 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Wed Feb 1 19:19:47 2017 +0100
----------------------------------------------------------------------
osgi/karaf/features/src/main/resources/features.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/3f57636a/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 a5e0b2a..1e38acc 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -25,7 +25,7 @@
<bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version}</bundle>
<bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version}</bundle>
<bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}</bundle>
- <bundle start-level="10">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0.1/${cxf.servicemix.specs.version.jaxrs}</bundle>
+ <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0.1/${cxf.servicemix.specs.version.jaxrs}</bundle>
<bundle start-level="10" dependency="true">mvn:javax.mail/mail/${cxf.javax.mail.version}</bundle>
<bundle start-level="20">mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle>
<bundle start-level="20">mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle>
@@ -230,7 +230,8 @@
</feature>
<feature name="cxf-jackson" version="${project.version}" resolver="(obr)">
<!-- Required by jackson-dataformat-yaml -->
- <bundle start-level="35">mvn:org.yaml/snakeyaml/1.17</bundle>
+ <feature version="${project.version}">cxf-specs</feature>
+ <bundle start-level="35" depdendency="true">mvn:org.yaml/snakeyaml/1.17</bundle>
<bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}</bundle>
<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.version}</bundle>