Revert "Gjoranv/java9 prep 12"

3 files changed, 18 insertions, 40 deletions

diff --git a/jdisc_core_test/integration_test/pom.xml b/jdisc_core_test/integration_test/pom.xml
index e31fa122232..d68d6e2966b 100644
--- a/jdisc_core_test/integration_test/pom.xml
+++ b/jdisc_core_test/integration_test/pom.xml
@@ -230,34 +230,14 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <profiles>
-        <profile>
-            <id>java9-surefire</id>
-            <activation>
-                <jdk>[9, )</jdk>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <configuration>
-                                <!-- Allow installing fragment bundles, see felix.framework:ExtensionManager.addExtensionBundle -->
-                                <argLine>
-                                    --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED
-                                </argLine>
-                             </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-    </profiles>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
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 37e8469afdc..f0e16644a41 100644
--- a/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml
+++ b/jdisc_core_test/test_bundles/cert-k-pkgs/pom.xml
@@ -14,6 +14,13 @@
     <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 ea371eb632b..44ec6a2ff6c 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,6 +112,12 @@ 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;
@@ -168,23 +174,8 @@ 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
-
-    // 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.activation.CommandInfo commandInfo = null;
 //    private final javax.activity.ActivityCompletedException activityCompletedException = null;
 //    private final javax.jws.HandlerChain handlerChain = null;
 //    private final javax.jws.soap.SOAPBinding soapBinding = null;