You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2018/11/12 12:08:59 UTC

[sling-parent] branch master updated: SLING-8093 increase most OSGi Compendium dependencies to R7

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

kwin 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 e77f7ca  SLING-8093 increase most OSGi Compendium dependencies to R7
e77f7ca is described below

commit e77f7ca09def1d684b1ea93245993518c62f7519
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Nov 12 13:08:52 2018 +0100

    SLING-8093 increase most OSGi Compendium dependencies to R7
---
 sling-bundle-parent/pom.xml | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/sling-bundle-parent/pom.xml b/sling-bundle-parent/pom.xml
index 533f5bb..34606c1 100644
--- a/sling-bundle-parent/pom.xml
+++ b/sling-bundle-parent/pom.xml
@@ -232,45 +232,52 @@ Bundle-SCM: url=${project.scm.url},connection=${project.scm.connection},develope
                 <artifactId>org.osgi.framework</artifactId>
                 <version>1.8.0</version>
             </dependency>
-            <!-- Configuration Admin 1.5 (https://osgi.org/javadoc/r6/cmpn/org/osgi/service/cm/package-summary.html) -->
+            <!-- Configuration Admin 1.6, R7 (https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/cm/package-frame.html) -->
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.service.cm</artifactId>
-                <version>1.5.0</version>
+                <version>1.6.0</version>
             </dependency>
-            <!-- Service Component 1.3 (https://osgi.org/javadoc/r6/cmpn/org/osgi/service/component/package-summary.html) -->
+            <!-- Service Component 1.4, R7 (https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/component/package-frame.html) -->
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.service.component</artifactId>
-                <version>1.3.0</version>
+                <version>1.4.0</version>
             </dependency>
-            <!-- Event Admin 1.3.1 (https://osgi.org/javadoc/r6/cmpn/org/osgi/service/event/package-summary.html) -->
+            <!-- Event Admin 1.3.1, R6 (https://osgi.org/javadoc/r6/cmpn/org/osgi/service/event/package-summary.html) -->
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.service.event</artifactId>
                 <version>1.3.1</version>
             </dependency>
 
-            <!-- OSGi annotations (OSGi R6) -->
-            <!-- https://osgi.org/javadoc/r6/annotation/ -->
+            <!-- OSGi annotations (OSGi R7) -->
+            <!-- https://osgi.org/javadoc/osgi.annotation/7.0.0/org/osgi/annotation/versioning/package-frame.html -->
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.annotation.versioning</artifactId>
+                <version>1.1.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- https://osgi.org/javadoc/osgi.annotation/7.0.0/org/osgi/annotation/bundle/package-frame.html -->
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.annotation.bundle</artifactId>
                 <version>1.0.0</version>
                 <scope>provided</scope>
             </dependency>
-            <!-- https://osgi.org/javadoc/r6/cmpn/org/osgi/service/component/annotations/package-summary.html -->
+            <!-- https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/component/annotations/package-frame.html -->
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.service.component.annotations</artifactId>
-                <version>1.3.0</version>
+                <version>1.4.0</version>
                 <scope>provided</scope>
             </dependency>
-            <!-- https://osgi.org/javadoc/r6/cmpn/org/osgi/service/metatype/annotations/package-summary.html -->
+            <!-- https://osgi.org/javadoc/osgi.cmpn/7.0.0/org/osgi/service/metatype/annotations/package-frame.html -->
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.service.metatype.annotations</artifactId>
-                <version>1.3.0</version>
+                <version>1.4.0</version>
                 <scope>provided</scope>
             </dependency>