From 409a830c390d5d22dd5a7481a6684b7f9d8feb02 Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Thu, 19 Nov 2020 09:41:28 -0500
Subject: [PATCH] Bug 568375: Consistent versions for use of JAXB libraries

Change-Id: I86a6def37aed6c30a7591fd8dde4c174f6af98bb
---
 core/org.eclipse.cdt.core/META-INF/MANIFEST.MF         |  2 +-
 .../debug.product                                      |  2 +-
 qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF        |  2 +-
 releng/org.eclipse.cdt.repo/category.xml               |  2 +-
 releng/org.eclipse.cdt.target/cdt.target               | 10 +++++-----
 .../META-INF/MANIFEST.MF                               |  8 ++++----
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
index ef4b16a03cf..0dd04080bf5 100644
--- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF
@@ -136,7 +136,7 @@ Require-Bundle: org.eclipse.cdt.core.native;bundle-version="[6.0.0,7.0.0)";visib
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: javax.xml.bind;version="2.2.0"
+Import-Package: javax.xml.bind;version="[2.3.3,3.0.0)"
 Automatic-Module-Name: org.eclipse.cdt.core
 Service-Component: OSGI-INF/*.xml
 
diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
index 18ba11f3f68..bed5ace3cd7 100644
--- a/debug/org.eclipse.cdt.debug.application.product/debug.product
+++ b/debug/org.eclipse.cdt.debug.application.product/debug.product
@@ -177,6 +177,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="com.sun.jna"/>
       <plugin id="com.sun.jna.platform"/>
       <plugin id="com.sun.xml.bind"/>
+      <plugin id="jakarta.xml.bind"/>
       <plugin id="javax.activation"/>
       <plugin id="javax.annotation"/>
       <plugin id="javax.el"/>
@@ -184,7 +185,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <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"/>
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 7111c641aa7..a4f9e96dd4e 100644
--- a/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
+++ b/qt/org.eclipse.cdt.qt.core/META-INF/MANIFEST.MF
@@ -35,6 +35,6 @@ 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"
+Import-Package: javax.xml.bind;version="[2.3.3,3.0.0)"
 Automatic-Module-Name: org.eclipse.cdt.qt.core
 
diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml
index b6c8575ae69..a51b473e428 100644
--- a/releng/org.eclipse.cdt.repo/category.xml
+++ b/releng/org.eclipse.cdt.repo/category.xml
@@ -204,7 +204,7 @@
    <bundle id="org.eclipse.cdt.remote.core.source" version="0.0.0"/>
    <bundle id="javax.activation" version="0.0.0"/>
    <bundle id="javax.xml" version="0.0.0"/>
-   <bundle id="javax.xml.bind" version="0.0.0"/>
+   <bundle id="jakarta.xml.bind" version="0.0.0"/>
    <bundle id="javax.xml.stream" version="0.0.0"/>
    <bundle id="com.google.gson" version="0.0.0"/>
    <bundle id="org.freemarker" version="0.0.0"/>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index b3d5f27a175..d967f2008d3 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt" sequenceNumber="98">
+<target name="cdt" sequenceNumber="99">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -56,9 +56,9 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="0.0.0"/>
-<unit id="com.sun.xml.bind" version="0.0.0"/>
-<unit id="javax.activation" version="1.1.0.v201211130549"/>
-<unit id="javax.xml.bind" version="0.0.0"/>
+<unit id="com.sun.xml.bind" version="2.3.3.v20201118-1818"/>
+<unit id="javax.activation" version="1.2.2.v20201119-1642"/>
+<unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
 <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"/>
@@ -73,7 +73,7 @@
 <unit id="org.mockito" version="0.0.0"/>
 <unit id="org.slf4j.impl.log4j12" version="0.0.0"/>
 <unit id="org.yaml.snakeyaml" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-12/"/>
+<repository location="https://download.eclipse.org/tools/orbit/I-builds/I20201119185738/repository"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
diff --git a/tools.templates/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF b/tools.templates/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF
index 873818f23ff..bb2b7622203 100644
--- a/tools.templates/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF
+++ b/tools.templates/org.eclipse.tools.templates.freemarker/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.tools.templates.freemarker
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.tools.templates.freemarker
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.100.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.freemarker;visibility:=reexport,
  org.eclipse.tools.templates.core;bundle-version="1.1.2";visibility:=reexport,
- com.sun.xml.bind;bundle-version="2.2.0"
+ com.sun.xml.bind;bundle-version="[2.3.3,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.tools.templates.freemarker
 Bundle-Localization: plugin
-Import-Package: javax.xml.bind;version="2.2.0",
- javax.xml.bind.annotation;version="2.2.0"
+Import-Package: javax.xml.bind;version="[2.3.3,3.0.0)",
+ javax.xml.bind.annotation;version="[2.3.3,3.0.0)"