diff --git a/quickstart/karaf/cxf-rest/pom.xml b/quickstart/karaf/cxf-rest/pom.xml
index 9edbc35..b3e514a 100644
--- a/quickstart/karaf/cxf-rest/pom.xml
+++ b/quickstart/karaf/cxf-rest/pom.xml
@@ -56,9 +56,10 @@
     <google-guava-version>18.0</google-guava-version>
     <json4s-version>3.2.4_1</json4s-version>
     <jsr311-api-version>1.1.1</jsr311-api-version>
-    <reflections-version>0.9.10_2</reflections-version>
+    <reflections-version>0.9.10_3-SNAPSHOT</reflections-version>
     <jackson-module-scala-version>2.1.5_2</jackson-module-scala-version>
     <swagger-scala-version>2.10.2</swagger-scala-version>
+    <javassist-version>3.19.0-GA</javassist-version>
 
     <docker.from>fabric8/s2i-karaf-rhel:1.1.5</docker.from>
     <fabric8.dockerUser>fabric8/</fabric8.dockerUser>
@@ -345,6 +346,9 @@
           <useReferenceUrls>true</useReferenceUrls>
           <!-- do not include build output directory -->
           <includeBuildOutputDirectory>false</includeBuildOutputDirectory>
+          <startupRepositories>
+              <repo>mvn:io.fabric8.quickstarts/quickstart-karaf-cxf-rest/${project.version}/xml/features</repo>
+          </startupRepositories>
           <!-- no startupFeatures -->
           <startupFeatures>
             <feature>karaf-framework</feature>
@@ -359,33 +363,40 @@
             <!-- swagger -->
             <feature>http</feature>
             <feature>cxf-specs</feature>
+            <feature>swagger2</feature>
           </startupFeatures>
           <startupBundles>
             <bundle>mvn:io.fabric8/fabric8-cxf/${fabric8.version}</bundle>
             <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
-
-            <!-- swagger -->
-            <bundle>mvn:javax.ws.rs/jsr311-api/${jsr311-api-version}</bundle>
-            <bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
-            <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
-            <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
-            <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}</bundle>
-            <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle>
-            <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle>
-            <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-version}</bundle>
-            <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle>
-            <bundle>mvn:javax.validation/validation-api/${validation-api-version}</bundle>
-            <bundle>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
-            <bundle>mvn:com.google.guava/guava/${google-guava-version}</bundle>
-            <bundle>mvn:io.swagger/swagger-core/${swagger-version}</bundle>
-            <bundle>mvn:io.swagger/swagger-annotations/${swagger-version}</bundle>
-            <bundle>mvn:io.swagger/swagger-models/${swagger-version}</bundle>
-            <bundle>mvn:io.swagger/swagger-jaxrs/${swagger-version}</bundle>
-            <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections-version}</bundle>
           </startupBundles>
         </configuration>
       </plugin>
 
+      <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.9.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>target/classes/features.xml</file>
+                                    <classifier>features</classifier>
+                                    <type>xml</type>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+
       <!-- 3. create docker image -->
       <plugin>
         <groupId>org.jolokia</groupId>
diff --git a/quickstart/karaf/cxf-rest/src/main/java/io/fabric8/quickstarts/rest/CustomerService.java b/quickstart/karaf/cxf-rest/src/main/java/io/fabric8/quickstarts/rest/CustomerService.java
index 6229720..a81cc6e 100644
--- a/quickstart/karaf/cxf-rest/src/main/java/io/fabric8/quickstarts/rest/CustomerService.java
+++ b/quickstart/karaf/cxf-rest/src/main/java/io/fabric8/quickstarts/rest/CustomerService.java
@@ -17,6 +17,7 @@ package io.fabric8.quickstarts.rest;
 
 
 import javax.annotation.Resource;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -59,7 +60,7 @@ public class CustomerService {
     long currentId = 123;
     Map<Long, Customer> customers = new HashMap<Long, Customer>();
     Map<Long, Order> orders = new HashMap<Long, Order>();
-    private @Resource MessageContext jaxrsContext;
+    private  MessageContext jaxrsContext;
 
     public CustomerService() {
         init();
@@ -217,4 +218,10 @@ public class CustomerService {
         orders.put(o.getId(), o);
     }
 
+    @Context
+    public void setMessageContext(MessageContext messageContext) {
+        this.jaxrsContext = messageContext;
+    }
+
+
 }
diff --git a/quickstart/karaf/cxf-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/quickstart/karaf/cxf-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index c6c3e41..885198a 100644
--- a/quickstart/karaf/cxf-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/quickstart/karaf/cxf-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -37,7 +37,7 @@
 
     <!-- CXF Swagger2Feature -->
     <bean id="swagger2Feature" class="org.apache.cxf.jaxrs.swagger.Swagger2Feature">
-      <property name="basePath" value="/cxf/swaggerSample"/>
+      <property name="basePath" value="/cxf/crm"/>
     </bean>
 
     <!--
diff --git a/quickstart/karaf/cxf-rest/src/main/resources/features.xml b/quickstart/karaf/cxf-rest/src/main/resources/features.xml
index e69de29..273e338 100644
--- a/quickstart/karaf/cxf-rest/src/main/resources/features.xml
+++ b/quickstart/karaf/cxf-rest/src/main/resources/features.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+      Licensed to the Apache Software Foundation (ASF) under one or more
+      contributor license agreements.  See the NOTICE file distributed with
+      this work for additional information regarding copyright ownership.
+      The ASF licenses this file to You under the Apache License, Version 2.0
+      (the "License"); you may not use this file except in compliance with
+      the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+-->
+<features name="swagger2" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+
+    <feature name="swagger2" version="${project.version}" description="swagger2 necessary bundkles">
+        <!-- swagger -->
+            <bundle start-level="10">mvn:javax.ws.rs/jsr311-api/${jsr311-api-version}</bundle>
+            <bundle start-level="10">mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+            <bundle start-level="10">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
+            <bundle start-level="10">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
+            <bundle start-level="10">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/${jackson2-version}</bundle>
+            <bundle start-level="10">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle>
+            <bundle start-level="10">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle>
+            <bundle start-level="10">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-version}</bundle>
+            <bundle start-level="10">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle>
+            <bundle start-level="10">mvn:org.javassist/javassist/${javassist-version}</bundle>
+            <bundle start-level="10">mvn:javax.validation/validation-api/${validation-api-version}</bundle>
+            <bundle start-level="10">mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
+            <bundle start-level="10">mvn:com.google.guava/guava/${google-guava-version}</bundle>
+            <bundle start-level="10">mvn:io.swagger/swagger-core/${swagger-version}</bundle>
+            <bundle start-level="10">mvn:io.swagger/swagger-annotations/${swagger-version}</bundle>
+            <bundle start-level="10">mvn:io.swagger/swagger-models/${swagger-version}</bundle>
+            <bundle start-level="10">mvn:io.swagger/swagger-jaxrs/${swagger-version}</bundle>
+            <bundle start-level="10">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections-version}</bundle>
+
+    </feature>
+</features>