commit 168a0732ca37b7b0ddd2657f923fafaefd722fb1
author Guillaume Nodet <gnodet@gmail.com> Tue Jun 09 09:20:03 2015 +0200
committer Guillaume Nodet <gnodet@gmail.com> Tue Jun 09 09:20:03 2015 +0200
tree f92821c3580de6e5fde381e9c40d72d5349de095
parent 4828004bddbd371b72586cf4ad344e2f6b07476a

Loosen the requirements a bit on pax-web, we only require the HttpService and use the http feature as an optional feature dependency

assembly/src/main/resources/features.xml

diff --git a/assembly/src/main/resources/features.xml b/assembly/src/main/resources/features.xml
index c250ecb..18622b7 100644
--- a/assembly/src/main/resources/features.xml
+++ b/assembly/src/main/resources/features.xml
@@ -16,7 +16,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<features name="karaf-cave-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+<features name="karaf-cave-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
 
     <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</repository>
 
@@ -45,20 +45,23 @@
     </feature>
 
     <feature name="cave-http" version="${project.version}">
-        <feature>http</feature>
+        <feature dependency="true">http</feature>
+        <requirement>osgi.service;effective:=active;filter:=(objectClass=org.osgi.service.http.HttpService)</requirement>
         <feature>cave-storage</feature>
         <bundle>mvn:org.apache.karaf.cave.server/org.apache.karaf.cave.server.http/${project.version}</bundle>
     </feature>
 
     <feature name="cave-rest" version="${project.version}">
-        <feature>http</feature>
+        <feature dependency="true">http</feature>
+        <requirement>osgi.service;effective:=active;filter:=(objectClass=org.osgi.service.http.HttpService)</requirement>
         <feature version="[3,4)">cxf-jaxrs</feature>
         <feature>cave-storage</feature>
         <bundle>mvn:org.apache.karaf.cave.server/org.apache.karaf.cave.server.rest/${project.version}</bundle>
     </feature>
 
     <feature name="cave-maven" version="${project.version}">
-        <feature>http</feature>
+        <feature dependency="true">http</feature>
+        <requirement>osgi.service;effective:=active;filter:=(objectClass=org.osgi.service.http.HttpService)</requirement>
         <bundle>mvn:org.apache.karaf.cave.server/org.apache.karaf.cave.server.maven/${project.version}</bundle>
     </feature>