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 2013/01/30 18:28:27 UTC

svn commit: r1440537 - in /karaf/trunk: assemblies/features/standard/src/main/feature/feature.xml pom.xml

Author: jbonofre
Date: Wed Jan 30 17:28:27 2013
New Revision: 1440537

URL: http://svn.apache.org/viewvc?rev=1440537&view=rev
Log:
[KARAF-2152] Fix jetty wrap feature

Modified:
    karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
    karaf/trunk/pom.xml

Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1440537&r1=1440536&r2=1440537&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Wed Jan 30 17:28:27 2013
@@ -84,7 +84,7 @@
     </feature>
 
     <feature name="jetty" description="Provide Jetty engine support" version="${jetty.version}" resolver="(obr)">
-        <feature version="${jetty.version}">pax-web-jetty</feature>
+        <feature version="${jetty.version}">pax-jetty</feature>
     </feature>
 
     <feature name="package" version="${project.version}" resolver="(obr)" description="Package commands and mbeans">

Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1440537&r1=1440536&r2=1440537&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Jan 30 17:28:27 2013
@@ -128,7 +128,7 @@
         <commons-jexl.version>2.1.1</commons-jexl.version>
         <commons-lang.version>2.6</commons-lang.version>
         <jasypt.bundle.version>1.9.0_1</jasypt.bundle.version>
-        <jetty.version>8.1.8.v20121106</jetty.version>
+        <jetty.version>8.1.4.v20120524</jetty.version>
         <servlet.spec.groupId>org.apache.geronimo.specs</servlet.spec.groupId>
         <servlet.spec.artifactId>geronimo-servlet_3.0_spec</servlet.spec.artifactId>
         <servlet.spec.version>1.0</servlet.spec.version>