You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/07/18 08:56:57 UTC
svn commit: r1753180 - /sling/trunk/parent/pom.xml
Author: cziegeler
Date: Mon Jul 18 08:56:56 2016
New Revision: 1753180
URL: http://svn.apache.org/viewvc?rev=1753180&view=rev
Log:
SLING-5856 : Add osgi.annotation to parent pom
Modified:
sling/trunk/parent/pom.xml
Modified: sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=1753180&r1=1753179&r2=1753180&view=diff
==============================================================================
--- sling/trunk/parent/pom.xml (original)
+++ sling/trunk/parent/pom.xml Mon Jul 18 08:56:56 2016
@@ -1107,6 +1107,14 @@ on 64bit platforms: MAVEN_OPTS="-Xmx512M
<scope>provided</scope>
</dependency>
+ <!-- OSGi annotations: @Version, @ProviderType, @ConsumerType -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>6.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- OSGi support annotations -->
<dependency>
<groupId>org.apache.felix</groupId>
@@ -1114,13 +1122,6 @@ on 64bit platforms: MAVEN_OPTS="-Xmx512M
<version>1.11.0</version>
<scope>provided</scope>
</dependency>
- <!-- this version must match the version being used by the maven-bundle-plugin -->
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- <version>3.0.0</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
@@ -1149,6 +1150,15 @@ on 64bit platforms: MAVEN_OPTS="-Xmx512M
<scope>test</scope>
</dependency>
+
+ <!-- DEPRECATED : Use the osgi.annotation instead -->
+ <!-- this version must match the version being used by the maven-bundle-plugin -->
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>3.0.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencyManagement>