Repository: cxf Updated Branches: refs/heads/master 507ad4be6 -> 44c608c20
[CXF-7060,CXF-7045] Updating Karaf4 swagger2 feature also Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/44c608c2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/44c608c2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/44c608c2 Branch: refs/heads/master Commit: 44c608c205fd2fdac2f2fed9557c2c39730a44d6 Parents: 507ad4b Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Tue Sep 20 09:53:54 2016 +0100 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Tue Sep 20 09:53:54 2016 +0100 ---------------------------------------------------------------------- .../features/src/main/resources/features.xml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/44c608c2/osgi/karaf4/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf4/features/src/main/resources/features.xml b/osgi/karaf4/features/src/main/resources/features.xml index 5814db2..6d98973 100644 --- a/osgi/karaf4/features/src/main/resources/features.xml +++ b/osgi/karaf4/features/src/main/resources/features.xml @@ -248,17 +248,20 @@ <feature version="${project.version}">cxf-rs-security-jose</feature> <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-oauth2/${project.version}</bundle> </feature> - <feature name="cxf-rs-description-swagger2" version="${project.version}"> + <feature name="cxf-jackson" version="${project.version}" resolver="(obr)"> + <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> + <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> + <feature name="cxf-rs-description-swagger2" version="${project.version}" resolver="(obr)"> <feature version="${project.version}">cxf-jaxrs</feature> + <feature version="${project.version}">cxf-jackson</feature> <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger/${project.version}</bundle> <bundle start-level="10" dependency="true">mvn:javax.validation/validation-api/${cxf.validation.api.version}</bundle> <bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle> - <bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}</bundle> - <bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}</bundle> - <bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.version}</bundle> - <bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${cxf.jackson.version}</bundle> - <bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}</bundle> - <bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}</bundle> <bundle start-level="30" dependency="true">mvn:org.javassist/javassist/${cxf.javassist.version}</bundle> <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${cxf.reflections.bundle.version}</bundle> <bundle start-level="25" dependency="true">mvn:com.google.guava/guava/${cxf.guava.version}</bundle>