Revert "Bug 542870 - Mylyn is not compatible with Java 11"

This reverts commit c4400276998c5542efa4f71ffb5352d4d29a7a89.

Change-Id: I1847da530835e429be95c75d05af0785d7d3b7a4

5 files changed, 0 insertions, 10 deletions

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 e7dc0792..7b4d9dfa 100644
--- a/org.eclipse.mylyn.commons-target/mylyn-commons-e4.5.target
+++ b/org.eclipse.mylyn.commons-target/mylyn-commons-e4.5.target
@@ -5,8 +5,6 @@
 <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.annotation" version="1.2.0.v201602091430"/>
-<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.core/META-INF/MANIFEST.MF b/org.eclipse.mylyn.commons.core/META-INF/MANIFEST.MF
index 6992517d..a4412661 100644
--- a/org.eclipse.mylyn.commons.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.commons.core/META-INF/MANIFEST.MF
@@ -12,8 +12,6 @@ Export-Package: org.eclipse.mylyn.commons.core,
  org.eclipse.mylyn.commons.core.storage;x-internal:=true,
  org.eclipse.mylyn.internal.commons.core;x-internal:=true,
  org.eclipse.mylyn.internal.commons.core.operations;x-internal:=true
-Import-package: javax.xml.bind, 
- javax.annotation
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.net
 Bundle-ClassPath: .
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 c2970867..ae26c862 100644
--- a/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.4.target
+++ b/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.4.target
@@ -27,11 +27,9 @@
 <unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
 <unit id="com.thoughtworks.qdox" version="1.6.3.v20081201-1400"/>
 <unit id="javax.activation" version="1.1.0.v201211130549"/>
-<unit id="javax.annotation" version="1.2.0.v201602091430"/>
 <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 75dfeb86..6f4d4de8 100644
--- a/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.5.target
+++ b/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.5.target
@@ -28,9 +28,7 @@
 <unit id="javax.activation" version="1.1.0.v201211130549"/>
 <unit id="javax.mail" version="1.4.0.v201005080615"/>
 <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
-<unit id="javax.annotation" version="1.2.0.v201602091430"/>
 <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 66e5671c..70bb9b18 100644
--- a/org.eclipse.mylyn.development/Work/mylyn-work-e4.4.target
+++ b/org.eclipse.mylyn.development/Work/mylyn-work-e4.4.target
@@ -21,9 +21,7 @@
 <unit id="javax.activation" version="1.1.0.v201211130549"/>
 <unit id="javax.mail" version="1.4.0.v201005080615"/>
 <unit id="javax.wsdl" version="1.6.2.v201012040545"/>
-<unit id="javax.annotation" version="1.2.0.v201602091430"/>
 <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"/>