Add version-less exports for some javax packages

.. to compensate for the fact that 6 exported these packages with
   both the artifact version and "0.0.0.1_008_JavaSE". The latter
   takes precedence because it was listed first in the manifest,
   such that user bundles import these package with range [0,1).

1 files changed, 12 insertions, 0 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 ce2d2051307..479b156c170 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
@@ -59,6 +59,18 @@ public class ExportPackages {
         for (int i = 1; i < jars.length; ++i) {
             out.append(",").append(getExportedPackages(jars[i]));
         }
+
+        //TODO: temporary additions for backwards compatibility with Vespa 6. Remove when all apps have been built with 7
+        out.append(", ")
+                .append("javax.annotation, ")
+                .append("javax.activation, ")
+                .append("javax.xml.bind.annotation.adapters, ")
+                .append("javax.xml.bind.annotation, ")
+                .append("javax.xml.bind.attachment, ")
+                .append("javax.xml.bind.helpers, ")
+                .append("javax.xml.bind.util, ")
+                .append("javax.xml.bind");
+
         return out.toString();
     }