[sling-org-apache-sling-starter] 01/01: SLING-9624 rely on Felix defaults for system packages exports

[kw...@apache.org]

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

kwin pushed a commit to branch bugfix/SLING-9624-fix-system-packages
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git

commit b0191fed59de0de27d4dc2f1d27068659ee74b32
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Mar 3 14:03:09 2022 +0100

    SLING-9624 rely on Felix defaults for system packages exports
    
    
    Export javax.xml packages additionally with traditional Sling version
    numbers
    Update Felix to 7.0.3
---
 src/main/features/base.json | 2 +-
 src/main/features/boot.json | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/features/base.json b/src/main/features/base.json
index 46d0125..0b5961a 100644
--- a/src/main/features/base.json
+++ b/src/main/features/base.json
@@ -2,7 +2,7 @@
 {
     "execution-environment:JSON|false":{
         "framework":{
-            "id":"org.apache.felix:org.apache.felix.framework:7.0.1"
+            "id":"org.apache.felix:org.apache.felix.framework:7.0.3"
         }
     },
     "bundles":[
diff --git a/src/main/features/boot.json b/src/main/features/boot.json
index 5c5651a..4955a81 100644
--- a/src/main/features/boot.json
+++ b/src/main/features/boot.json
@@ -145,16 +145,15 @@
     "framework-properties":{
         "localIndexDir":"${sling.home}/repository/index",
         "repository.home":"${sling.home}/repository",
-        "sling.jre.java.xml":",javax.xml;version=\"2.1.0\",javax.xml.datatype;uses:=\"javax.xml.namespace\";version=\"2.1.0\",javax.xml.namespace;version=\"2.1.0\",javax.xml.parsers;uses:=\"javax.xml.validation,org.w3c.dom,org.xml.sax,org.xml.sax.helpers\";version=\"2.1.0\",javax.xml.stream;uses:=\"javax.xml.namespace,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform\";version=\"1.0.0\",javax.xml.stream.events;uses:=\"javax.xml.namespace,javax.xml.stream\";version=\"1.0.0 [...]
+        // export XML packages in addition to JRE version with special versions for backwards-compatibility reasons
+        "sling.jre-1.8.javax.xml":",javax.xml;version=\"2.1.0\",javax.xml.datatype;uses:=\"javax.xml.namespace\";version=\"2.1.0\",javax.xml.namespace;version=\"2.1.0\",javax.xml.parsers;uses:=\"javax.xml.validation,org.w3c.dom,org.xml.sax,org.xml.sax.helpers\";version=\"2.1.0\",javax.xml.stream;uses:=\"javax.xml.namespace,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform\";version=\"1.0.0\",javax.xml.stream.events;uses:=\"javax.xml.namespace,javax.xml.stream\";version=\" [...]
+        "sling.jpms.javax.xml":"{dollar}{sling.jre-1.8.javax.xml},javax.xml.catalog;uses:=\"javax.xml.namespace\";version=\"1.0.0\"", // all from Java 1.8 and in addition javax.xml.catalog
         "felix.systempackages.calculate.uses":"true",
         "org.osgi.framework.bootdelegation": "sun.*,com.sun.*,jdk.internal.reflect,jdk.internal.reflect.*",
-        "org.osgi.framework.system.packages":"org.osgi.framework;version=\"1.9\",org.osgi.framework.dto;version=\"1.8\";uses:=\"org.osgi.dto\",org.osgi.framework.hooks.bundle;version=\"1.1\";uses:=\"org.osgi.framework\",org.osgi.framework.hooks.resolver;version=\"1.0\";uses:=\"org.osgi.framework.wiring\",org.osgi.framework.hooks.service;version=\"1.1\";uses:=\"org.osgi.framework\",org.osgi.framework.hooks.weaving;version=\"1.1\";uses:=\"org.osgi.framework.wiring\",org.osgi.framework.laun [...]
+        "org.osgi.framework.system.packages.extra": "{dollar}{sling.jre-{dollar}{java.specification.version}.javax.xml}{dollar}{sling.{dollar}{felix.detect.jpms}.javax.xml}",
         "felix.systempackages.substitution":"true",
         "sling.fileinstall.dir":"${sling.home}/install",
         "sling.fileinstall.dir.autocreate":"true",
-        "sling.jre-jpms":"{dollar}{felix.jpms.java.base}{dollar}{felix.jpms.java.compiler}{dollar}{felix.jpms.java.datatransfer}{dollar}{felix.jpms.java.desktop}{dollar}{felix.jpms.java.instrument}{dollar}{felix.jpms.java.logging}{dollar}{felix.jpms.java.management}{dollar}{felix.jpms.java.management.rmi}{dollar}{felix.jpms.java.naming}{dollar}{felix.jpms.java.net.http}{dollar}{felix.jpms.java.prefs}{dollar}{felix.jpms.java.rmi}{dollar}{felix.jpms.java.scripting}{dollar}{felix.jpms.java. [...]
-        "sling.jpms.java.xml":"{dollar}{sling.jre.java.xml},javax.xml.catalog;uses:=\"javax.xml.namespace\";version=\"1.0.0\"",
-        "sling.jre-1.8":",java.applet;version=\"{dollar}{felix.detect.java.version}\",java.awt;version=\"{dollar}{felix.detect.java.version}\",java.awt.color;version=\"{dollar}{felix.detect.java.version}\",java.awt.datatransfer;version=\"{dollar}{felix.detect.java.version}\",java.awt.dnd;version=\"{dollar}{felix.detect.java.version}\",java.awt.event;version=\"{dollar}{felix.detect.java.version}\",java.awt.font;version=\"{dollar}{felix.detect.java.version}\",java.awt.geom;version=\"{dolla [...]
         "felix.cm.config.plugins": "org.apache.felix.configadmin.plugin.interpolation"
     }
 }