Updated system packages and separated extra packages for osgi

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>

nucleus/distributions/nucleus-common/src/main/resources/config/osgi.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
 # Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
 # Copyright (c) 2004, 2018 The Apache Software Foundation
 #
@@ -43,12 +43,12 @@ Felix.system.packages=\
  org.osgi.service.startlevel; version=1.1.1, \
  org.osgi.service.url; version=1.0.1, \
  org.osgi.util.tracker; version=1.5.3, \
- ${extra-system-packages}
+ ${java-${java.specification.version}}
 
 # Packages exported by system bundle when framework is Equinox.
 # Unlike Felix, It is not required to explicitly mention the packages exported by equinox framework jar.
 # Equinox automatically adds packages from equinox.jar to exported package list.
-Equinox.system.packages=${extra-system-packages}
+Equinox.system.packages=
 
 # Packages exported by system bundle when framework is Knopflerfish.
 # Taken from MANIFEST.MF of framework.jar distributed with Knopflerfish 3.5.0.
@@ -64,8 +64,10 @@ Knopflerfish.system.packages=\
  org.osgi.service.startlevel;version=1.1, \
  org.osgi.service.url;version=1.0, \
  org.osgi.service.condpermadmin;version=1.1, \
- ${extra-system-packages}
+ ${java-${java.specification.version}}
 
+org.osgi.framework.system.packages.extra=\
+ org.glassfish.embeddable;org.glassfish.embeddable.spi;version=@project.osgi.version@
 
 # As much as we prefer system.packages.extra to system.packages, we are forced to
 # configure system bundle using system.packages property because neither
@@ -74,9 +76,6 @@ Knopflerfish.system.packages=\
 # Java SE package list is not correctly set by various framework vendors correctly.
 org.osgi.framework.system.packages=${${GlassFish_Platform}.system.packages}
 
-# embeddable package version must match what is found in core/bootstrap/osgi.bundle file. See that file more details.
-extra-system-packages=${jre-${java.specification.version}}, org.glassfish.embeddable;org.glassfish.embeddable.spi;version=@project.osgi.version@
-
 # NetBeans profiler packages exist in parent class loader
 org.osgi.framework.bootdelegation=org.netbeans.lib.profiler, org.netbeans.lib.profiler.*
 
@@ -218,8 +217,102 @@ felix.shutdown.hook=false
 # Set it to true if you waant them to. Default is false for backward compatibility reasons.
 felix.security.defaultpolicy=true
 
+# List of packages available in every Java SE
+# See also: https://docs.oracle.com/en/java/javase/11/docs/api/element-list
 java.packages=\
+ com.sun.jarsigner, \
+ com.sun.java.accessibility.util, \
+ com.sun.javadoc, \
+ com.sun.jdi, \
+ com.sun.jdi.connect, \
+ com.sun.jdi.connect.spi, \
+ com.sun.jdi.event, \
+ com.sun.jdi.request, \
+ com.sun.management, \
+ com.sun.net.httpserver, \
+ com.sun.net.httpserver.spi, \
+ com.sun.nio.sctp, \
+ com.sun.security.auth, \
+ com.sun.security.auth.callback, \
+ com.sun.security.auth.login, \
+ com.sun.security.auth.module, \
+ com.sun.security.jgss, \
+ com.sun.source.doctree, \
+ com.sun.source.tree, \
+ com.sun.source.util, \
+ com.sun.tools.attach, \
+ com.sun.tools.attach.spi, \
+ com.sun.tools.javac, \
+ com.sun.tools.javadoc, \
+ com.sun.tools.jconsole, \
  com.sun.tracing, \
+ java.applet, \
+ java.awt.datatransfer, \
+ java.awt, \
+ java.awt.color, \
+ java.awt.desktop, \
+ java.awt.dnd, \
+ java.awt.event, \
+ java.awt.font, \
+ java.awt.geom, \
+ java.awt.im, \
+ java.awt.im.spi, \
+ java.awt.image, \
+ java.awt.image.renderable, \
+ java.awt.print, \
+ java.beans, \
+ java.beans.beancontext, \
+ java.io, \
+ java.lang, \
+ java.lang.annotation, \
+ java.lang.instrument, \
+ java.lang.invoke, \
+ java.lang.management, \
+ java.lang.module, \
+ java.lang.ref, \
+ java.lang.reflect, \
+ java.math, \
+ java.net, \
+ java.net.http, \
+ java.net.spi, \
+ java.nio, \
+ java.nio.channels, \
+ java.nio.channels.spi, \
+ java.nio.charset, \
+ java.nio.charset.spi, \
+ java.nio.file, \
+ java.nio.file.attribute, \
+ java.nio.file.spi, \
+ java.rmi, \
+ java.rmi.activation, \
+ java.rmi.dgc, \
+ java.rmi.registry, \
+ java.rmi.server, \
+ java.security, \
+ java.security.acl, \
+ java.security.cert, \
+ java.security.interfaces, \
+ java.security.spec, \
+ java.sql, \
+ java.text, \
+ java.text.spi, \
+ java.time, \
+ java.time.chrono, \
+ java.time.format, \
+ java.time.temporal, \
+ java.time.zone, \
+ java.util, \
+ java.util.concurrent, \
+ java.util.concurrent.atomic, \
+ java.util.concurrent.locks, \
+ java.util.function, \
+ java.util.jar, \
+ java.util.logging, \
+ java.util.prefs, \
+ java.util.regex, \
+ java.util.spi, \
+ java.util.stream, \
+ java.util.zip, \
  javax.accessibility, \
  javax.activation, \
  javax.activity, \
