FELIX-4427 Fix API exports
- Add OSGi Http Service API to API bundle
- Depend on Servlet API 2.3 in the API bundle
(first Servlet API supporting Filter)
- Remove Servlet and Http Service API exports
from Jetty bundle
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1569268 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/api/pom.xml b/http/api/pom.xml
index 50e6297..100e9da 100644
--- a/http/api/pom.xml
+++ b/http/api/pom.xml
@@ -45,8 +45,13 @@
<configuration>
<instructions>
<Export-Package>
+ org.osgi.service.http;version=${http.service.version},
org.apache.felix.http.api;version=${http.api.version}
</Export-Package>
+ <Import-Package>
+ javax.servlet.*;version="[2.3,4)",
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
@@ -56,7 +61,8 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index a8290e6..8e2ee16 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -55,9 +55,6 @@
org.apache.felix.http.jetty.internal.JettyActivator
</Bundle-Activator>
<Export-Package>
- javax.servlet.*;version=${servlet.version};-split-package:=merge-first,
- org.osgi.service.http;version=${http.service.version},
- org.apache.felix.http.api;version=${http.api.version},
org.eclipse.jetty.*;-split-package:=merge-first;version=${version;===;${jetty.version}}
</Export-Package>
<Private-Package>