FELIX-2292 - update both http implementations to latest jetty 6 (6.1.24) as an interim step so that we have a "latest jetty 6" version prior to migration to jetty 7
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@940817 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http.jetty/pom.xml b/http.jetty/pom.xml
index 02f4ee3..1066ac2 100644
--- a/http.jetty/pom.xml
+++ b/http.jetty/pom.xml
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix HTTP Service Jetty</name>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<artifactId>org.apache.felix.http.jetty</artifactId>
<dependencies>
<dependency>
@@ -47,25 +47,27 @@
</exclusion>
</exclusions>
</dependency>
+ <!--
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
<version>6.1.14</version>
</dependency>
+ -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.14</version>
+ <version>6.1.24</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>6.1.14</version>
+ <version>6.1.24</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-sslengine</artifactId>
- <version>6.1.14</version>
+ <version>6.1.24</version>
</dependency>
</dependencies>
<build>