felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s..@apache.org
Subject svn commit: r1706291 - in /felix/trunk/http: bridge/pom.xml bundle/pom.xml cometd/pom.xml
Date Thu, 01 Oct 2015 16:54:36 GMT
Author: srs
Date: Thu Oct  1 16:54:35 2015
New Revision: 1706291

URL: http://svn.apache.org/viewvc?rev=1706291&view=rev
Log:
Fixed some problems with split packages.

Modified:
    felix/trunk/http/bridge/pom.xml
    felix/trunk/http/bundle/pom.xml
    felix/trunk/http/cometd/pom.xml

Modified: felix/trunk/http/bridge/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/bridge/pom.xml?rev=1706291&r1=1706290&r2=1706291&view=diff
==============================================================================
--- felix/trunk/http/bridge/pom.xml (original)
+++ felix/trunk/http/bridge/pom.xml Thu Oct  1 16:54:35 2015
@@ -49,11 +49,7 @@
                         </Bundle-Activator>
                         <Export-Package>
                             org.apache.felix.http.api,
-                            org.osgi.service.http,
-                            org.osgi.service.http.context,
-                            org.osgi.service.http.runtime,
-                            org.osgi.service.http.runtime.dto,
-                            org.osgi.service.http.whiteboard
+                            org.osgi.service.http.*;-split-package:=merge-first
                         </Export-Package>
                         <Private-Package>
                             org.apache.felix.http.base.*,

Modified: felix/trunk/http/bundle/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/bundle/pom.xml?rev=1706291&r1=1706290&r2=1706291&view=diff
==============================================================================
--- felix/trunk/http/bundle/pom.xml (original)
+++ felix/trunk/http/bundle/pom.xml Thu Oct  1 16:54:35 2015
@@ -56,12 +56,7 @@
                         </Bundle-Activator>
                         <Export-Package>
                             javax.servlet.*;version=${servlet.version};-split-package:=merge-first,
-                            org.osgi.service.http;-split-package:=merge-first,
-                            org.osgi.service.http,
-                            org.osgi.service.http.context,
-                            org.osgi.service.http.runtime,
-                            org.osgi.service.http.runtime.dto,
-                            org.osgi.service.http.whiteboard,
+                            org.osgi.service.http.*;-split-package:=merge-first,
                             org.cometd.bayeux;version=${cometd.version};-split-package:=merge-first,
                             org.cometd.bayeux.client;version=${cometd.version};-split-package:=merge-first,
                             org.cometd.bayeux.server;version=${cometd.version};-split-package:=merge-first,

Modified: felix/trunk/http/cometd/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/cometd/pom.xml?rev=1706291&r1=1706290&r2=1706291&view=diff
==============================================================================
--- felix/trunk/http/cometd/pom.xml (original)
+++ felix/trunk/http/cometd/pom.xml Thu Oct  1 16:54:35 2015
@@ -67,6 +67,7 @@
                             cometd-java-server;inline=true,
                             cometd-java-common;inline=true,
                             jetty-util;inline=true,
+                            jetty-util-ajax;inline=true,
                         </Embed-Dependency>
                         <Import-Package>
                         	javax.imageio;resolution:=optional,
@@ -103,6 +104,11 @@
             <version>${jetty.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-util-ajax</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
         	<groupId>org.cometd.java</groupId>
         	<artifactId>cometd-java-server</artifactId>
         	<version>${cometd.version}</version>
@@ -135,12 +141,12 @@
                     <artifactId>jetty-http</artifactId>
                 </exclusion>
             </exclusions>
-        </dependency>        
+        </dependency>
         <dependency>
         	<groupId>org.cometd.java</groupId>
         	<artifactId>cometd-java-common</artifactId>
         	<version>${cometd.version}</version>
-        </dependency>            
+        </dependency>
         <dependency>
             <groupId>org.cometd.java</groupId>
             <artifactId>bayeux-api</artifactId>



Mime
View raw message