diff options
author | gjoranv <gv@oath.com> | 2018-06-15 10:41:21 +0200 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2018-06-25 21:00:47 +0200 |
commit | db17ad754daff4e6dadff88aaa39df061be2a579 (patch) | |
tree | 6b8b7536e9e65e5002069fbe0dea3e542a23345d /jdisc_core/src/main/java | |
parent | fec4bf54b2a74d2ddb563271ebaca3806a9cce47 (diff) |
Java 9: Add dependencies and exports needed for jaxb support.
* Upgrade jaxb-api to 2.3.0 (packaged as osgi bundle)
=> our (and customer) bundles may now import this version
instead of the Java_SE one.
(Exposed via the container dependency.)
* Add TODO to remove org.w3c.dom.* packages from ExportPackages.
* Remove explicit org.w3c.dom from ExportPackages
(It was doubly present also with Java 8.)
Diffstat (limited to 'jdisc_core/src/main/java')
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java index 8da1a4fad99..86ab016bded 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java @@ -38,9 +38,11 @@ public class ExportPackages { .append("javax.inject;version=1.0.0,") // Included in guice, but not exported. Needed by container-jersey. .append("org.aopalliance.intercept,") .append("org.aopalliance.aop,") + .append("sun.misc,") + .append("sun.net.util,") + .append("sun.security.krb5,") - // xml-apis:xml-apis:1.4.01 is not a bundle - .append("org.w3c.dom,") + // TODO: remove for Vespa 7 (xml-apis:xml-apis:1.4.01 is not a bundle, but exposed from system classpath on Java 9) .append("org.w3c.dom.bootstrap,") .append("org.w3c.dom.css,") .append("org.w3c.dom.events,") @@ -49,11 +51,8 @@ public class ExportPackages { .append("org.w3c.dom.ranges,") .append("org.w3c.dom.stylesheets,") .append("org.w3c.dom.traversal,") - .append("org.w3c.dom.views,") + .append("org.w3c.dom.views"); - .append("sun.misc,") - .append("sun.net.util,") - .append("sun.security.krb5"); for (int i = 1; i < args.length; ++i) { out.append(",").append(getExportedPackages(args[i])); } |