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 09:02:05 UTC
svn commit: r1753181 - /sling/trunk/parent/pom.xml
Author: cziegeler
Date: Mon Jul 18 09:02:05 2016
New Revision: 1753181
URL: http://svn.apache.org/viewvc?rev=1753181&view=rev
Log:
SLING-5857 : Add official DS and metatype annotations
Modified:
sling/trunk/parent/pom.xml
Modified: sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=1753181&r1=1753180&r2=1753181&view=diff
==============================================================================
--- sling/trunk/parent/pom.xml (original)
+++ sling/trunk/parent/pom.xml Mon Jul 18 09:02:05 2016
@@ -1114,14 +1114,21 @@ on 64bit platforms: MAVEN_OPTS="-Xmx512M
<version>6.0.1</version>
<scope>provided</scope>
</dependency>
-
- <!-- OSGi support annotations -->
+
+ <!-- OSGi annotations for DS and metatype -->
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.11.0</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ <version>1.3.0</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>com.google.code.findbugs</groupId>
@@ -1151,6 +1158,14 @@ on 64bit platforms: MAVEN_OPTS="-Xmx512M
</dependency>
+ <!-- DEPRECATED: Use official OSGi annotations -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.11.0</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- DEPRECATED : Use the osgi.annotation instead -->
<!-- this version must match the version being used by the maven-bundle-plugin -->
<dependency>
@@ -1164,11 +1179,25 @@ on 64bit platforms: MAVEN_OPTS="-Xmx512M
</dependencyManagement>
<dependencies>
- <!-- OSGi support annotations -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ </dependency>
+
+ <!-- DEPRECATED: OSGi support annotations -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
+ <!-- DEPRECATED: OSGi support annotations -->
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>