Fixed jetty starting up 2 times
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@818580 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 4458d19..834176f 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -44,7 +44,7 @@
<Export-Package>
org.apache.felix.http.api;version=${pom.version},
org.osgi.service.http,
- javax.servlet.*;version=2.5
+ javax.servlet.*;version=2.5;-split-package:=merge-first
</Export-Package>
<Private-Package>
org.apache.felix.http.base.*,
@@ -71,24 +71,24 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api-2.5</artifactId>
- <version>6.1.14</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.14</version>
+ <version>6.1.21</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>6.1.14</version>
+ <version>6.1.21</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-sslengine</artifactId>
- <version>6.1.14</version>
+ <version>6.1.21</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>