Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes dd4862fcb -> 9d7c9508b


CXF-7045: Updated cxf-rs-description-swagger2, added standalone cxf-jackson 
feature


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9d7c9508
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9d7c9508
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9d7c9508

Branch: refs/heads/3.1.x-fixes
Commit: 9d7c9508ba36161e795390985f384169c4f0d086
Parents: dd4862f
Author: reta <drr...@gmail.com>
Authored: Mon Sep 19 20:14:21 2016 -0400
Committer: reta <drr...@gmail.com>
Committed: Mon Sep 19 20:14:21 2016 -0400

----------------------------------------------------------------------
 .../jax_rs/description_swagger2_osgi/README.txt      | 10 ----------
 osgi/karaf/features/src/main/resources/features.xml  | 15 +++++++++------
 2 files changed, 9 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/9d7c9508/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
----------------------------------------------------------------------
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
index c803013..d0b0ba9 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/README.txt
@@ -16,7 +16,6 @@ Using either UNIX or Windows:
 
   mvn install
 
-
 Starting Karaf (refer to 
http://karaf.apache.org/manual/latest-3.0.x/quick-start.html)
 
   bin/karaf
@@ -50,15 +49,6 @@ Install this demo bundle (using the appropriate bundle 
version number)
   
   install -s mvn:org.apache.cxf.samples/jax_rs_description_swagger2_osgi/3.n.m
 
-Optionally, installed the following bundles if they are missed:
-
-  install -s mvn:com.fasterxml.jackson.core/jackson-core/2.6.6  
-  install -s mvn:com.fasterxml.jackson.core/jackson-annotations/2.6.6
-  install -s mvn:com.fasterxml.jackson.core/jackson-databind/2.6.6 
-  install -s mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.6.6  
-  install -s mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.6.6 
 
-  install -s mvn:javax.annotation/javax.annotation-api/1.2
-
 You can verify if the CXF JAX-RS Swagger2 Blueprint Demo is installed and 
started.
 
   karaf@root()> list

http://git-wip-us.apache.org/repos/asf/cxf/blob/9d7c9508/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 196d823..89f9bbd 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -228,17 +228,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-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>

Reply via email to