Update to latest parent pom
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1694375 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/whiteboard/pom.xml b/http/whiteboard/pom.xml
index 2a8d92f..42c4aaa 100644
--- a/http/whiteboard/pom.xml
+++ b/http/whiteboard/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.parent</artifactId>
- <version>7-SNAPSHOT</version>
+ <version>7</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -62,28 +62,25 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <artifactId>osgi.cmpn</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.api</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.base</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0</version>
<scope>provided</scope>
</dependency>
diff --git a/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/package-info.java b/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/package-info.java
index c213e31..82a5279 100644
--- a/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/package-info.java
+++ b/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/package-info.java
@@ -21,9 +21,7 @@
* @see: @TODO ref to whiteboard page on felix.apache.org
*/
@Version("1.0")
-@Export(optional = "provide:=true")
package org.apache.felix.http.whiteboard;
-import aQute.bnd.annotation.Export;
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;