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/27 12:49:04 UTC
[sling-org-apache-sling-installer-core] branch feature/new-parent
updated: update to newest parent 36
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/new-parent
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-core.git
The following commit(s) were added to refs/heads/feature/new-parent by this push:
new b1528bd update to newest parent 36
b1528bd is described below
commit b1528bd9e2e59beecac9373a3a0b462f06ccb099
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Jan 27 13:48:54 2020 +0100
update to newest parent 36
---
bnd.bnd | 9 +++++++++
pom.xml | 10 ++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 701f46f..c404ff8 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -5,5 +5,14 @@
org.apache.felix.converter.*,\\
org.apache.felix.cm.*,\\
org.apache.sling.commons.osgi.*\\
+# override the exportcontent from the parent pom, to not export conditional packages (https://github.com/bndtools/bnd/issues/3721)
+-exportcontents: !org.apache.felix.configurator.impl.*,\\
+ !org.apache.sling.feature.io.*,\\
+ !javax.json.*,\\
+ !org.apache.johnzon.core.*,\\
+ !org.apache.felix.converter.*,\\
+ !org.apache.felix.cm.*,\\
+ !org.apache.sling.commons.osgi.*,\\
+ ${packages;VERSIONED}
Provide-Capability: osgi.service;objectClass:List<String>="org.apache.sling.installer.api.OsgiInstaller,org.apache.sling.installer.api.ResourceChangeListener,org.apache.sling.installer.api.info.InfoProvider,org.apache.sling.installer.api.tasks.RetryHandler",\\
osgi.service;objectClass:List<String>="org.apache.sling.installer.api.event.InstallationListener,org.apache.sling.installer.api.jmx.InstallerMBean"
diff --git a/pom.xml b/pom.xml
index e5fce61..576003d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>35</version>
+ <version>36</version>
<relativePath/>
</parent>
@@ -39,8 +39,9 @@
<properties>
<sling.java.version>8</sling.java.version>
- <bnd.version>4.3.1</bnd.version>
+ <project.build.outputTimestamp>2020-01-14T08:04:00Z</project.build.outputTimestamp>
</properties>
+
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-core.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-core.git</developerConnection>
@@ -54,7 +55,8 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-baseline-maven-plugin</artifactId>
<configuration>
- <fullReport>true</fullReport>
+ <!-- temporarily continue on error due to https://github.com/bndtools/bnd/issues/3705, caused by switch from Java 7 -> Java 8 -->
+ <continueOnError>true</continueOnError>
</configuration>
</plugin>
<plugin>
@@ -199,7 +201,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.io</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0</version>
<scope>compile</scope>
</dependency>
<dependency>