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:06:27 UTC

svn commit: r1695894 - in /felix/trunk/http/proxy: pom.xml src/main/java/org/apache/felix/http/proxy/package-info.java

Author: cziegeler
Date: Fri Aug 14 13:06:26 2015
New Revision: 1695894

URL: http://svn.apache.org/r1695894
Log:
Adapt to new parent pom

Modified:
    felix/trunk/http/proxy/pom.xml
    felix/trunk/http/proxy/src/main/java/org/apache/felix/http/proxy/package-info.java

Modified: felix/trunk/http/proxy/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/proxy/pom.xml?rev=1695894&r1=1695893&r2=1695894&view=diff
==============================================================================
--- felix/trunk/http/proxy/pom.xml (original)
+++ felix/trunk/http/proxy/pom.xml Fri Aug 14 13:06:26 2015
@@ -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>
 

Modified: felix/trunk/http/proxy/src/main/java/org/apache/felix/http/proxy/package-info.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/proxy/src/main/java/org/apache/felix/http/proxy/package-info.java?rev=1695894&r1=1695893&r2=1695894&view=diff
==============================================================================
--- felix/trunk/http/proxy/src/main/java/org/apache/felix/http/proxy/package-info.java (original)
+++ felix/trunk/http/proxy/src/main/java/org/apache/felix/http/proxy/package-info.java Fri Aug 14 13:06:26 2015
@@ -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;