From 77045f1942763db8181341a9a880c7d573619b2b Mon Sep 17 00:00:00 2001
From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Mon, 18 Jun 2018 14:34:24 -0400
Subject: [PATCH] Bug 536023: NoClassDefFoundError for
 javax/xml/bind/DatatypeConverter

This package is marked for removal in Java 10 and in fact, is not found at
run time. Instead, use the javax.xml.bind plugin from Orbit.

javax.xml.stream is also needed by javax.xml.bind.

Change-Id: Ida10746267c814a8a11f2db7181dcb9e8ceaad44
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
---
 core/org.eclipse.cdt.core/META-INF/MANIFEST.MF                | 2 ++
 debug/org.eclipse.cdt.debug.application.product/debug.product | 3 +++
 qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF               | 2 ++
 releng/org.eclipse.cdt.repo/category.xml                      | 3 +++
 releng/org.eclipse.cdt.target/cdt.target                      | 4 +++-
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
index 4c97838c066..b018bbf4f97 100644
--- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
@@ -132,3 +132,5 @@ Require-Bundle: org.eclipse.cdt.core.native;bundle-version="[5.10.0,6.0.0)";visi
  com.google.gson
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: javax.xml.bind;version="2.2.0"
+
diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
index f5001dd5d5a..d38495b931e 100644
--- a/debug/org.eclipse.cdt.debug.application.product/debug.product
+++ b/debug/org.eclipse.cdt.debug.application.product/debug.product
@@ -176,12 +176,15 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
    <plugins>
       <plugin id="com.google.gson"/>
       <plugin id="com.ibm.icu"/>
+      <plugin id="javax.activation"/>
       <plugin id="javax.annotation"/>
       <plugin id="javax.el"/>
       <plugin id="javax.inject"/>
       <plugin id="javax.servlet"/>
       <plugin id="javax.servlet.jsp"/>
       <plugin id="javax.xml"/>
+      <plugin id="javax.xml.bind"/>
+      <plugin id="javax.xml.stream"/>
       <plugin id="org.apache.batik.constants"/>
       <plugin id="org.apache.batik.css"/>
       <plugin id="org.apache.batik.i18n"/>
diff --git a/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF b/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
index a0e498d558f..2d7977ec665 100644
--- a/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
+++ b/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
@@ -35,3 +35,5 @@ Export-Package: org.eclipse.cdt.internal.qt.core;x-friends:="org.eclipse.cdt.qt.
  org.eclipse.cdt.qt.core.location,
  org.eclipse.cdt.qt.core.qmldir,
  org.eclipse.cdt.qt.core.qmljs
+Import-Package: javax.xml.bind;version="2.2.0"
+
diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml
index 001452522f7..8c9a50f11d9 100644
--- a/releng/org.eclipse.cdt.repo/category.xml
+++ b/releng/org.eclipse.cdt.repo/category.xml
@@ -165,6 +165,9 @@
    <iu id="org.eclipse.cdt.util.source" version="0.0.0"/>
    <iu id="org.eclipse.cdt.remote.core" version="0.0.0"/>
    <iu id="org.eclipse.cdt.remote.core.source" version="0.0.0"/>
+   <iu id="javax.xml" version="0.0.0"/>
+   <iu id="javax.xml.bind" version="0.0.0"/>
+   <iu id="javax.xml.stream" version="0.0.0"/>
    <iu id="com.google.gson" version="0.0.0"/>
    <iu id="org.freemarker" version="0.0.0"/>
    <iu id="org.eclipse.tools.templates.core" version="0.0.0"/>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 0262c8b9f27..7b99060f81f 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="cdt" sequenceNumber="34">
+<?pde version="3.8"?><target name="cdt" sequenceNumber="35">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="0.0.0"/>
+<unit id="javax.xml.bind" version="0.0.0"/>
+<unit id="javax.xml.stream" version="0.0.0"/>
 <unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
 <unit id="org.antlr.runtime" version="0.0.0"/>
 <unit id="org.apache.commons.compress" version="0.0.0"/>