felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r1569268 - in /felix/trunk/http: api/pom.xml jetty/pom.xml
Date Tue, 18 Feb 2014 10:52:40 GMT
Author: fmeschbe
Date: Tue Feb 18 10:52:40 2014
New Revision: 1569268

URL: http://svn.apache.org/r1569268
Log:
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

Modified:
    felix/trunk/http/api/pom.xml
    felix/trunk/http/jetty/pom.xml

Modified: felix/trunk/http/api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/pom.xml?rev=1569268&r1=1569267&r2=1569268&view=diff
==============================================================================
--- felix/trunk/http/api/pom.xml (original)
+++ felix/trunk/http/api/pom.xml Tue Feb 18 10:52:40 2014
@@ -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>

Modified: felix/trunk/http/jetty/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/pom.xml?rev=1569268&r1=1569267&r2=1569268&view=diff
==============================================================================
--- felix/trunk/http/jetty/pom.xml (original)
+++ felix/trunk/http/jetty/pom.xml Tue Feb 18 10:52:40 2014
@@ -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>



Mime
View raw message