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/06 01:27:09 UTC
svn commit: r1694375 - in /felix/trunk/http/whiteboard: pom.xml
src/main/java/org/apache/felix/http/whiteboard/package-info.java
Author: cziegeler
Date: Wed Aug 5 23:27:09 2015
New Revision: 1694375
URL: http://svn.apache.org/r1694375
Log:
Update to latest parent pom
Modified:
felix/trunk/http/whiteboard/pom.xml
felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/package-info.java
Modified: felix/trunk/http/whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/pom.xml?rev=1694375&r1=1694374&r2=1694375&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/pom.xml (original)
+++ felix/trunk/http/whiteboard/pom.xml Wed Aug 5 23:27:09 2015
@@ -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>
Modified: felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/package-info.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/package-info.java?rev=1694375&r1=1694374&r2=1694375&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/package-info.java (original)
+++ felix/trunk/http/whiteboard/src/main/java/org/apache/felix/http/whiteboard/package-info.java Wed Aug 5 23:27:09 2015
@@ -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;