You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/08/02 07:11:00 UTC
svn commit: r1754828 - /sling/trunk/bundles/engine/pom.xml
Author: cziegeler
Date: Tue Aug 2 07:10:59 2016
New Revision: 1754828
URL: http://svn.apache.org/viewvc?rev=1754828&view=rev
Log:
SLING-5782 : Register Sling using the Http Whiteboard
Modified:
sling/trunk/bundles/engine/pom.xml
Modified: sling/trunk/bundles/engine/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/pom.xml?rev=1754828&r1=1754827&r2=1754828&view=diff
==============================================================================
--- sling/trunk/bundles/engine/pom.xml (original)
+++ sling/trunk/bundles/engine/pom.xml Tue Aug 2 07:10:59 2016
@@ -65,6 +65,9 @@
org.osgi.service.useradmin;resolution:=optional,
*
</Import-Package>
+ <Require-Capability>
+ osgi.implementation;filter:="(&(osgi.implementation=osgi.http)(version=1.0))"
+ </Require-Capability>
</instructions>
</configuration>
</plugin>
@@ -81,9 +84,18 @@
</build>
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <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.servlet-api</artifactId>
+ <version>1.1.2</version>
+ <scope>provided</scope>
</dependency>
+ <!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.http.whiteboard</artifactId>
@@ -96,6 +108,7 @@
<version>1.2.1</version>
<scope>provided</scope>
</dependency>
+ -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.useradmin</artifactId>