felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1706350 - /felix/trunk/http/jetty/pom.xml
Date Fri, 02 Oct 2015 06:23:27 GMT
Author: cziegeler
Date: Fri Oct  2 06:23:27 2015
New Revision: 1706350

URL: http://svn.apache.org/viewvc?rev=1706350&view=rev
Log:
FELIX-5059 : Embedd http api bundle in jetty bundle

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

Modified: felix/trunk/http/jetty/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/pom.xml?rev=1706350&r1=1706349&r2=1706350&view=diff
==============================================================================
--- felix/trunk/http/jetty/pom.xml (original)
+++ felix/trunk/http/jetty/pom.xml Fri Oct  2 06:23:27 2015
@@ -56,6 +56,12 @@
                             org.apache.felix.http.jetty.internal.JettyActivator
                         </Bundle-Activator>
                         <Export-Package>
+                            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.apache.felix.http.api,
         					org.eclipse.jetty.*;-split-package:=merge-first;version=${version;===;${jetty.version}},
                             org.apache.felix.http.jetty
                         </Export-Package>
@@ -70,12 +76,14 @@
                         	org.ietf.jgss;resolution:=optional,
                         	org.mortbay.log;resolution:=optional;version="[6.1,7)",
                         	org.mortbay.util.ajax;resolution:=optional;version="[6.1,7)",
-                        	org.osgi.service.cm;version="[1.3,2)",
+                        	org.osgi.service.cm;version="[1.3,2)",                        	
                         	org.osgi.service.event;version="[1.2,2)",
+                        	org.osgi.service.log;version="[1.3,2)",
                         	org.osgi.service.metatype;version="[1.1,2)";resolution:=optional,
                         	org.osgi.service.useradmin;resolution:=optional,
                         <!-- Maven bundle plugin version 2.5.3 has a problem
                              with correctly calculating the import ranges -->
+                            org.apache.felix.http.api;version="[2.0,2.1)",
                             org.osgi.service.http;version="[1.2,1.3)",
                             org.osgi.service.http.context;version="[1.0,1.1)",
                             org.osgi.service.http.runtime;version="[1.0,1.1)",
@@ -113,7 +121,27 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <artifactId>org.osgi.service.cm</artifactId>
+            <version>1.5.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.event</artifactId>
+            <version>1.3.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.metatype</artifactId>
+            <version>1.3.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.useradmin</artifactId>
+            <version>1.1.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
@@ -159,13 +187,19 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.api</artifactId>
             <version>3.0.0</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.http.base</artifactId>
             <version>3.0.0</version>
         </dependency>
+  <!-- Testing -->
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.log</artifactId>
+            <version>1.3.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>



Mime
View raw message