This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 151d6b1 [KARAF-7012] Add java.* export in system packages
new a3a57f6 Merge pull request #1339 from jbonofre/KARAF-7012
151d6b1 is described below
commit 151d6b1dc769f7e9dcd81e94aa9e51e3b604cb26
Author: jbonofre <[email protected]>
AuthorDate: Fri Mar 26 15:51:33 2021 +0100
[KARAF-7012] Add java.* export in system packages
---
.../resources/etc/jre.properties | 69 +++++++++++++++++++++-
1 file changed, 68 insertions(+), 1 deletion(-)
diff --git
a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
index 46ffd27..ddff6b7 100644
---
a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
+++
b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
@@ -21,9 +21,65 @@
# Java platform package export properties.
#
+# Contains java.* packages provided by the JDK (and so system packages)
+jre-base= \
+ java.applet, \
+ java.awt, \
+ java.awt.color, \
+ java.awt.datatransfer, \
+ 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.management, \
+ java.lang.ref, \
+ java.lang.reflect, \
+ java.math, \
+ java.net, \
+ java.nio, \
+ java.nio.channels, \
+ java.nio.channels.spi, \
+ java.nio.charset, \
+ java.nio.charset.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.util, \
+ java.util.concurrent, \
+ java.util.concurrent.atomic, \
+ java.util.concurrent.locks, \
+ java.util.jar, \
+ java.util.logging, \
+ java.util.prefs, \
+ java.util.regex, \
+ java.util.spi, \
+ java.util.zip
+
# Standard package set. Note that:
# - javax.transaction* is exported with a mandatory attribute
jre-1.6= \
+ ${jre-base}, \
javax.accessibility, \
javax.activation;version="1.1", \
javax.activity, \
@@ -187,6 +243,7 @@ jre-1.6= \
# Standard package set. Note that:
# - javax.transaction* is exported with a mandatory attribute
jre-1.7= \
+ ${jre-base}, \
javax.accessibility, \
javax.activation;version="1.1", \
javax.activity, \
@@ -367,13 +424,21 @@ jre-1.7= \
# And last, but important thing - DBCP2 (see DBCP-571) has "Import-Package:
javax.transaction.xa;partial=true;mandatory:=partial"
# which is simply wrong (if anything, javax.transaction package should be
imported this way, not javax.transaction.xa),
# but to allow DBCP2 to be resolved on Karaf, special export package is added
just for DBCP2:
-# Export-Pacakge:
javax.transaction.xa;partial=true;mandatory:=partial;version="1.1"
+# Export-Package:
javax.transaction.xa;partial=true;mandatory:=partial;version="1.1"
# - mandatory "partial" attribute is added to javax.transaction export (JDK8)
to prevent wiring to this package without
# full JTA API bundle
# - mandatory "partial" attribute is added to javax.transaction.xa export (all
JDKs) to satisfy DBCP2
#
jre-1.8= \
+ ${jre-base}, \
+ java.time, \
+ java.time.chrono, \
+ java.time.format, \
+ java.time.temporal, \
+ java.time.zone, \
+ java.util.function, \
+ java.util.stream, \
javax.accessibility, \
javax.activity, \
javax.annotation;version="1.0", \
@@ -574,6 +639,7 @@ jre-1.8= \
com.sun.nio.sctp
jre-9= \
+ ${jre-base}, \
javax.accessibility, \
javax.activity, \
javax.annotation;version="1.3", \
@@ -740,3 +806,4 @@ jre-11 = ${jre-10}
jre-13 = ${jre-11}
jre-14 = ${jre-13}
jre-15 = ${jre-14}
+jre-16 = ${jre-15}
