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 2020/01/17 20:25:11 UTC

[sling-org-apache-sling-installer-factory-packages] branch master updated: SLING-8963 update to parent 36

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-org-apache-sling-installer-factory-packages.git


The following commit(s) were added to refs/heads/master by this push:
     new 66a098c  SLING-8963 update to parent 36
66a098c is described below

commit 66a098c1432672d67a65d29d1c7ccf8bbd7a2f83
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Jan 17 21:24:58 2020 +0100

    SLING-8963 update to parent 36
---
 pom.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e7f1d5a..40c2ec1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-bundle-parent</artifactId>
-        <version>35</version>
+        <version>36</version>
         <relativePath/>
     </parent>
 
@@ -35,6 +35,13 @@
         Provides support for content packages to the Apache Sling OSGi installer
     </description>
 
+    <properties>
+        <sling.java.version>8</sling.java.version>
+        <project.build.outputTimestamp>2020-01-14T08:04:00Z</project.build.outputTimestamp>
+        <!-- skip baseline till the first release -->
+        <bnd.baseline.skip>true</bnd.baseline.skip>
+    </properties>
+
     <scm>
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-packages.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-packages.git</developerConnection>
@@ -50,9 +57,11 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.metatype.annotations</artifactId>
         </dependency>
+        <!-- OSGi framework 1.8, Core R6 (https://osgi.org/javadoc/r6/core/org/osgi/framework/package-summary.html) -->
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
+            <artifactId>org.osgi.framework</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.jcr</groupId>