commit 590785a7d2423586a51386b1b3c2c798a22f26f5
author Carsten Ziegeler <cziegeler@apache.org> Fri Aug 14 13:06:26 2015 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Fri Aug 14 13:06:26 2015 +0000
tree 849ba8bb1ff08d9a2de7aff592a137e6f49a49e1
parent f8d5d99428f27093f8a204fac25568a9705b9879

Adapt to new parent pom

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1695894 13f79535-47bb-0310-9956-ffa450edef68

http/proxy/pom.xml

diff --git a/http/proxy/pom.xml b/http/proxy/pom.xml
index e548acb..664fa2c 100644
--- a/http/proxy/pom.xml
+++ b/http/proxy/pom.xml
@@ -50,19 +50,14 @@
         <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>6.0.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>
     </dependencies>
 

http/proxy/src/main/java/org/apache/felix/http/proxy/package-info.java

diff --git a/http/proxy/src/main/java/org/apache/felix/http/proxy/package-info.java b/http/proxy/src/main/java/org/apache/felix/http/proxy/package-info.java
index 697248b..fa9b9ec 100644
--- a/http/proxy/src/main/java/org/apache/felix/http/proxy/package-info.java
+++ b/http/proxy/src/main/java/org/apache/felix/http/proxy/package-info.java
@@ -20,5 +20,5 @@
 @Version("3.0.0")
 package org.apache.felix.http.proxy;
 
-import aQute.bnd.annotation.Version;
+import org.osgi.annotation.versioning.Version;