542870: Mylyn is not compatible with Java 11
-included javax.xml.bind plugin in commons sdk feature
-added Import-package to plugin that actually uses JAXB
Change-Id: I6f04af0b8843302fd51d6056b4db653958ecd47d
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=542870
Signed-off-by: alexei.trebounskikh <alexei.trebounskikh@tasktop.com>
diff --git a/org.eclipse.mylyn.commons-target/mylyn-commons-e4.5.target b/org.eclipse.mylyn.commons-target/mylyn-commons-e4.5.target
index 7b4d9df..cfec2b0 100644
--- a/org.eclipse.mylyn.commons-target/mylyn-commons-e4.5.target
+++ b/org.eclipse.mylyn.commons-target/mylyn-commons-e4.5.target
@@ -5,6 +5,7 @@
<unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
<unit id="com.thoughtworks.qdox" version="1.6.3.v20081201-1400"/>
+<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
<unit id="org.apache.commons.codec" version="1.9.0.v20170208-1614"/>
<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
diff --git a/org.eclipse.mylyn.commons.notifications-feature/feature.xml b/org.eclipse.mylyn.commons.notifications-feature/feature.xml
index 9040110..a794910 100644
--- a/org.eclipse.mylyn.commons.notifications-feature/feature.xml
+++ b/org.eclipse.mylyn.commons.notifications-feature/feature.xml
@@ -31,7 +31,9 @@
</license>
<requires>
- <import feature="org.eclipse.mylyn.commons" version="3.25.0" match="greaterOrEqual"/>
+ <import plugin="javax.xml.bind" version="2.2.0" match="compatible"/>
+
+ <import feature="org.eclipse.mylyn.commons" version="3.25.0" match="greaterOrEqual"/>
</requires>
<plugin
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 342b448..036d9f5 100644
--- a/org.eclipse.mylyn.commons.notifications.feed/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.commons.notifications.feed/META-INF/MANIFEST.MF
@@ -13,4 +13,5 @@
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
+Import-Package: javax.xml.bind;version="[0.0.0,2.3.0)"
diff --git a/org.eclipse.mylyn.commons.sdk-feature/feature.xml b/org.eclipse.mylyn.commons.sdk-feature/feature.xml
index 7c07ac8..7060fae 100644
--- a/org.eclipse.mylyn.commons.sdk-feature/feature.xml
+++ b/org.eclipse.mylyn.commons.sdk-feature/feature.xml
@@ -281,5 +281,12 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
+ <plugin
+ id="javax.xml.bind"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
</feature>
diff --git a/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.4.target b/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.4.target
index ae26c86..8327bec 100644
--- a/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.4.target
+++ b/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.4.target
@@ -30,6 +30,7 @@
<unit id="javax.mail" version="1.4.0.v201005080615"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
+<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml.rpc" version="1.1.0.v201209140446"/>
<unit id="javax.xml.soap" version="1.3.0.v201105210645"/>
<unit id="org.antlr.runtime" version="3.0.0.v200803061811"/>
diff --git a/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.5.target b/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.5.target
index 6f4d4de..f584f85 100644
--- a/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.5.target
+++ b/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.5.target
@@ -29,6 +29,7 @@
<unit id="javax.mail" version="1.4.0.v201005080615"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
+<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml.rpc" version="1.1.0.v201209140446"/>
<unit id="javax.xml.soap" version="1.3.0.v201105210645"/>
<unit id="org.antlr.runtime" version="3.0.0.v200803061811"/>
diff --git a/org.eclipse.mylyn.development/Work/mylyn-work-e4.4.target b/org.eclipse.mylyn.development/Work/mylyn-work-e4.4.target
index 70bb9b1..3214d92 100644
--- a/org.eclipse.mylyn.development/Work/mylyn-work-e4.4.target
+++ b/org.eclipse.mylyn.development/Work/mylyn-work-e4.4.target
@@ -22,6 +22,7 @@
<unit id="javax.mail" version="1.4.0.v201005080615"/>
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
+<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml.rpc" version="1.1.0.v201209140446"/>
<unit id="javax.xml.soap" version="1.3.0.v201105210645"/>
<unit id="org.antlr.runtime" version="3.0.0.v200803061811"/>
