You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2018/01/16 09:52:15 UTC

[sling-parent] branch master updated: SLING-7384 Revise dependencies

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-parent.git


The following commit(s) were added to refs/heads/master by this push:
     new 6ea4511  SLING-7384 Revise dependencies
6ea4511 is described below

commit 6ea4511d479cbc0ef744f7826a6e4f1f4d21f755
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jan 16 10:50:40 2018 +0100

    SLING-7384 Revise dependencies
    
    * use new OSGi dependencies
    * remove all dependencies (manage dependencies only)
---
 pom.xml | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 01eb896..2db35f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1133,15 +1133,13 @@
                 <scope>provided</scope>
             </dependency>
 
-            <!-- OSGi annotations: @Version, @ProviderType, @ConsumerType -->
+            <!-- OSGi annotations -->
            <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>osgi.annotation</artifactId>
-                <version>6.0.1</version>
+                <artifactId>org.osgi.annotation.versioning</artifactId>
+                <version>1.0.0</version>
                 <scope>provided</scope>
             </dependency>
-
-            <!-- OSGi annotations for DS and metatype -->
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.service.component.annotations</artifactId>
@@ -1185,21 +1183,6 @@
         </dependencies>
     </dependencyManagement>
 
-    <dependencies>
-        <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>
-    </dependencies>
-
     <distributionManagement>
         <site>
             <id>apache.sling.site</id>

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].