Drop dep on javax.annotation APIs, these should instead be provided by the JRE

through the system bundle rhbx#1392150

eclipse-feature-plugins-to-category-ius.patch

@@ -357,7 +357,7 @@ index 8176831..c97bab0 100644
           id="org.eclipse.e4.emf.xpath"
           download-size="0"
           install-size="0"
-@@ -772,4 +667,19 @@
+@@ -772,4 +667,18 @@
           fragment="true"
           unpack="false"/>
  
@@ -370,7 +370,6 @@ index 8176831..c97bab0 100644
 +     <import plugin="org.apache.felix.gogo.command" />
 +     <import plugin="org.apache.felix.gogo.runtime" />
 +     <import plugin="org.apache.felix.gogo.shell" />
-+     <import plugin="javax.annotation-api" />
 +     <import plugin="org.w3c.dom.svg" />
 +     <import plugin="org.w3c.css.sac" />
 +     <import plugin="javax.inject" />

eclipse-javaxannotation-import.patch

@@ -1,12 +0,0 @@
-diff --git a/eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/META-INF/MANIFEST.MF b/eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/META-INF/MANIFEST.MF
-index b0d5c82..6ace64c 100644
---- a/eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/META-INF/MANIFEST.MF
-+++ b/eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk/META-INF/MANIFEST.MF
-@@ -8,5 +8,6 @@
- Bundle-Localization: fragment-gtk
- Bundle-Vendor: %providerName
- Eclipse-PlatformFilter: (osgi.ws=gtk)
--Import-Package: org.eclipse.e4.core.services.events,
-+Import-Package: javax.annotation;version="1.1.0",
-+ org.eclipse.e4.core.services.events,
-  org.osgi.service.event;version="1.3.1"

eclipse.spec

@@ -47,7 +47,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.6.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL
 URL:            http://www.eclipse.org/
 
@@ -102,7 +102,6 @@ Patch15: eclipse-support-symlink-bundles.patch
 # -org.apache.jasper.glassfish
 # +org.glassfish.web.javax.servlet.jsp
 # -javax.annotation
-# +javax.annotation-api
 # -org.w3c.dom.smil
 Patch16: eclipse-feature-plugins-to-category-ius.patch
 
@@ -112,7 +111,6 @@ Patch17: disable-non-linux.patch
 # Port to Lucene 5
 Patch18: eclipse-lucene-5.patch
 
-Patch19: eclipse-javaxannotation-import.patch
 Patch20: eclipse-fix-tests.patch
 Patch21: eclipse-adjust-droplets.patch
 Patch22: eclipse-pde-tp-support-droplets.patch
@@ -205,7 +203,6 @@ BuildRequires: httpcomponents-client
 BuildRequires: xz-java
 BuildRequires: mockito
 BuildRequires: osgi(osgi.annotation)
-BuildRequires: glassfish-annotation-api
 %if ! %{bootstrap}
 # Build deps that are excluded when bootstrapping
 BuildRequires: eclipse-pde
@@ -266,7 +263,6 @@ Requires: osgi(org.eclipse.jetty.continuation) >= %{_jetty_version}
 Requires: osgi(org.eclipse.jetty.io) >= %{_jetty_version}
 Requires: osgi(org.eclipse.jetty.security) >= %{_jetty_version}
 Requires: osgi(org.eclipse.jetty.servlet) >= %{_jetty_version}
-Requires: osgi(javax.annotation-api)
 Requires: jsch >= 0.1.46-2
 Requires: lucene-core >= %{_lucene_version}
 Requires: lucene-analysis >= %{_lucene_version}
@@ -374,7 +370,6 @@ tar --strip-components=1 -xf %{SOURCE1}
 %patch16
 %patch17
 %patch18 -p1
-%patch19 -p1
 %patch20
 %patch21
 %patch22
@@ -947,7 +942,6 @@ fi
 %{_libdir}/%{name}/plugins/com.sun.el.javax.el_*
 %{_libdir}/%{name}/plugins/javax.inject_*.jar
 %{_libdir}/%{name}/plugins/org.apache.*
-%{_libdir}/%{name}/plugins/javax.annotation-api_*
 %{_libdir}/%{name}/plugins/org.glassfish.web.javax.servlet.jsp_*
 %{_libdir}/%{name}/plugins/org.eclipse.ant.core_*
 %{_libdir}/%{name}/plugins/org.eclipse.compare_*
@@ -1127,6 +1121,10 @@ fi
 %{_libdir}/eclipse/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Wed Jan 11 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.2-3
+- Drop dep on javax.annotation APIs, these should instead be provided by the JRE
+  through the system bundle - rhbx#1392150
+
 * Tue Jan 10 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.2-2
 - Non-bootstrap build