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/07 22:41:07 UTC
[sling-org-apache-sling-launchpad-base] branch SLING-7186 created
(now 14866d8)
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a change to branch SLING-7186
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-base.git.
at 14866d8 SLING-7186: Update to the latest felix framework snapshot and work in changes to use the new java9 support.
This branch includes the following new commits:
new 14866d8 SLING-7186: Update to the latest felix framework snapshot and work in changes to use the new java9 support.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-launchpad-base] 01/01: SLING-7186: Update
to the latest felix framework snapshot and work in changes to use the new
java9 support.
Posted by pa...@apache.org.
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
commit 14866d849ab68e87964100a7c8757fe67b5bb8c4
Author: Karl Pauls <kp...@adobe.com>
AuthorDate: Tue Nov 7 23:40:41 2017 +0100
SLING-7186: Update to the latest felix framework snapshot and work in changes to use the new java9 support.
---
pom.xml | 2 +-
.../apache/sling/launchpad/base/impl/Sling.java | 12 +-
src/main/resources/jre-1.5.properties | 2 +-
src/main/resources/jre-1.6.properties | 2 +-
src/main/resources/jre-1.7.properties | 2 +-
src/main/resources/jre-1.8.properties | 2 +-
src/main/resources/jre-9.properties | 131 ---------------------
src/main/resources/sling.properties | 10 +-
8 files changed, 24 insertions(+), 139 deletions(-)
diff --git a/pom.xml b/pom.xml
index ec3fb46..60e74a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,7 +253,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.8</version>
+ <version>5.7.0-SNAPSHOT</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 15914ab..72c5034 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,6 +445,9 @@ 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
@@ -555,7 +558,14 @@ public class Sling {
}
}
- return runtimeProps;
+
+ Map<String, String> result = new HashMap<>();
+
+ for (Entry<String, String> entry : runtimeProps.entrySet()) {
+ result.put(entry.getKey(), entry.getValue().replace("{dollar}", "$"));
+ }
+
+ return result;
}
/**
diff --git a/src/main/resources/jre-1.5.properties b/src/main/resources/jre-1.5.properties
index 233a7c7..3498335 100644
--- a/src/main/resources/jre-1.5.properties
+++ b/src/main/resources/jre-1.5.properties
@@ -21,7 +21,7 @@
# for the current platform.
-jre-1.5= \
+jre-1.5=, \
javax.accessibility;uses:="javax.swing.text";version="0.0.0.1_005_J2SE", \
javax.activity;version="0.0.0.1_005_J2SE", \
javax.crypto.interfaces;uses:="javax.crypto.spec,javax.crypto";version="0.0.0.1_005_J2SE", \
diff --git a/src/main/resources/jre-1.6.properties b/src/main/resources/jre-1.6.properties
index 9c67ce9..56de602 100644
--- a/src/main/resources/jre-1.6.properties
+++ b/src/main/resources/jre-1.6.properties
@@ -21,7 +21,7 @@
# for the current platform.
-jre-1.6= \
+jre-1.6=, \
javax.accessibility;uses:="javax.swing.text";version="0.0.0.1_006_JavaSE", \
javax.activity;version="0.0.0.1_006_JavaSE", \
javax.annotation.processing;uses:="javax.tools,javax.lang.model,javax.lang.model.element,javax.lang.model.util";version="0.0.0.1_006_JavaSE", \
diff --git a/src/main/resources/jre-1.7.properties b/src/main/resources/jre-1.7.properties
index 4cb01f6..d99d349 100755
--- a/src/main/resources/jre-1.7.properties
+++ b/src/main/resources/jre-1.7.properties
@@ -22,7 +22,7 @@
-jre-1.7= \
+jre-1.7=, \
javax.accessibility;uses:="javax.swing.text";version="0.0.0.1_007_JavaSE", \
javax.activity;version="0.0.0.1_007_JavaSE", \
javax.annotation.processing;uses:="javax.tools,javax.lang.model,javax.lang.model.element,javax.lang.model.util";version="0.0.0.1_007_JavaSE", \
diff --git a/src/main/resources/jre-1.8.properties b/src/main/resources/jre-1.8.properties
index 8db56ee..88b9938 100755
--- a/src/main/resources/jre-1.8.properties
+++ b/src/main/resources/jre-1.8.properties
@@ -22,7 +22,7 @@
-jre-1.8= \
+jre-1.8=, \
javax.accessibility;uses:="javax.swing.text";version="0.0.0.1_008_JavaSE", \
javax.activity;version="0.0.0.1_008_JavaSE", \
javax.annotation.processing;uses:="javax.tools,javax.lang.model,javax.lang.model.element,javax.lang.model.util";version="0.0.0.1_008_JavaSE", \
diff --git a/src/main/resources/jre-9.properties b/src/main/resources/jre-9.properties
deleted file mode 100755
index 5d7139b..0000000
--- a/src/main/resources/jre-9.properties
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# The file contains the Java 9 platform packages used as system packages
-# for the current platform.
-
-
-
-jre-9= \
- javax.accessibility;uses:="javax.swing.text";version="0.0.0.9_JavaSE", \
- javax.activity;version="0.0.0.9_JavaSE", \
- javax.annotation.processing;uses:="javax.tools,javax.lang.model,javax.lang.model.element,javax.lang.model.util";version="0.0.0.9_JavaSE", \
- javax.annotation;version="0.0.0.9_JavaSE", \
- javax.crypto.interfaces;uses:="javax.crypto.spec,javax.crypto";version="0.0.0.9_JavaSE", \
- javax.crypto.spec;uses:="javax.crypto";version="0.0.0.9_JavaSE", \
- javax.crypto;uses:="javax.crypto.spec";version="0.0.0.9_JavaSE", \
- javax.imageio.event;uses:="javax.imageio";version="0.0.0.9_JavaSE", \
- javax.imageio.metadata;uses:="org.w3c.dom,javax.imageio";version="0.0.0.9_JavaSE", \
- javax.imageio.plugins.bmp;uses:="javax.imageio";version="0.0.0.9_JavaSE", \
- javax.imageio.plugins.jpeg;uses:="javax.imageio";version="0.0.0.9_JavaSE", \
- javax.imageio.spi;uses:="javax.imageio.stream,javax.imageio,javax.imageio.metadata";version="0.0.0.9_JavaSE", \
- javax.imageio.stream;uses:="javax.imageio";version="0.0.0.9_JavaSE", \
- javax.imageio;uses:="javax.imageio.metadata,javax.imageio.stream,javax.imageio.spi,javax.imageio.event";version="0.0.0.9_JavaSE", \
- javax.lang.model.element;uses:="javax.lang.model.type,javax.lang.model";version="0.0.0.9_JavaSE", \
- javax.lang.model.type;uses:="javax.lang.model.element,javax.lang.model";version="0.0.0.9_JavaSE", \
- javax.lang.model.util;uses:="javax.lang.model,javax.lang.model.element,javax.annotation.processing,javax.lang.model.type";version="0.0.0.9_JavaSE", \
- javax.lang.model;version="0.0.0.9_JavaSE", \
- javax.management.loading;uses:="javax.management";version="0.0.0.9_JavaSE", \
- javax.management.modelmbean;uses:="javax.management,javax.management.loading";version="0.0.0.9_JavaSE", \
- javax.management.monitor;uses:="javax.management";version="0.0.0.9_JavaSE", \
- javax.management.openmbean;uses:="javax.management";version="0.0.0.9_JavaSE", \
- javax.management.relation;uses:="javax.management";version="0.0.0.9_JavaSE", \
- javax.management.remote.rmi;uses:="javax.management.remote,javax.security.auth,javax.management,javax.management.loading,javax.naming,javax.rmi.ssl,org.omg.CORBA,org.omg.CORBA_2_3.portable,org.omg.CORBA.portable,javax.rmi.CORBA,javax.rmi";version="0.0.0.9_JavaSE", \
- javax.management.remote;uses:="javax.security.auth,javax.management";version="0.0.0.9_JavaSE", \
- javax.management.timer;uses:="javax.management";version="0.0.0.9_JavaSE", \
- javax.management;uses:="javax.management.loading,javax.management.openmbean";version="0.0.0.9_JavaSE", \
- javax.naming.directory;uses:="javax.naming";version="0.0.0.9_JavaSE", \
- javax.naming.event;uses:="javax.naming,javax.naming.directory";version="0.0.0.9_JavaSE", \
- javax.naming.ldap;uses:="javax.naming,javax.naming.directory,javax.net.ssl,javax.naming.event";version="0.0.0.9_JavaSE", \
- javax.naming.spi;uses:="javax.naming,javax.naming.directory";version="0.0.0.9_JavaSE", \
- javax.naming;uses:="javax.naming.spi";version="0.0.0.9_JavaSE", \
- javax.net.ssl;uses:="javax.security.cert,javax.security.auth.x500,javax.net";version="0.0.0.9_JavaSE", \
- javax.net;version="0.0.0.9_JavaSE", \
- javax.print.attribute.standard;uses:="javax.print.attribute";version="0.0.0.9_JavaSE", \
- javax.print.attribute;version="0.0.0.9_JavaSE", \
- javax.print.event;uses:="javax.print,javax.print.attribute";version="0.0.0.9_JavaSE", \
- javax.print;uses:="javax.print.attribute,javax.print.event,javax.print.attribute.standard";version="0.0.0.9_JavaSE", \
- javax.rmi.CORBA;uses:="org.omg.CORBA,org.omg.CORBA_2_3.portable,org.omg.CORBA.portable,org.omg.SendingContext";version="0.0.0.9_JavaSE", \
- javax.rmi.ssl;uses:="javax.net,javax.net.ssl";version="0.0.0.9_JavaSE", \
- javax.rmi;uses:="org.omg.CORBA,javax.rmi.CORBA";version="0.0.0.9_JavaSE", \
- javax.script;version="0.0.0.9_JavaSE", \
- javax.security.auth.callback;version="0.0.0.9_JavaSE", \
- javax.security.auth.kerberos;uses:="javax.security.auth,javax.crypto";version="0.0.0.9_JavaSE", \
- javax.security.auth.login;uses:="javax.security.auth,javax.security.auth.callback";version="0.0.0.9_JavaSE", \
- javax.security.auth.spi;uses:="javax.security.auth.callback,javax.security.auth.login,javax.security.auth";version="0.0.0.9_JavaSE", \
- javax.security.auth.x500;uses:="javax.security.auth";version="0.0.0.9_JavaSE", \
- javax.security.auth;version="0.0.0.9_JavaSE", \
- javax.security.cert;version="0.0.0.9_JavaSE", \
- javax.security.sasl;uses:="javax.security.auth.callback";version="0.0.0.9_JavaSE", \
- javax.sound.midi.spi;uses:="javax.sound.midi";version="0.0.0.9_JavaSE", \
- javax.sound.midi;uses:="javax.sound.midi.spi";version="0.0.0.9_JavaSE", \
- javax.sound.sampled.spi;uses:="javax.sound.sampled";version="0.0.0.9_JavaSE", \
- javax.sound.sampled;uses:="javax.sound.sampled.spi";version="0.0.0.9_JavaSE", \
- javax.sql.rowset.serial;uses:="javax.sql.rowset";version="0.0.0.9_JavaSE", \
- javax.sql.rowset.spi;uses:="javax.sql,javax.naming,javax.sql.rowset";version="0.0.0.9_JavaSE", \
- javax.sql.rowset;uses:="javax.sql,javax.sql.rowset.serial,javax.sql.rowset.spi";version="0.0.0.9_JavaSE", \
- javax.sql;uses:="javax.transaction.xa";version="0.0.0.9_JavaSE", \
- javax.swing.border;uses:="javax.swing";version="0.0.0.9_JavaSE", \
- javax.swing.colorchooser;uses:="javax.swing,javax.swing.border,javax.swing.event,javax.swing.text";version="0.0.0.9_JavaSE", \
- javax.swing.event;uses:="javax.swing,javax.swing.text,javax.swing.table,javax.swing.tree,javax.swing.undo";version="0.0.0.9_JavaSE", \
- javax.swing.filechooser;uses:="javax.swing";version="0.0.0.9_JavaSE", \
- javax.swing.plaf.basic;uses:="javax.swing.border,javax.swing,javax.swing.plaf,javax.swing.text,javax.swing.event,javax.swing.colorchooser,javax.accessibility,javax.swing.filechooser,javax.swing.text.html,javax.sound.sampled,javax.swing.table,javax.swing.plaf.synth,javax.swing.tree";version="0.0.0.9_JavaSE", \
- javax.swing.plaf.metal;uses:="javax.swing.plaf,javax.swing,javax.swing.border,javax.swing.text,javax.swing.plaf.basic,javax.swing.filechooser,javax.swing.event,javax.swing.tree";version="0.0.0.9_JavaSE", \
- javax.swing.plaf.multi;uses:="javax.accessibility,javax.swing,javax.swing.plaf,javax.swing.filechooser,javax.swing.text,javax.swing.tree";version="0.0.0.9_JavaSE", \
- javax.swing.plaf.nimbus;uses:="javax.swing,javax.swing.plaf,javax.swing.border,javax.swing.plaf.synth";version="0.0.0.9_JavaSE", \
- javax.swing.plaf.synth;uses:="javax.swing,javax.swing.plaf,javax.swing.text,javax.swing.border,javax.swing.plaf.basic,javax.swing.colorchooser,javax.swing.event,javax.xml.parsers,org.xml.sax,org.xml.sax.helpers,javax.swing.table,javax.swing.tree";version="0.0.0.9_JavaSE", \
- javax.swing.plaf;uses:="javax.swing,javax.swing.border,javax.accessibility,javax.swing.filechooser,javax.swing.text,javax.swing.tree";version="0.0.0.9_JavaSE", \
- javax.swing.table;uses:="javax.swing.event,javax.swing.plaf,javax.swing.border,javax.swing,javax.accessibility";version="0.0.0.9_JavaSE", \
- javax.swing.text.html.parser;uses:="javax.swing.text,javax.swing.text.html";version="0.0.0.9_JavaSE", \
- javax.swing.text.html;uses:="javax.swing.event,javax.swing.text,javax.accessibility,javax.swing,javax.swing.plaf,javax.swing.border,javax.swing.undo";version="0.0.0.9_JavaSE", \
- javax.swing.text.rtf;uses:="javax.swing.text";version="0.0.0.9_JavaSE", \
- javax.swing.text;uses:="javax.swing.event,javax.swing.tree,javax.swing.undo,javax.swing,javax.swing.plaf,javax.swing.plaf.basic,javax.print,javax.print.attribute,javax.accessibility,javax.swing.text.html";version="0.0.0.9_JavaSE", \
- javax.swing.tree;uses:="javax.swing.event,javax.swing,javax.swing.border,javax.swing.plaf,javax.swing.plaf.basic";version="0.0.0.9_JavaSE", \
- javax.swing.undo;uses:="javax.swing,javax.swing.event";version="0.0.0.9_JavaSE", \
- javax.swing;uses:="javax.swing.event,javax.accessibility,javax.swing.text,javax.swing.plaf,javax.swing.border,javax.swing.tree,javax.swing.table,javax.swing.colorchooser,javax.swing.plaf.basic,javax.swing.text.html,javax.swing.filechooser,javax.print,javax.print.attribute,javax.swing.plaf.metal";version="0.0.0.9_JavaSE", \
- javax.tools;uses:="javax.lang.model.element,javax.annotation.processing,javax.lang.model";version="0.0.0.9_JavaSE", \
- org.ietf.jgss;version="0.0.0.9_JavaSE", \
- org.omg.CORBA.DynAnyPackage;uses:="org.omg.CORBA";version="0.0.0.9_JavaSE", \
- org.omg.CORBA.ORBPackage;uses:="org.omg.CORBA";version="0.0.0.9_JavaSE", \
- org.omg.CORBA.TypeCodePackage;uses:="org.omg.CORBA";version="0.0.0.9_JavaSE", \
- org.omg.CORBA.portable;uses:="org.omg.CORBA,org.omg.CORBA_2_3.portable";version="0.0.0.9_JavaSE", \
- org.omg.CORBA;uses:="org.omg.CORBA.portable,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA_2_3.portable,org.omg.CORBA.TypeCodePackage";version="0.0.0.9_JavaSE", \
- org.omg.CORBA_2_3.portable;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.CORBA_2_3;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.CosNaming.NamingContextExtPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.CosNaming.NamingContextPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.CosNaming";version="0.0.0.9_JavaSE", \
- org.omg.CosNaming;uses:="org.omg.CORBA.portable,org.omg.CORBA,org.omg.PortableServer,org.omg.CosNaming.NamingContextPackage,org.omg.CosNaming.NamingContextExtPackage";version="0.0.0.9_JavaSE", \
- org.omg.Dynamic;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.DynamicAny.DynAnyFactoryPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.DynamicAny.DynAnyPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.DynamicAny;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage";version="0.0.0.9_JavaSE", \
- org.omg.IOP.CodecFactoryPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.IOP.CodecPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.IOP;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage";version="0.0.0.9_JavaSE", \
- org.omg.Messaging;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.PortableInterceptor.ORBInitInfoPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.PortableInterceptor;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.IOP,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.CORBA_2_3.portable,org.omg.Dynamic";version="0.0.0.9_JavaSE", \
- org.omg.PortableServer.CurrentPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.PortableServer.POAManagerPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.PortableServer.POAPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.PortableServer.ServantLocatorPackage;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.PortableServer.portable;uses:="org.omg.CORBA,org.omg.PortableServer";version="0.0.0.9_JavaSE", \
- org.omg.PortableServer;uses:="org.omg.CORBA,org.omg.CORBA.portable,org.omg.PortableServer.CurrentPackage,org.omg.PortableServer.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.portable,org.omg.CORBA_2_3,org.omg.PortableServer.ServantLocatorPackage";version="0.0.0.9_JavaSE", \
- org.omg.SendingContext;uses:="org.omg.CORBA,org.omg.CORBA.portable";version="0.0.0.9_JavaSE", \
- org.omg.stub.java.rmi;uses:="javax.rmi.CORBA";version="0.0.0.9_JavaSE"
diff --git a/src/main/resources/sling.properties b/src/main/resources/sling.properties
index dc3db40..b1c6a06 100644
--- a/src/main/resources/sling.properties
+++ b/src/main/resources/sling.properties
@@ -149,13 +149,16 @@ felix.service.urlhandlers=true
# Include JRE package list
sling.include.jre = jre-${java.specification.version}.properties
+sling.jre-jpms= {dollar}{felix.jpms.java.se}
+
#
# Framework system packages to be visible
org.osgi.framework.system.packages= \
${osgi-core-packages}, \
${osgi-compendium-services}, \
- org.apache.sling.launchpad.api;version=1.2.0, \
+ org.apache.sling.launchpad.api;version=1.2.0 \
${jre-${java.specification.version}} \
+ {dollar}{sling.jre-{dollar}{felix.detect.jpms}} \
${org.apache.sling.launcher.system.packages}
@@ -225,4 +228,7 @@ sling.osgi-core-packages= \
# For compatibility we add util.tracker here, although starting
# with R5 it's officially part of the framework.
sling.osgi-compendium-services= \
- org.osgi.util.tracker; version=1.5.1
\ No newline at end of file
+ org.osgi.util.tracker; version=1.5.1
+
+felix.systempackages.substitution=true
+
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.