From 06845507fdc0d25332a9f1b3f77d64fc76a10820 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@oath.com>
Date: Fri, 15 Jun 2018 10:41:21 +0200
Subject: 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.)
---
 jdisc_core/pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'jdisc_core/pom.xml')

diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml
index 246265203cb..6b22aa4a985 100644
--- a/jdisc_core/pom.xml
+++ b/jdisc_core/pom.xml
@@ -16,6 +16,17 @@
     <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>
@@ -228,6 +239,8 @@
                                 <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>
-- 
cgit v1.2.3