diff options
| author | gjoranv <gjoranv@gmail.com> | 2018-06-25 15:30:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-25 15:30:33 +0200 |
| commit | ef6a5975fc0534320cd9fdf5d9820eaa228cc938 (patch) | |
| tree | e83084702fe52d5d6d97b752af23f1f201b24594 /jdisc_core | |
| parent | 101fcd3df14e0c069f91f1741086e9707321741a (diff) | |
Revert "Gjoranv/java9 prep 12"
Diffstat (limited to 'jdisc_core')
| -rw-r--r-- | jdisc_core/pom.xml | 13 | ||||
| -rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/ExportPackages.java | 11 |
2 files changed, 6 insertions, 18 deletions
diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index 6b22aa4a985..246265203cb 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -16,17 +16,6 @@ <packaging>jar</packaging> <name>${project.artifactId}</name> <dependencies> - <!-- Necessary for jaxb support from java 9. (Could be deployed as bundles since 2.2.11.) --> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> - <groupId>com.sun.activation</groupId> - <artifactId>javax.activation</artifactId> - </dependency> - <!-- jaxb end --> - <dependency> <!-- Newer version than the one in rt.jar, including the ElementTraversal class needed by Xerces (Aug 2015, still valid Sep 2017) --> <groupId>xml-apis</groupId> @@ -239,8 +228,6 @@ <argument>${project.build.directory}/dependency/log4j-over-slf4j.jar</argument> <argument>${project.build.directory}/dependency/config-lib.jar</argument> <argument>${project.build.directory}/dependency/yolean.jar</argument> - <argument>${project.build.directory}/dependency/jaxb-api.jar</argument> - <argument>${project.build.directory}/dependency/javax.activation.jar</argument> </arguments> </configuration> </execution> 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])); } |