Update to R6 Compendium
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1694341 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index e87d760..2e46b96 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -70,8 +70,16 @@
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.event;version="[1.2,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.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)",
+ org.osgi.service.http.runtime.dto;version="[1.0,1.1)",
*
</Import-Package>
<DynamicImport-Package>
@@ -96,27 +104,18 @@
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bndlib</artifactId>
- <version>1.50.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version>
@@ -160,6 +159,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.api</artifactId>
<version>3.0.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>