diff options
author | Harald Musum <musum@oath.com> | 2018-06-26 18:41:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-26 18:41:47 +0200 |
commit | 763ba66d0c2e22cc498ba43b79a08da1c4a35639 (patch) | |
tree | a68ad8aa676f67ed99f36850fe14208c08796f0d /jdisc_core/src | |
parent | 2afd09c0f1ddcd6e107b08472cd6b4bb122d957a (diff) |
Revert "Gjoranv/java9 prep 12 2"
Diffstat (limited to 'jdisc_core/src')
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java | 11 |
1 files changed, 6 insertions, 5 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 86ab016bded..8da1a4fad99 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,11 +38,9 @@ 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,") - // TODO: remove for Vespa 7 (xml-apis:xml-apis:1.4.01 is not a bundle, but exposed from system classpath on Java 9) + // xml-apis:xml-apis:1.4.01 is not a bundle + .append("org.w3c.dom,") .append("org.w3c.dom.bootstrap,") .append("org.w3c.dom.css,") .append("org.w3c.dom.events,") @@ -51,8 +49,11 @@ 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])); } |