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.)

2 files changed, 16 insertions, 14 deletions

diff --git a/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml b/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml
index f0e16644a41..37e8469afdc 100644
--- a/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml
+++ b/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml
@@ -14,13 +14,6 @@
     <version>6-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
-    <dependencies>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
     <build>
         <plugins>
             <plugin>
diff --git a/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java b/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java
index 44ec6a2ff6c..ea371eb632b 100644
--- a/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java
+++ b/jdisc_core_test/test_bundles/cert-k-pkgs/src/main/java/com/yahoo/jdisc/bundle/k/CertificateK.java
@@ -112,12 +112,6 @@ public class CertificateK {
     private final javax.tools.FileObject fileObject = null;
     private final javax.transaction.xa.XAException xaException = null;
     private final javax.xml.XMLConstants xmlConstants = null;
-    private final javax.xml.bind.DataBindingException dataBindingException = null;
-    private final javax.xml.bind.annotation.DomHandler<?,?> domHandler = null;
-    private final javax.xml.bind.annotation.adapters.CollapsedStringAdapter collapsedStringAdapter = null;
-    private final javax.xml.bind.attachment.AttachmentMarshaller attachmentMarshaller = null;
-    private final javax.xml.bind.helpers.AbstractMarshallerImpl abstractMarshaller = null;
-    private final javax.xml.bind.util.JAXBResult jaxbResult = null;
     private final javax.xml.crypto.AlgorithmMethod algorithmMethod = null;
     private final javax.xml.crypto.dom.DOMCryptoContext domCryptoContext = null;
     private final javax.xml.crypto.dsig.CanonicalizationMethod canonicalizationMethod = null;
@@ -174,8 +168,23 @@ public class CertificateK {
     private final org.xml.sax.ext.Attributes2Impl attributes2 = null;
     private final org.xml.sax.helpers.AttributesImpl attributes = null;
 
+
     // Packages made invisible from Java 9
-//    private final javax.activation.CommandInfo commandInfo = null;
+
+    // Added as dep in jdisc_core: com.sun.activation:javax.activation (OSGi bundle)
+    private final javax.activation.CommandInfo commandInfo = null;
+
+    // Added as dep in jdisc_core: javax.xml.bind:jaxb-api (OSGi bundle)
+    private final javax.xml.bind.DataBindingException dataBindingException = null;
+    private final javax.xml.bind.annotation.DomHandler<?,?> domHandler = null;
+    private final javax.xml.bind.annotation.adapters.CollapsedStringAdapter collapsedStringAdapter = null;
+    private final javax.xml.bind.attachment.AttachmentMarshaller attachmentMarshaller = null;
+    private final javax.xml.bind.helpers.AbstractMarshallerImpl abstractMarshaller = null;
+    private final javax.xml.bind.util.JAXBResult jaxbResult = null;
+
+
+    // Packages that most likely won't be provided from JDisc from Vespa 7
+
 //    private final javax.activity.ActivityCompletedException activityCompletedException = null;
 //    private final javax.jws.HandlerChain handlerChain = null;
 //    private final javax.jws.soap.SOAPBinding soapBinding = null;