You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2017/11/13 21:34:29 UTC
[sling-org-apache-sling-launchpad-base] branch SLING-7186 updated:
SLING-7186: Update to Felix Framework 5.6.10
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a commit to branch SLING-7186
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-base.git
The following commit(s) were added to refs/heads/SLING-7186 by this push:
new 84d025b SLING-7186: Update to Felix Framework 5.6.10
84d025b is described below
commit 84d025bc15a873eb60813743224f284dc20dce09
Author: Karl Pauls <kp...@adobe.com>
AuthorDate: Mon Nov 13 22:34:20 2017 +0100
SLING-7186: Update to Felix Framework 5.6.10
---
pom.xml | 4 ++--
src/main/java/org/apache/sling/launchpad/base/impl/Sling.java | 3 ---
src/main/resources/sling.properties | 1 -
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 60e74a1..36d7d3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
This version is a concatenation of the framework version and a version for the launchpad base itself.
For a release only the qualifier (launchpad base version) is increased.
-->
- <version>5.6.8-2.6.26-SNAPSHOT</version>
+ <version>5.6.10-2.6.26-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Launchpad Base</name>
@@ -253,7 +253,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.7.0-SNAPSHOT</version>
+ <version>5.6.10</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java b/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
index 72c5034..076aec8 100644
--- a/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
+++ b/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
@@ -445,9 +445,6 @@ public class Sling {
runtimeProps.put(name, sysProp);
}
}
- if (System.getProperty("org.osgi.framework.system.packages.extra") != null) {
- runtimeProps.put("org.osgi.framework.system.packages.extra", System.getProperty("org.osgi.framework.system.packages.extra"));
- }
}
// resolve inclusions again
diff --git a/src/main/resources/sling.properties b/src/main/resources/sling.properties
index eda34f3..d4f833f 100644
--- a/src/main/resources/sling.properties
+++ b/src/main/resources/sling.properties
@@ -176,7 +176,6 @@ org.osgi.framework.system.packages= \
{dollar}{sling.jre-{dollar}{felix.detect.jpms}} \
${org.apache.sling.launcher.system.packages}
-
# Boot delegation packages never included anywhere (usually sun.*,com.sun.*)
# We include com.yourkit here to allow profiling the servlet container in
# which the web app is running
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].