Bug 569078: Upgrade to jaxb 2.3.3
Signed-off-by: Jonah Graham <jonah@kichwacoders.com>
Change-Id: I5e26cdea9875b7ee27f7430b49c589ef60782665
diff --git a/org.eclipse.mylyn.commons-target/mylyn-commons-e4.14.target b/org.eclipse.mylyn.commons-target/mylyn-commons-e4.14.target
index 2c659f5..970fda0 100644
--- a/org.eclipse.mylyn.commons-target/mylyn-commons-e4.14.target
+++ b/org.eclipse.mylyn.commons-target/mylyn-commons-e4.14.target
@@ -58,8 +58,6 @@
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
<unit id="org.apache.commons.httpclient.source" version="3.1.0.v201012070820"/>
- <unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
- <unit id="com.sun.xml.bind" version="2.2.0.v201505121915"/>
<unit id="org.apache.xmlrpc" version="3.0.0.v20100427-1100"/>
<unit id="org.mockito" version="1.8.4.v201303031500"/>
<unit id="org.objenesis" version="1.0.0.v201505121915"/>
@@ -74,6 +72,13 @@
<unit id="org.hamcrest.generator.source" version="1.1.0.v20090501071000"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository/"/>
+ <unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
+ <unit id="com.sun.xml.bind" version="2.3.3.v20201118-1818"/>
+ <unit id="javax.activation" version="1.2.2.v20201119-1642"/>
+ <unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/mylyn/snapshots/3.20"/>
<unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.20.2.v20160630-1640"/>
</location>
diff --git a/org.eclipse.mylyn.commons.notifications-feature/feature.xml b/org.eclipse.mylyn.commons.notifications-feature/feature.xml
index ca9343a..f1c56d8 100644
--- a/org.eclipse.mylyn.commons.notifications-feature/feature.xml
+++ b/org.eclipse.mylyn.commons.notifications-feature/feature.xml
@@ -34,10 +34,10 @@
<requires>
<!-- Java 11 compatibility -->
- <import plugin="javax.activation" version="1.1.0" match="compatible"/>
- <import plugin="javax.xml.bind" version="2.2.0" match="compatible"/>
- <import plugin="com.sun.xml.bind" version="2.2.0" match="compatible"/>
- <import plugin="javax.xml.stream" version="1.0.1" match="compatible"/>
+ <import plugin="javax.activation" version="1.2.2" match="equivalent"/>
+ <import plugin="jakarta.xml.bind" version="2.3.3" match="equivalent"/>
+ <import plugin="com.sun.xml.bind" version="2.3.3" match="equivalent"/>
+ <import plugin="javax.xml.stream" version="1.0.1" match="equivalent"/>
<import feature="org.eclipse.mylyn.commons" version="3.26.0" match="greaterOrEqual"/>
</requires>
diff --git a/org.eclipse.mylyn.commons.notifications.feed/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons.notifications.feed/META-INF/MANIFEST.MF
index 05d63c7..52ada34 100644
--- a/org.eclipse.mylyn.commons.notifications.feed/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.commons.notifications.feed/META-INF/MANIFEST.MF
@@ -10,8 +10,8 @@
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.mylyn.commons.core,
org.eclipse.mylyn.commons.notifications.core,
- javax.xml.bind;bundle-version="2.2.0",
- com.sun.xml.bind;bundle-version="2.2.0"
+ com.sun.xml.bind;bundle-version="[2.3.3,2.3.4)"
+Import-Package: javax.xml.bind;bundle-version="[2.3.3,2.3.4)"
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.mylyn.commons.sdk-feature/feature.xml b/org.eclipse.mylyn.commons.sdk-feature/feature.xml
index 301ceed..b32bb19 100644
--- a/org.eclipse.mylyn.commons.sdk-feature/feature.xml
+++ b/org.eclipse.mylyn.commons.sdk-feature/feature.xml
@@ -285,7 +285,7 @@
unpack="false"/>
<plugin
- id="javax.xml.bind"
+ id="jakarta.xml.bind"
download-size="0"
install-size="0"
version="0.0.0"
