You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/06/23 11:12:13 UTC

karaf git commit: Define pax-http-jetty dependency in http feature

Repository: karaf
Updated Branches:
  refs/heads/master fd086d3ae -> 23d5d4421


Define pax-http-jetty dependency in http feature


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/23d5d442
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/23d5d442
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/23d5d442

Branch: refs/heads/master
Commit: 23d5d442168f1084c9644cca3fc52e85d01efcbc
Parents: fd086d3
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Jun 23 11:11:51 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Jun 23 11:11:51 2015 +0200

----------------------------------------------------------------------
 assemblies/features/standard/src/main/feature/feature.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/23d5d442/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 5144b2b..f0aabf6 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -342,6 +342,7 @@
 
     <feature name="http" version="${project.version}" description="Implementation of the OSGI HTTP Service">
         <feature>pax-http</feature>
+        <feature>pax-http-jetty</feature>
         <bundle start-level="30">mvn:org.apache.karaf.http/org.apache.karaf.http.core/${project.version}</bundle>
     </feature>
 
@@ -382,7 +383,6 @@
         <config name="org.apache.karaf.webconsole">
             realm=karaf
         </config>
-        <feature>pax-http-jetty</feature>
         <feature>http</feature>
         <feature>aries-blueprint</feature>
         <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>