@@ -232,6 +325,7 @@ java.packages=\
  javax.imageio.metadata, \
  javax.imageio.plugins.bmp, \
  javax.imageio.plugins.jpeg, \
+ javax.imageio.plugins.tiff, \
  javax.imageio.spi, \
  javax.imageio.stream, \
  javax.lang.model, \
@@ -269,6 +363,7 @@ java.packages=\
  javax.security.auth.x500, \
  javax.security.cert, \
  javax.security.sasl, \
+ javax.smartcardio, \
  javax.sound.midi, \
  javax.sound.midi.spi, \
  javax.sound.sampled, \
@@ -286,6 +381,7 @@ java.packages=\
  javax.swing.plaf.basic, \
  javax.swing.plaf.metal, \
  javax.swing.plaf.multi, \
+ javax.swing.plaf.nimbus, \
  javax.swing.plaf.synth, \
  javax.swing.table, \
  javax.swing.text, \
@@ -295,7 +391,6 @@ java.packages=\
  javax.swing.tree, \
  javax.swing.undo, \
  javax.tools, \
- javax.transaction, \
  javax.transaction.xa, \
  javax.xml, \
  javax.xml.catalog, \
@@ -319,7 +414,25 @@ java.packages=\
  javax.xml.transform.stream, \
  javax.xml.validation, \
  javax.xml.xpath, \
+ jdk.dynalink, \
+ jdk.dynalink.beans, \
+ jdk.dynalink.linker, \
+ jdk.dynalink.linker.support, \
+ jdk.dynalink.support, \
+ jdk.javadoc.doclet, \
+ jdk.jfr, \
+ jdk.jfr.consumer, \
+ jdk.jshell, \
+ jdk.jshell.execution, \
+ jdk.jshell.spi, \
+ jdk.jshell.tool, \
+ jdk.management.jfr, \
+ jdk.nashorn.api.scripting, \
+ jdk.nashorn.api.tree, \
+ jdk.net, \
+ jdk.nio, \
  jdk.security.jarsigner, \
+ netscape.javascript, \
  org.ietf.jgss, \
  org.omg.CORBA, \
  org.omg.CORBA.DynAnyPackage, \
@@ -350,29 +463,37 @@ java.packages=\
  org.omg.SendingContext, \
  org.w3c.dom, \
  org.w3c.dom.bootstrap, \
+ org.w3c.dom.css, \
  org.w3c.dom.events, \
+ org.w3c.dom.html, \
  org.w3c.dom.ls, \
+ org.w3c.dom.ranges, \
+ org.w3c.dom.stylesheets, \
+ org.w3c.dom.traversal, \
+ org.w3c.dom.views, \
+ org.w3c.dom.xpath, \
  org.xml.sax, \
  org.xml.sax.ext, \
  org.xml.sax.helpers
 
-jre-11=${java.packages}
-jre-12=${jre-11}
-jre-13=${jre-11}
-jre-14=${jre-11}
-jre-15=${jre-11}
-jre-16=${jre-11}
-jre-17=${jre-11}
-jre-18=${jre-11}
-jre-19=${jre-11}
-jre-20=${jre-11}
-jre-21=${jre-11}
+# Some Java versions and distributions may have different packages and modules.
+# This is the way to respect that.
+java-11=${java.packages}
+java-12=${java-11}
+java-13=${java-11}
+java-14=${java-11}
+java-15=${java-11}
+java-16=${java-11}
+java-17=${java-11}
+java-18=${java-11}
+java-19=${java-11}
+java-20=${java-11}
+java-21=${java-11}
 
 # Bundle information optimization to improve performance
 felix.cache.singlebundlefile=true
 
 # Set this to true if you want to use JPA in Java SE mode in your OSGi bundles.
-# See GLASSFISH-14134 for more details.
 org.glassfish.osgjpa.extension.useHybridPersistenceProviderResolver=false
 
 # When HybridPersistenceProviderResolver is used, it can be configured to use a cache.