You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/08/14 15:48:36 UTC
svn commit: r1695910 - /felix/trunk/http/bundle/pom.xml
Author: cziegeler
Date: Fri Aug 14 13:48:35 2015
New Revision: 1695910
URL: http://svn.apache.org/r1695910
Log:
Update to new parent pom
Modified:
felix/trunk/http/bundle/pom.xml
Modified: felix/trunk/http/bundle/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/bundle/pom.xml?rev=1695910&r1=1695909&r2=1695910&view=diff
==============================================================================
--- felix/trunk/http/bundle/pom.xml (original)
+++ felix/trunk/http/bundle/pom.xml Fri Aug 14 13:48:35 2015
@@ -57,6 +57,11 @@
<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.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,
@@ -86,6 +91,12 @@
org.codehaus.jackson.type;resolution:=optional,
*
</Import-Package>
+ <Provide-Capability>
+ osgi.implementation;osgi.implementation="osgi.http";version:Version="1.0";
+ uses:="javax.servlet,javax.servlet.http,org.osgi.service.http.context,org.osgi.service.http.whiteboard",
+ osgi.service;objectClass:List<String>="org.osgi.service.http.runtime.HttpServiceRuntime";
+ uses:="org.osgi.service.http.runtime,org.osgi.service.http.runtime.dto"
+ </Provide-Capability>
</instructions>
<!-- Skip baselining -->
<skip>true</skip>
@@ -98,24 +109,19 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>4.2.0</version>
- <scope>provided</scope>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.bridge</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>