Update to latest I-build

Full non-bootstrap build

.gitignore

@@ -1,11 +1,7 @@
-eclipse-*-src.tar.bz2
 *.rpm
 eclipse-build-*.tar.gz
 eclipse-build-*.tar.xz
-eclipse-3.8.0-*-src.tar.bz2
-eclipse-4.2.0-I20120405-1114-src.tar.bz2
 /R4_platform-aggregator-*
-/eclipse-source.tar.bz2
 /eclipse-jdtpdeupdatesite.tar.bz2
 /x86_64
 /results_eclipse
@@ -13,4 +9,6 @@ eclipse-4.2.0-I20120405-1114-src.tar.bz2
 /.xmvn
 /.build-*.log
 /org.eclipse.linuxtools.eclipse-build-*.tar.bz2
+/org.eclipse.linuxtools.eclipse-build-*.tar.xz
 /org.eclipse.linuxtools.eclipse-build-*/
+/eclipse-platform-sources-*.tar.xz

.project

@@ -13,5 +13,6 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.linuxtools.rpm.rpmlint.rpmlintNature</nature>
+		<nature>org.eclipse.linuxtools.rpm.core.rpmnature</nature>
 	</natures>
 </projectDescription>

changelog.pre-oxygen

@@ -1,3 +1,664 @@
+* Mon Apr 03 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.3-3
+- Build missing remote ant support jar
+
+* Fri Mar 03 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.3-2
+- Re-enable test-framework for platform tests
+- Drop long-time broken efj script
+
+* Fri Feb 24 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.3-1
+- Update to Neon.3
+- Upstreamed some changes from RHSCL
+
+* Wed Feb 08 2017 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.2-7
+- Hide the p2 Droplets from the Available Software Sites listing.
+- Guard against null URI path in droplet check for Install Wizard Combo.
+- Resolves: rhbz#1413778, rhbz#1420225
+
+* Wed Jan 25 2017 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.2-6
+- Fix bug in p2 Droplet detection of feature groups.
+
+* Tue Jan 24 2017 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.2-5
+- Hide the p2 Droplets from cluttering Install Wizard Combo.
+- Resolves: rhbz#1413778
+
+* Mon Jan 16 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.2-4
+- Fix last javax.annotation reference
+
+* 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
+
+* Fri Jan 06 2017 Mat Booth <mat.booth@redhat.com> - 1:4.6.2-1
+- Update to Neon.2
+- Bootstrap build due to ant update
+- Port to new ant version
+- Rebuild for ECF update
+- Pull in usage plugin by default
+
+* Mon Dec 05 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.1-7
+- Rebuild for new xz-java
+
+* Wed Nov 09 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.1-6
+- Increase minimum memory for Eclipse/devstudio
+- Enable nashorn extension for javascript tools/devstudio
+- Resolves: rhbz#1380438
+
+* Thu Oct 13 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.1-5
+- Fix build with new Glassfish EL packages
+- Patch to prefer x11 until wayland support improves
+
+* Thu Sep 29 2016 Alexander Kurtakov <akurtako@redhat.com> 1:4.6.1-4
+- Bump for rebuild.
+
+* Thu Sep 15 2016 Dennis Gilmore <dennis@ausil.us> - 1:4.6.1-3
+- set the bootstap macro to 0
+
+* Thu Sep 15 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.1-2
+- Perform non-bootstrap build
+- Rebuild for new eclipse-ecf
+
+* Wed Sep 14 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.1-1
+- Update to Neon.1 release.
+- Set qualifiers at source-modification-time instead of build-time, to
+  eliminate descrepancies between architectures, rhbz#1374938
+- Set bootstrap flag for new primary architecture.
+
+* Fri Sep 2 2016 Alexander Kurtakov <akurtako@redhat.com> 1:4.6.0-7
+- Rebuild for latest jsch.
+
+* Thu Aug 18 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.0-6
+- Disable droplets being loaded by the reconciler.
+- Fix possible NPE in droplet p2.runnable property check.
+
+* Fri Aug 05 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.0-5
+- Improve 'p2.runnable' check in ExtensionLocationArtifactRepository.
+
+* Wed Aug 03 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.0-4
+- Add missing droplets logic to the EngineActivator.
+- Restore 'p2.runnable' property for droplets.
+
+* Wed Jul 13 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.6.0-3
+- Update eclipse-pde-tp-support-droplets.patch to handle source bundles.
+- Change PopupDialog from SWT.COLOR_INFO* to SWT.COLOR_LIST*.
+
+* Thu Jun 16 2016 Alexander Kurtakov <akurtako@redhat.com> 1:4.6.0-2
+- BR rhino and it's buildtime deps to unbreak build.
+
+* Tue Jun 14 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.0-1
+- Update to Neon release
+
+* Tue May 10 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.0-0.6.git201605092000
+- Update to latest I-build (M7)
+
+* Fri Apr 29 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.0-0.5.git201604261105
+- Use webkit 2 by default, webkit 1 can still be used by setting SWT_WEBKIT2=0
+  in the environment, rhbz#1303912
+- Ignore SWT.MOZILLA style when creating a browser widget and always use webkit
+  because we cannot ship xulrunner support, rhbz#1210898
+- Drop unneeded requires from tests package
+- Add missing R on eclipse-filesystem to low-level sub-packages
+
+* Tue Apr 26 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.0-0.4.git201604261105
+- Drop support for PDE building plug-ins in RPMs
+- Update to latest Neon I-build
+- Drop unnecessary SCL macros
+
+* Fri Apr 22 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.0-0.3.git201604190800
+- Perform non-bootstrap build
+
+* Fri Apr 22 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.0-0.2.git201604190800
+- PDE package cannot be noarch due to containing arch-specific source bundles
+
+* Tue Apr 19 2016 Mat Booth <mat.booth@redhat.com> - 1:4.6.0-0.1.git201604190800
+- Update to Neon I-build (bootstrap build)
+- Drop upstreamed patches
+- Install all plugins with xmvn
+- JDT and PDE are now able to be noarch packages
+
+* Sat Apr 16 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-10
+- Rebuild for new ECF
+
+* Thu Apr 07 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.2-9
+- Support reading BundleInfo from p2 Droplets enabled installations.
+
+* Tue Mar 29 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-8
+- Backport patch for ebz#486069, NPE in SWT when running on Wayland
+- Eliminate more test failures due to missing resources
+
+* Fri Mar 25 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-7
+- Update e-b snapshot for updated ant dependency
+
+* Thu Mar 24 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-6
+- Fix failure to run tests and backport patch for ebz#489953 in order to fix
+  some unit tests
+
+* Wed Mar 16 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-5
+- Rebuild for ECF and disable the build of some bundles that are not shipped
+
+* Fri Mar 04 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-4
+- Backport patch for ebz#488226 for incorrect content assist colors,
+  fixes rhbz#1253651 and rhbz#1196736
+- Fix broken link to mockito in tests
+
+* Wed Mar 02 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-3
+- Fix mis-named Java 1.9 profile
+
+* Mon Feb 29 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-2
+- Fix Lucene patch on F22
+
+* Mon Feb 29 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.2-1
+- Update to Mars.2 release
+- Update eclipse-build snapshot
+
+* Mon Feb 29 2016 Michael Simacek <msimacek@redhat.com> - 1:4.5.1-17
+- Rebuild for lucene-5.5.0
+
+* Mon Feb 29 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.1-16
+- Rebuild for httpcomponents-client 4.5.2
+
+* Thu Feb 25 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-15
+- Make BRs portable (thanks to Nicolas Lécureuil)
+
+* Wed Feb 24 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.1-14
+- Gracefully handle broken symbolic links on initialization.
+
+* Wed Feb 17 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-13
+- Preserve more test data that we cannot generate from source
+- Eliminate unnecessary manual requires from swt package
+
+* Wed Feb 17 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-12
+- Make test framework correctly delete symlinks so that test suites may complete
+  when e.g. pydev is installed rhbz#1290685
+- Backport patch to fix a webkit crash ebz#487712
+
+* Mon Feb 08 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-11
+- Fix java declaration view rhbz#1305107
+
+* Wed Feb 03 2016 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-10
+- Fix symlinks for new lucene
+- Use %%global instead of %%define and other macro improvements
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.5.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Jan 21 2016 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.1-8
+- Rebuild for Lucene 5.4.0.
+
+* Mon Jan 04 2016 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.1-7
+- [GTK3.16+] gtk_widget_override_background_color is deprecated.
+- [GTK3] Eclipse IDE consumes CPU when idle
+- [GTK] Empty repositories view links have white backgrounds
+- Resolves: rhbz#1294697, rhbz#1269892
+- ebz#483096, ebz#484696, ebz#484729
+
+* Sat Dec 05 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-6
+- Fix issues with background colour in some dialogs
+- ebz#478962, ebz#479998
+- Rebuild for new eclipse-ecf
+- Preserve jars containing runtime stubs used in tests
+
+* Fri Nov 27 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-5
+- Fix some visual glitches when on recent versions of GTK
+- ebz#466314, ebz#481122, ebz#466500
+
+* Tue Nov 03 2015 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.1-4
+- Fix "Workspace chooser won't launch" on Wayland.
+- Resolves: rhbz#1277594
+
+* Mon Nov  2 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.1-3
+- Rebuild for new eclipse-ecf
+
+* Tue Oct 13 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-2
+- Add patch for editor scrolling problem, rhbz#1198217
+
+* Wed Sep 30 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.1-1
+- Update to Mars.1
+- Fix JDT javafx and annotation processor tests
+
+* Wed Sep 16 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-19
+- Rebuild for new eclipse-ecf
+
+* Wed Sep  9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-18
+- Rebuild for new eclipse-ecf
+
+* Mon Sep 07 2015 Michael Simacek <msimacek@redhat.com> - 1:4.5.0-17
+- Rebuild for httpcomponents-core-4.4.2
+
+* Tue Sep 01 2015 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.0-16
+- Modify copy-platform script to support p2 Droplets.
+
+* Thu Aug 27 2015 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.0-15
+- Add support for p2 Droplets.
+
+* Wed Aug 26 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-14
+- Rebuild for new ECF
+
+* Thu Aug 20 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-13
+- Add patch for rhbz#1255150
+- Always use UTC timestamps to prevent rpmdiff failures
+- Move eclipse provides away from PDE rhbz#1253898
+
+* Tue Aug 11 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-12
+- Rebuild for new ECF
+
+* Thu Aug 6 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-11
+- Update to newer e-b snapshot fixing appdata validation.
+
+* Thu Jul 30 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-10
+- Preserve JDT core test data
+
+* Wed Jul 22 2015 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.0-9
+- Fix JDT Feature path for TargetDefinitionPersistenceTests (PDE)
+- SimpleConfiguratorUtils should handle base == null for tests
+- Locate the compressed platform archive for p2 AbstractReconcilerTest
+
+* Mon Jul 20 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-8
+- Disable tests for Eclipse 2.x style plug-in support that we don't ship
+
+* Fri Jul 17 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-7
+- Less PermSize settings - simply ignored in Java 8.
+
+* Thu Jul 16 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-6
+- Eclipse.ini has no place in swt subpackage.
+
+* Wed Jul  15 2015 Sopot Cela <scela@redhat.com> 1:4.5.0-5
+- Replaced javax.annotation provider from geronimo to glassfish
+
+* Tue Jul  7 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-4
+- Add Maven metadata for SWT
+
+* Thu Jul 02 2015 Sopot Cela <scela@redhat.com> 1:4.5.0-3
+- Patch dark theme patch to work on rawhide
+
+* Wed Jul 01 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-2
+- Organise BR/Rs and drop ancient provides/obsoletes on rcp package
+
+* Fri Jun 26 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-1
+- Update to tagged 4.5 release.
+- Switch to new e-b snapshot that properly symlinks all new deps.
+
+* Thu Jun 25 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.33.git201506012000
+- Rebuild to include all deps of Lucene.
+
+* Wed Jun 24 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.32.git201506012000
+- Non-boostrap build.
+
+* Tue Jun 23 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.31.git201506012000
+- Rebuild against Lucene 5.x in bootstrap mode.
+
+* Fri Jun 19 2015 Roland Grunberg <rgrunber@redhat.com> - 1:4.5.0-0.30.git201506012000
+- Fix Eclipse test framework.
+
+* Fri Jun 19 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.29.git201506012000
+- Rebuild after the F23 mass rebuild to get metadata correct.
+
+* Mon Jun 15 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.28.git201506012000
+- Non-bootstrap build
+
+* Thu Jun 11 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.27.git201506012000
+- Include p2 directives for non-upstream arches
+
+* Wed Jun 10 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.26.git201506012000
+- Add patch for stricter feature packaging.
+- Avoid incorrect servlet-api when building on F22
+- Add recommends on e4-importer
+- Bootstrap build to get the ball rolling again.
+
+* Thu Jun 04 2015 Michael Simacek <msimacek@redhat.com> - 1:4.5.0-0.25.git201506012000
+- Rebuild after ecf rebuild
+
+* Tue Jun 02 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.24.git201506012000
+- Fix pattern matching for x86/x86_64 arches
+
+* Tue Jun 02 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.23.git201506012000
+- Update to latest I-build
+- Don't build contributor tools with external deps during bootstrap builds
+- Build only for the current architecture
+- Rebuild for EMF update
+
+* Sun May 31 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.22.git201505272010
+- Rebuild after emf change.
+
+* Fri May 29 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.21.git201505272010
+- Fix building without tomcat-servlet again.
+
+* Fri May 29 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.20.git201505272010
+- BR gcc not gcc-c++ as there is no cpp sources built.
+
+* Thu May 28 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.19.git201505272010
+- Update to latest I-build
+- Require latest egit for the releng tools.
+
+* Tue May 19 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.5.0-0.18.git201505172000
+- Update to latest I-build.
+- Drop unneeded env variable export.
+
+* Wed May 13 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.17.git201505122100
+- Rebuild for ECF 3.10.0
+- Update to latest I-build
+
+* Tue May 05 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.16.git201505042000
+- Update to latest I-build to fix bundle dep cycle in PDE builds
+- Add test framework to contributor tools subpackage
+- Update eclipse-build snapshot to symlink and require xz-java
+
+* Wed Apr 29 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.15.git201504280100
+- Contibutor-tools subpackage should be archful due to native methods
+
+* Wed Apr 22 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.14.git201504280100
+- Rebuilt to eliminate optional dependencies of jxpath
+- Update to latest I-build
+
+* Wed Apr 08 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.13.git201504081100
+- Update to latest I-build
+- Update eclipse-build snapshot
+- Simplify installation of PDE build scripts
+- Drop upstreamed hamcrest patch
+
+* Wed Apr 01 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.12.git201503310800
+- Organise patches
+
+* Wed Apr 01 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.11.git201503310800
+- Begin using mvn_install for installing dropins
+- This allows us to make sub-packages noarch
+
+* Tue Mar 31 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.10.git201503310800
+- Update for latest I-build
+- New sub-package for contributor-tools
+- Unbundle osgi.annotations compile time dep
+- Rebuild for new eclipse-ecf/httpcomponents
+- Revert "Use better AppData screenshots" this is fixed upstream
+- Update eclipse-build snapshot
+
+* Tue Mar 31 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-0.9.git201503172000
+- Rebuild for eclipse-ecf update
+
+* Mon Mar 30 2015 Richard Hughes <rhughes@redhat.com> - 1:4.5.0-0.8.git201503172000
+- Use better AppData screenshots
+
+* Wed Mar 25 2015 Michael Simacek <msimacek@redhat.com> - 1:4.5.0-0.7.git201503172000
+- Rebuild for jetty update
+
+* Thu Mar 19 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.5.0-0.6.git201503172000
+- Rebuild for eclipse-ecf update
+
+* Tue Mar 17 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.5.git201503172000
+- Update to latest I-build
+
+* Wed Mar 04 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.4.git201503030800
+- Update to latest I-build
+- JDT requires only hamcrest-core
+- Rebuild for SR2 release of EMF
+
+* Wed Feb 25 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.3.git201502240800
+- Update to latest I-build
+- Require jetty 9.2.9
+- Fix arm-build
+
+* Wed Feb 18 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.2.git201502170800
+- Update to latest I-build
+- Unbundle third party libs from tests subpackage rhbz#1150185
+- Rebuild for new eclipse-ecf/httpcomponents
+
+* Fri Jan 30 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.1.git201502100800
+- Update to latest 4.5.0 I-build
+- Drop upstreamed jetty9/servlet and workspace picker patches
+- Drop upstreamed patches for bug 903537 and bug 444143
+- Update eclipse-build snapshot for ant dependency
+- Ship missing features used by some other projects' target platform
+- Build with mvn_build macro
+- Some spec file clean-up
+
+* Fri Jan 23 2015 Michael Simacek <msimacek@redhat.com> - 1:4.4.1-17
+- Rebuild against new jetty
+
+* Mon Jan 19 2015 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-16
+- Rebuild for new eclipse-ecf/httpcomponents
+- Add patch to explicitly require hamcrest bundle from tests
+
+* Mon Jan 12 2015 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.1-15
+- Require newer batik with fixed obsoletes.
+
+* Wed Dec 10 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.1-14
+- Rebuild for new eclipse-ecf.
+
+* Tue Dec 9 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.1-13
+- Move to slimmer batik-css BR/R.
+
+* Sat Nov 29 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.1-12
+- Make changes necessary for Tycho 0.22.0.
+
+* Thu Nov 27 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-11
+- Update eclipse-build snapshot
+- Rebuild for ECF symlink changes
+
+* Wed Nov 19 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-10
+- Update eclipse-build snapshot
+- Rebuild for EMF and icu4j symlink changes
+- Don't own dirs owned by eclipse-filesystem
+
+* Tue Nov 18 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-9
+- Update dep on icu4j/ECF
+
+* Mon Nov 17 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-8
+- Increase max heap size to 1024m
+  - But don't do this as a patch, it doesn't work
+- Fix build ID to always be lexigraphically higher that upstream
+
+* Wed Nov 12 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-7
+- Backport patch to make workspace selection dialog visible in the task manager
+- Tidy up SWT symlinks
+
+* Wed Oct 29 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.1-6
+- Change external plugin references to requirements.
+- List external plugin references in the top-level category.
+
+* Fri Oct 24 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.1-5
+- Rebuild for latest lucene.
+
+* Mon Oct 20 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.1-4
+- Support loading symlinked bundles when location changes.
+
+* Wed Oct 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-3
+- Require latest EMF
+
+* Wed Oct 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-2
+- Fix s390 launcher build
+
+* Fri Sep 26 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.1-1
+- Update to Luna SR1
+- Drop upstreamed patch and fix permissions on appdata files
+
+* Tue Sep 16 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-19
+- Fix for autocomplete selection color.
+- Rebuild for latest jetty.
+
+* Tue Sep 09 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-18
+- Symlink more equinox and some core jars into javadir
+- Enables tycho to unbundle it's eclipse platform jars
+- Update dep on lucene
+
+* Sat Sep 6 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-17
+- Rebuild for lucene update.
+
+* Thu Aug 28 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.0-16
+- Non-bootstrap build.
+
+* Wed Aug 27 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.0-15
+- Build Eclipse bootstrapped.
+
+* Tue Aug 26 2014 Sami Wagiaalla <swagiaal@edhat.com> - 1:4.4.0-15
+- Build agianst webkitgtk4.
+
+* Tue Aug 19 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-14
+- Rebuild against new ECF
+
+* Mon Aug 18 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-13
+- Drop custom buildId, to keep it lexographically greater than upstream's
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.4.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Mon Jul 28 2014 Sami Wagiaalla <swagiaal@redhat.com> 1:4.4.0-11
+- Add patch for webkit2 support.
+
+* Mon Jul 28 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.0-10
+- Provide org.eclipse.tycho:org.eclipse.osgi.compatibility.state.
+
+* Mon Jul 21 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-9
+- Rebuild for new ecf and asm.
+
+* Wed Jul 16 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-8
+- Update eclipse-build snapshot
+- Tighten up deps on asm
+
+* Tue Jul 15 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-7
+- Add appstream addon metadata for JDT and PDE plugins
+- Only use GTK3 by default on F22 or newer, rhbz1118317
+
+* Tue Jul 15 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-6
+- Backport fix for eclipse bz438992
+- Only assemble products for current running target environment
+- Tidy up some unnecessary SCL bits
+
+* Tue Jul 08 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-5
+- Make GTK3 the default SWT implementation in eclipse.ini
+
+* Wed Jul 02 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-4
+- Package the equinox.p2.discovery feature, obsolete the separate package
+- Update e-b snapshot
+- BR/R: gogo-command >= 0.14
+- Symlink mockito to system jar in testing package
+
+* Fri Jun 27 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.0-3
+- Fix sed delimeter when dealing with paths.
+
+* Thu Jun 26 2014 Roland Grunberg <rgrunber@redhat.com> - 1:4.4.0-2
+- Update eclipse-build with improvements to bundle testing.
+
+* Wed Jun 25 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-1
+- Update to final Luna release
+- Rebuild against newer dependencies
+
+* Tue Jun 24 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.31.git201406042000
+- Non bootstrap build.
+
+* Tue Jun 24 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.30.git201406042000
+- Bootstrap build for aarch64.
+
+* Fri Jun 13 2014 Michael Simacek <msimacek@redhat.com> - 1:4.4.0-0.29.git201406042000
+- Rebuild against new jetty
+
+* Tue Jun 10 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.28.git201406042000
+- Drop jdt mvn depmaps.
+
+* Thu Jun 05 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.27.git201406042000
+- Remove pre-built launcher binaries
+- Remove last uses of tomcat
+
+* Tue Jun 03 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.26.git201406022000
+- Update to latest I-build
+
+* Fri May 30 2014 Michael Simacek <msimacek@redhat.com> - 1:4.4.0-0.25.git201405252000
+- Rebuild against new jetty
+
+* Tue May 27 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.24.git201405252000
+- Pass eclipse.javadoc as param to mvn call to fix javadoc generation.
+
+* Tue May 27 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.23.git201405252000
+- Update to latest I-build.
+
+* Fri May 23 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.22.git201405112000
+- Rebuild for new lucene/junit metadata.
+
+* Wed May 21 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.21.git201405112000
+- Drop tomcat BR/Rs.
+
+* Wed May 21 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.20.git201405112000
+- Drop cglib dep.
+- Apply jetty 9 patch unconditionally.
+
+* Mon May 19 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.19.git201405112000
+- Drop unnecessary BRs
+- Update e-b snapshot for new felix-gogo-* jar locations
+
+* Mon May 12 2014 Alexander Kurtakov <akurtako@redhat.com> 1:4.4.0-0.18.git201405112000
+- Update to latest I-build.
+- Move pre-luna changelog to separate file.
+
+* Wed May 07 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.17.git201405062000
+- Update to latest I-build of Luna 4.4.0
+- New e-b snapshot for updated gnome appdata
+- Rebuilt for new dependency versions.
+
+* Thu May 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.16.git201405010200
+- Update to latest I-build of Luna 4.4.0
+
+* Mon Apr 28 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.15.git201404280800
+- Don't mirror emf and ecf into the final p2 repository
+
+* Mon Apr 28 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.14.git201404280800
+- Update to latest I-build of Luna 4.4.0
+
+* Thu Apr 24 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.13.git201404220800
+- Drop the use of custom jdtpde repository build from e-b
+- Don't use a custom product ID
+- Add BR on mockito
+- Fix pixmaps directory ownership
+
+* Tue Apr 22 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.12.git201404220800
+- Update to latest I-build of Luna 4.4.0
+- Enable Java 8 specific bundles
+- Rebuild for updated lucene dependency
+
+* Tue Apr 15 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.11.git201404150800
+- Update to latest I-build of Luna 4.4.0
+- Fix missing copy resource step on ppc64le
+- Don't build bundles that are only applicable on non-linux platforms
+
+* Thu Apr 10 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.10.git201404081645
+- Drop unnecessary BR on GConf2-devel
+- Drop unneeded patch: fix-swt-build-in-rawhide
+
+* Thu Apr 10 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.9.git201404081645
+- Make globbing work on arches that don't have platform specific fragments.
+
+* Tue Apr 08 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.8.git201404081645
+- Update to latest I-build of Luna 4.4.0
+- Don't unnecessarily create platform specific fragments for o.e.core.net and
+  o.e.core.filesystem.
+- Accomodate for ppc64le architecture.
+- Drop upstreamed patch: objectweb-asm
+
+* Thu Apr 03 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.7.git201404011500
+- Fix symlinking junit when it is a directory.
+
+* Thu Apr 03 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.6.git201404011500
+- Non-bootstrap build.
+
+* Wed Apr 02 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.5.git201404011500
+- Add patch for org.ojectweb.asm -> org.ojectweb.asm.all
+
+* Wed Apr 02 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.4.git201404011500
+- Move secondary-arch fragment generation into e-b.
+
+* Wed Apr 02 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.3.git201404011500
+- Update eclipse-build snapshot
+
+* Tue Apr 01 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.2.git201404011500
+- Update to latest I-build of Luna 4.4.0
+- Require objectweb-asm >= 5.0.1
+
+* Mon Mar 24 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-0.1.M6
+- Update to M6 pre-release of Luna 4.4.0
+- Bootstrap build
+- Drop upstreamed patches: do-not-run-as-root, bug-408505,
+  bug-404448, osgi-unpack-sources
+- Add patch to use mockito-core 1.9
+
 * Sat Mar 22 2014 Mat Booth <fedora@matbooth.co.uk> - 1:4.3.2-5
 - Rebuild for new version of ICU.
 

eclipse-adjust-droplets.patch

@@ -0,0 +1,52 @@
+diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
+index 5fc0e73..ed7e4fa 100644
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/EngineActivator.java
+@@ -147,7 +147,20 @@ public class EngineActivator implements BundleActivator {
+ 						}
+ 						continue;
+ 					}
+-					File[] listFiles = extension.listFiles();
++
++					// Support the additional 'eclipse' directory if it exists.
++					File[] extensionFiles = extension.listFiles(new FilenameFilter() {
++						public boolean accept(File dir, String name) {
++							return name.equals("eclipse");
++						}
++					});
++
++					File[] listFiles;
++					if (extensionFiles.length == 1) {
++						listFiles = extensionFiles[0].listFiles();
++					} else {
++						listFiles = extension.listFiles();
++					}
+ 					// new magic - multiple info files, f.e.
+ 					//   egit.info (git feature)
+ 					//   cdt.link (properties file containing link=path) to other info file
+diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
+index 12e4d89..77945ef 100644
+--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
++++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
+@@ -155,7 +155,20 @@ public class SimpleConfiguratorUtils {
+ 						}
+ 						continue;
+ 					}
+-					File[] listFiles = extension.listFiles();
++
++					// Support the additional 'eclipse' directory if it exists.
++					File[] extensionFiles = extension.listFiles(new FilenameFilter() {
++						public boolean accept(File dir, String name) {
++							return name.equals("eclipse");
++						}
++					});
++
++					File[] listFiles;
++					if (extensionFiles.length == 1) {
++						listFiles = extensionFiles[0].listFiles();
++					} else {
++						listFiles = extension.listFiles();
++					}
+ 					// new magic - multiple info files, f.e.
+ 					//   egit.info (git feature)
+ 					//   cdt.link (properties file containing link=path) to other info file

eclipse-bug-386377.patch

@@ -1,565 +0,0 @@
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml	2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,59 @@
-     <ws>gtk</ws>
-     <arch>x86_64</arch>
-   </properties>
-+  <profiles>
-+  <profile>
-+      <id>build-native-launchers-gtk.linux.x86_64</id>
-+      <activation>
-+        <property>
-+          <name>native</name>
-+          <value>gtk.linux.x86_64</value>
-+        </property>
-+      </activation>
-+      <build>
-+        <plugins>
-+          <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
-+            <executions>
-+              <execution>
-+                <id>compile-executable-natives</id>
-+                <phase>generate-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
-+                  </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+            </executions>
-+            <dependencies>
-+              <dependency>
-+                <groupId>bsf</groupId>
-+                <artifactId>bsf</artifactId>
-+                <version>2.4.0</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>rhino</groupId>
-+                <artifactId>js</artifactId>
-+                <version>1.7R2</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-apache-bsf</artifactId>
-+                <version>1.8.3</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-nodeps</artifactId>
-+                <version>1.8.1</version>
-+              </dependency>
-+            </dependencies>
-+          </plugin>
-+        </plugins>
-+      </build>
-+    </profile>
-+  </profiles>
- </project>
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml	2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,60 @@
-     <ws>win32</ws>
-     <arch>x86_64</arch>
-   </properties>
-+  
-+  <profiles>
-+  <profile>
-+      <id>build-native-launchers-win32.win32.x86_64</id>
-+      <activation>
-+        <property>
-+          <name>native</name>
-+          <value>win32.win32.x86_64</value>
-+        </property>
-+      </activation>
-+      <build>
-+        <plugins>
-+          <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
-+            <executions>
-+              <execution>
-+                <id>compile-executable-natives</id>
-+                <phase>generate-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
-+                  </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+            </executions>
-+            <dependencies>
-+              <dependency>
-+                <groupId>bsf</groupId>
-+                <artifactId>bsf</artifactId>
-+                <version>2.4.0</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>rhino</groupId>
-+                <artifactId>js</artifactId>
-+                <version>1.7R2</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-apache-bsf</artifactId>
-+                <version>1.8.3</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-nodeps</artifactId>
-+                <version>1.8.1</version>
-+              </dependency>
-+            </dependencies>
-+          </plugin>
-+        </plugins>
-+      </build>
-+    </profile>
-+  </profiles>
- </project>
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml.orig	2014-04-16 15:57:02.805249103 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/pom.xml	2014-04-16 15:57:26.204834155 +0100
-@@ -27,4 +27,60 @@
-     <ws>gtk</ws>
-     <arch>ppc64le</arch>
-   </properties>
-+
-+  <profiles>
-+  <profile>
-+      <id>build-native-launchers-gtk.linux.ppc64le</id>
-+      <activation>
-+        <property>
-+          <name>native</name>
-+          <value>gtk.linux.ppc64le</value>
-+        </property>
-+      </activation>
-+      <build>
-+        <plugins>
-+          <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
-+            <executions>
-+              <execution>
-+                <id>compile-executable-natives</id>
-+                <phase>generate-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
-+                  </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+            </executions>
-+            <dependencies>
-+              <dependency>
-+                <groupId>bsf</groupId>
-+                <artifactId>bsf</artifactId>
-+                <version>2.4.0</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>rhino</groupId>
-+                <artifactId>js</artifactId>
-+                <version>1.7R2</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-apache-bsf</artifactId>
-+                <version>1.8.3</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-nodeps</artifactId>
-+                <version>1.8.1</version>
-+              </dependency>
-+            </dependencies>
-+          </plugin>
-+        </plugins>
-+      </build>
-+    </profile>
-+  </profiles>
- </project>
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml	2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,59 @@
-     <ws>gtk</ws>
-     <arch>x86</arch>
-   </properties>
-+  <profiles>
-+  <profile>
-+      <id>build-native-launchers-gtk.linux.x86</id>
-+      <activation>
-+        <property>
-+          <name>native</name>
-+          <value>gtk.linux.x86</value>
-+        </property>
-+      </activation>
-+      <build>
-+        <plugins>
-+          <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
-+            <executions>
-+              <execution>
-+                <id>compile-executable-natives</id>
-+                <phase>generate-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
-+                  </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+            </executions>
-+            <dependencies>
-+              <dependency>
-+                <groupId>bsf</groupId>
-+                <artifactId>bsf</artifactId>
-+                <version>2.4.0</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>rhino</groupId>
-+                <artifactId>js</artifactId>
-+                <version>1.7R2</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-apache-bsf</artifactId>
-+                <version>1.8.3</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-nodeps</artifactId>
-+                <version>1.8.1</version>
-+              </dependency>
-+            </dependencies>
-+          </plugin>
-+        </plugins>
-+      </build>
-+    </profile>
-+  </profiles>
- </project>
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml	2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,60 @@
-     <ws>win32</ws>
-     <arch>x86</arch>
-   </properties>
-+  
-+  <profiles>
-+  <profile>
-+      <id>build-native-launchers-win32.win32.x86</id>
-+      <activation>
-+        <property>
-+          <name>native</name>
-+          <value>win32.win32.x86</value>
-+        </property>
-+      </activation>
-+      <build>
-+        <plugins>
-+          <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
-+            <executions>
-+              <execution>
-+                <id>compile-executable-natives</id>
-+                <phase>generate-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
-+                  </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+            </executions>
-+            <dependencies>
-+              <dependency>
-+                <groupId>bsf</groupId>
-+                <artifactId>bsf</artifactId>
-+                <version>2.4.0</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>rhino</groupId>
-+                <artifactId>js</artifactId>
-+                <version>1.7R2</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-apache-bsf</artifactId>
-+                <version>1.8.3</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-nodeps</artifactId>
-+                <version>1.8.1</version>
-+              </dependency>
-+            </dependencies>
-+          </plugin>
-+        </plugins>
-+      </build>
-+    </profile>
-+  </profiles>
- </project>
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml	2014-04-16 15:53:08.145402094 +0100
-@@ -27,4 +27,60 @@
-     <ws>gtk</ws>
-     <arch>s390</arch>
-   </properties>
-+  
-+  <profiles>
-+  <profile>
-+      <id>build-native-launchers-gtk.linux.s390</id>
-+      <activation>
-+        <property>
-+          <name>native</name>
-+          <value>gtk.linux.s390</value>
-+        </property>
-+      </activation>
-+      <build>
-+        <plugins>
-+          <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
-+            <executions>
-+              <execution>
-+                <id>compile-executable-natives</id>
-+                <phase>generate-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
-+                  </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+            </executions>
-+            <dependencies>
-+              <dependency>
-+                <groupId>bsf</groupId>
-+                <artifactId>bsf</artifactId>
-+                <version>2.4.0</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>rhino</groupId>
-+                <artifactId>js</artifactId>
-+                <version>1.7R2</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-apache-bsf</artifactId>
-+                <version>1.8.3</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-nodeps</artifactId>
-+                <version>1.8.1</version>
-+              </dependency>
-+            </dependencies>
-+          </plugin>
-+        </plugins>
-+      </build>
-+    </profile>
-+  </profiles>
- </project>
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml	2014-04-16 15:53:08.146402075 +0100
-@@ -27,4 +27,60 @@
-     <ws>gtk</ws>
-     <arch>s390x</arch>
-   </properties>
-+  
-+  <profiles>
-+  <profile>
-+      <id>build-native-launchers-gtk.linux.s390x</id>
-+      <activation>
-+        <property>
-+          <name>native</name>
-+          <value>gtk.linux.s390x</value>
-+        </property>
-+      </activation>
-+      <build>
-+        <plugins>
-+          <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
-+            <executions>
-+              <execution>
-+                <id>compile-executable-natives</id>
-+                <phase>generate-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
-+                  </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+            </executions>
-+            <dependencies>
-+              <dependency>
-+                <groupId>bsf</groupId>
-+                <artifactId>bsf</artifactId>
-+                <version>2.4.0</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>rhino</groupId>
-+                <artifactId>js</artifactId>
-+                <version>1.7R2</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-apache-bsf</artifactId>
-+                <version>1.8.3</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-nodeps</artifactId>
-+                <version>1.8.1</version>
-+              </dependency>
-+            </dependencies>
-+          </plugin>
-+        </plugins>
-+      </build>
-+    </profile>
-+  </profiles>
- </project>
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml	2014-04-16 15:57:28.315796703 +0100
-@@ -27,4 +27,60 @@
-     <ws>gtk</ws>
-     <arch>ppc64</arch>
-   </properties>
-+  
-+  <profiles>
-+  <profile>
-+      <id>build-native-launchers-gtk.linux.ppc64</id>
-+      <activation>
-+        <property>
-+          <name>native</name>
-+          <value>gtk.linux.ppc64</value>
-+        </property>
-+      </activation>
-+      <build>
-+        <plugins>
-+          <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
-+            <executions>
-+              <execution>
-+                <id>compile-executable-natives</id>
-+                <phase>generate-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
-+                  </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+            </executions>
-+            <dependencies>
-+              <dependency>
-+                <groupId>bsf</groupId>
-+                <artifactId>bsf</artifactId>
-+                <version>2.4.0</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>rhino</groupId>
-+                <artifactId>js</artifactId>
-+                <version>1.7R2</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-apache-bsf</artifactId>
-+                <version>1.8.3</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-nodeps</artifactId>
-+                <version>1.8.1</version>
-+              </dependency>
-+            </dependencies>
-+          </plugin>
-+        </plugins>
-+      </build>
-+    </profile>
-+  </profiles>
- </project>
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml.orig	2014-04-15 14:32:03.000000000 +0100
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml	2014-04-16 15:53:08.146402075 +0100
-@@ -27,4 +27,60 @@
-     <ws>gtk</ws>
-     <arch>ppc</arch>
-   </properties>
-+  
-+  <profiles>
-+  <profile>
-+      <id>build-native-launchers-gtk.linux.ppc</id>
-+      <activation>
-+        <property>
-+          <name>native</name>
-+          <value>gtk.linux.ppc</value>
-+        </property>
-+      </activation>
-+      <build>
-+        <plugins>
-+          <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <version> 1.7 </version>
-+            <executions>
-+              <execution>
-+                <id>compile-executable-natives</id>
-+                <phase>generate-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
-+                  </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+            </executions>
-+            <dependencies>
-+              <dependency>
-+                <groupId>bsf</groupId>
-+                <artifactId>bsf</artifactId>
-+                <version>2.4.0</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>rhino</groupId>
-+                <artifactId>js</artifactId>
-+                <version>1.7R2</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-apache-bsf</artifactId>
-+                <version>1.8.3</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-nodeps</artifactId>
-+                <version>1.8.1</version>
-+              </dependency>
-+            </dependencies>
-+          </plugin>
-+        </plugins>
-+      </build>
-+    </profile>
-+  </profiles>
- </project>

eclipse-bug-438992.patch

@@ -1,96 +0,0 @@
-From faa3866df482c0e42ac5b308a5551882f833a3aa Mon Sep 17 00:00:00 2001
-From: Alexander Kurtakov
-Date: Thu, 10 Jul 2014 09:06:28 +0300
-Subject: Bug 438992 - Combo dropdown has empty space at top
-
-Setting wrap_width also trims the empty whitespace on top for combo
-popup.
-
-Change-Id: I073d1ccef913de8f1ccfa0ff1eb09538606f8f74
-Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c
-index 89185b9..813f451 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c	
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c	
-@@ -9970,6 +9970,16 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1focus_1on_1click)
- }
- #endif
- 
-+#ifndef NO__1gtk_1combo_1box_1set_1wrap_1width
-+JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1set_1wrap_1width)
-+	(JNIEnv *env, jclass that, jintLong arg0, jint arg1)
-+{
-+	OS_NATIVE_ENTER(env, that, _1gtk_1combo_1box_1set_1wrap_1width_FUNC);
-+	gtk_combo_box_set_wrap_width((GtkComboBox *)arg0, (gint)arg1);
-+	OS_NATIVE_EXIT(env, that, _1gtk_1combo_1box_1set_1wrap_1width_FUNC);
-+}
-+#endif
-+
- #ifndef NO__1gtk_1combo_1box_1text_1insert
- JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1combo_1box_1text_1insert)
- 	(JNIEnv *env, jclass that, jintLong arg0, jint arg1, jbyteArray arg2, jbyteArray arg3)
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
-index fefc07e..16d6664 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c	
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c	
-@@ -723,6 +723,7 @@ char * OS_nativeFunctionNames[] = {
- 	"_1gtk_1combo_1box_1remove_1text",
- 	"_1gtk_1combo_1box_1set_1active",
- 	"_1gtk_1combo_1box_1set_1focus_1on_1click",
-+	"_1gtk_1combo_1box_1set_1wrap_1width",
- 	"_1gtk_1combo_1box_1text_1insert",
- 	"_1gtk_1combo_1box_1text_1new",
- 	"_1gtk_1combo_1box_1text_1new_1with_1entry",
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
-index aa408c5..78460d0 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h	
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h	
-@@ -733,6 +733,7 @@ typedef enum {
- 	_1gtk_1combo_1box_1remove_1text_FUNC,
- 	_1gtk_1combo_1box_1set_1active_FUNC,
- 	_1gtk_1combo_1box_1set_1focus_1on_1click_FUNC,
-+	_1gtk_1combo_1box_1set_1wrap_1width_FUNC,
- 	_1gtk_1combo_1box_1text_1insert_FUNC,
- 	_1gtk_1combo_1box_1text_1new_FUNC,
- 	_1gtk_1combo_1box_1text_1new_1with_1entry_FUNC,
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
-index b531bf9..ab42819 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java	
-@@ -7135,6 +7135,19 @@ public static final void gtk_combo_box_set_active(long /*int*/ combo_box, int in
- 		lock.unlock();
- 	}
- }
-+/**
-+ * @param combo_box cast=(GtkComboBox *)
-+ * @param width cast=(gint)
-+ */
-+public static final native void _gtk_combo_box_set_wrap_width(long /*int*/ combo_box, int width);
-+public static final void gtk_combo_box_set_wrap_width(long /*int*/ combo_box, int width) {
-+	lock.lock();
-+	try {
-+		_gtk_combo_box_set_wrap_width(combo_box, width);
-+	} finally {
-+		lock.unlock();
-+	}
-+}
- /** @method flags=dynamic */
- public static final native int _gtk_combo_box_get_active(long /*int*/ combo_box);
- public static final int gtk_combo_box_get_active(long /*int*/ combo_box) {
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java
-index ea5a93e..6589c9e 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java	
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java	
-@@ -455,6 +455,8 @@ void createHandle (int index) {
- 		if (handle == 0) error (SWT.ERROR_NO_HANDLES);
- 		cellHandle = OS.gtk_bin_get_child (handle);
- 		if (cellHandle == 0) error (SWT.ERROR_NO_HANDLES);
-+		// Setting wrap width has the side effect of removing the whitespace on top in popup bug#438992
-+		OS.gtk_combo_box_set_wrap_width(handle, 1);
- 	} else {
- 		if (OS.GTK3) {
- 			handle = OS.gtk_combo_box_text_new_with_entry();
--- 
-cgit v0.10.1-9-gd18e
-

eclipse-bug-903537.patch

@@ -1,16 +0,0 @@
---- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java.bak	2013-01-28 12:16:08.000000000 +0100
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java	2013-02-19 13:22:29.529926456 +0100
-@@ -4439,7 +4439,12 @@
- 		oldDecorations.fixAccelGroup ();
- 	}
- 	long /*int*/ newParent = parent.parentingHandle();
--	OS.gtk_widget_reparent(topHandle, newParent);
-+//	OS.gtk_widget_reparent(topHandle, newParent);
-+	OS.g_object_ref(topHandle);
-+	OS.gtk_container_remove(OS.gtk_widget_get_parent(topHandle), topHandle);
-+	OS.gtk_container_add(newParent, topHandle);
-+	OS.g_object_unref(topHandle);
-+	
- 	if (OS.GTK3) {
- 		OS.swt_fixed_move (newParent, topHandle, x, y);
- 	} else {

eclipse-change-build-packagings.patch

@@ -1,89 +0,0 @@
---- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig	2014-04-08 15:47:19.927087084 +0100
-+++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml	2014-04-08 15:48:00.045367311 +0100
-@@ -19,7 +19,7 @@
-       %license
-    </license>
- 
--   <requires>
-+   <!--requires>
-       <import feature="org.eclipse.emf.common.source" version="2.7.0" match="compatible"/>
-       <import feature="org.eclipse.emf.ecore.source" version="2.7.0" match="compatible"/>
-    
-@@ -29,7 +29,7 @@
-       <import feature="org.eclipse.ecf.filetransfer.httpclient4.source.feature" version="3.8.0" match="compatible"/>
-       <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature" version="1.0.0" match="compatible"/>
-       <import feature="org.eclipse.ecf.filetransfer.ssl.source.feature" version="1.0.0" match="compatible"/>
--   </requires>
-+   </requires-->
- 
- 
- 
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml.orig	2014-04-22 19:03:17.404382093 +0100
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml	2014-04-22 19:08:40.599989429 +0100
-@@ -4,33 +4,21 @@
-     id="org.eclipse.sdk.tests"
-     version="0.0.0" />
-   <feature
--    id="org.eclipse.equinox.p2.sdk"
--    version="0.0.0" />
--  <feature
-     id="org.eclipse.equinox.p2.discovery.feature"
-     version="0.0.0" />
-   <feature
-     id="org.eclipse.core.runtime.feature"
-     version="0.0.0" />
-   <feature
--    id="org.eclipse.equinox.sdk"
--    version="0.0.0" />
--  <feature
-     id="org.eclipse.sdk.examples.source"
-     version="0.0.0" />
-   <feature
--    id="org.eclipse.releng.tools"
--    version="0.0.0" />
--  <feature
-     id="org.eclipse.equinox.executable"
-     version="0.0.0" />
-   <feature
-     id="org.eclipse.sdk"
-     version="0.0.0" />
-   <feature
--    id="org.eclipse.osgi.compatibility.plugins.feature"
--    version="0.0.0" />
--  <feature
-     id="org.eclipse.pde.api.tools.ee.feature"
-     version="0.0.0" />
-   <bundle
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml.orig	2014-05-26 18:59:41.877846054 +0300
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml	2014-05-26 19:06:27.070278740 +0300
-@@ -128,30 +128,10 @@
-                 </repository>
- 
-                 <repository>
--                  <url>${project.baseUri}/../rcp/target/repository</url>
--                  <layout>p2</layout>
--                  <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
--                </repository>
--                <repository>
--                  <url>${project.baseUri}/../rcp.sdk/target/repository</url>
--                  <layout>p2</layout>
--                  <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
--                </repository>
--                <repository>
-                   <url>${project.baseUri}/../platform/target/repository</url>
-                   <layout>p2</layout>
-                   <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
-                 </repository>
--                <repository>
--                  <url>${project.baseUri}/../platform.sdk/target/repository</url>
--                  <layout>p2</layout>
--                  <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
--                </repository>
--                <repository>
--                  <url>${project.baseUri}/../sdk/target/repository</url>
--                  <layout>p2</layout>
--                  <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
--                </repository>
-                 <repository>
-                   <url>${project.baseUri}/../eclipse-junit-tests/target/repository</url>
-                   <layout>p2</layout>

eclipse-debug-symbols.patch

@@ -1,35 +1,23 @@
---- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig	2014-03-12 10:43:26.000000000 +0000
-+++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak	2014-03-12 14:36:44.130938292 +0000
-@@ -115,7 +115,7 @@
- WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
- GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
+--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig	2018-08-19 12:37:52.764590467 +0100
++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	2018-08-19 12:38:15.032503913 +0100
+@@ -72,7 +72,8 @@
  
--CFLAGS = -O -Wall \
-+CFLAGS = -g -O -Wall \
- 		-DSWT_VERSION=$(SWT_VERSION) \
- 		$(NATIVE_STATS) \
- 		-DLINUX -DGTK \
-@@ -125,12 +125,6 @@
- 		${SWT_PTR_CFLAGS}
- LFLAGS = -shared -fPIC ${SWT_LFLAGS}
+ MAKE_TYPE=make
  
--ifndef NO_STRIP
--	AWT_LFLAGS := $(AWT_LFLAGS) -s
--	MOZILLALFLAGS := $(MOZILLALFLAGS) -s
--	LFLAGS := $(LFLAGS) -s
--endif
--
- all: make_swt make_atk make_glx make_webkit
+-export CFLAGS='-O -Wall -fPIC'
++export CFLAGS='-O -g -Wall -fPIC'
++export NO_STRIP=1
  
- #
+ # Determine which OS we are on
+ if [ "${OS}" = "" ]; then
 --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig	2014-03-12 14:47:37.513191381 +0000
 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak	2014-03-12 14:47:45.672200015 +0000
-@@ -48,7 +48,7 @@
-  -DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
-  -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
+@@ -91,7 +91,7 @@
+  -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \
+  -DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\""
  LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic 
--CFLAGS = ${M_ARCH} -g -s -Wall\
-+CFLAGS = ${M_ARCH} -g -Wall\
+-CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\
++CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -Wall\
  	-fpic \
  	-DLINUX \
- 	-DMOZILLA_FIX \
+ 	-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \

eclipse-disable-droplets-in-dropins.patch

@@ -0,0 +1,47 @@
+From edd5a395dd96699f91c463c0e0409a7488814775 Mon Sep 17 00:00:00 2001
+From: Roland Grunberg <rgrunber@redhat.com>
+Date: Tue, 16 Aug 2016 17:51:46 -0400
+Subject: [PATCH] Skip loading droplets in the configuration during
+ reconciliation.
+
+The reconciler attempts to load droplets as extended locations, which
+seems to be an expensive operation. Avoid doing this for the sake of
+efficiency.
+
+Change-Id: Iaf07aacb2d7eaabf3730654e757e69d22f0bc4ab
+---
+ .../internal/p2/reconciler/dropins/PlatformXmlListener.java | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
+index 802ee1b..74023fe 100644
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java
+@@ -168,11 +168,24 @@ public class PlatformXmlListener extends DirectoryChangeListener {
+ 	 * Ensure that we have a repository for each site in the given configuration.
+ 	 */
+ 	protected void synchronizeConfiguration(Configuration config) {
++		String fragments = System.getProperty("p2.fragments");
+ 		List<Site> sites = config.getSites();
+ 		Set<IMetadataRepository> newRepos = new LinkedHashSet<>();
+ 		Set<Site> toBeRemoved = new HashSet<>();
+ 		for (Site site : sites) {
+ 			String siteURL = site.getUrl();
++			if (fragments != null) {
++				String[] rootPaths = fragments.split(",");
++				boolean skip = false;
++				for (String path : rootPaths) {
++					if (siteURL.startsWith("file:" + path)) {
++						skip = true;
++					}
++				}
++				if (skip) {
++					continue;
++				}
++			}
+ 			IMetadataRepository match = getMatchingRepo(Activator.getRepositories(), siteURL);
+ 			if (match == null) {
+ 				try {
+-- 
+2.7.4
+

eclipse-disable-uses-constraints.patch

@@ -0,0 +1,28 @@
+From 889543269853e12925ef00a6e76c3dd85ce5b915 Mon Sep 17 00:00:00 2001
+From: Roland Grunberg <rgrunber@redhat.com>
+Date: Tue, 25 Oct 2016 16:48:28 -0400
+Subject: [PATCH] Disable uses by default (osgi.resolver.usesMode=ignore).
+ set.
+
+---
+ .../felix/src/org/apache/felix/resolver/ResolverImpl.java             | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java
+index ded683f..7216865 100755
+--- rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java
++++ rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/ResolverImpl.java
+@@ -1230,7 +1230,9 @@ public class ResolverImpl implements Resolver
+             {
+                 public void run()
+                 {
+-                    computeUses(session, allWireCandidates, allPackages, resource);
++                    if (! "ignore".equals(System.getProperty("osgi.resolver.usesMode"))) {
++                        computeUses(session, allWireCandidates, allPackages, resource);
++                    }
+                 }
+             });
+         }
+-- 
+2.7.4
+

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

@@ -0,0 +1,563 @@
+--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml.orig	2018-08-17 01:24:16.000000000 +0100
++++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml	2018-08-19 12:50:33.575708475 +0100
+@@ -19,6 +19,23 @@
+       %license
+    </license>
+ 
++   <requires>
++      <import plugin="org.junit" />
++      <import plugin="org.hamcrest.core" />
++      <import plugin="org.junit.jupiter.api" />
++      <import plugin="org.junit.jupiter.engine" />
++      <import plugin="org.junit.jupiter.migrationsupport" />
++      <import plugin="org.junit.jupiter.params" />
++      <import plugin="org.junit.platform.commons" />
++      <import plugin="org.junit.platform.engine" />
++      <import plugin="org.junit.platform.launcher" />
++      <import plugin="org.junit.platform.runner" />
++      <import plugin="org.junit.platform.suite.api" />
++      <import plugin="org.junit.vintage.engine" />
++      <import plugin="org.opentest4j" />
++      <import plugin="org.apiguardian" />
++   </requires>
++
+    <plugin
+          id="org.eclipse.jdt"
+          download-size="0"
+@@ -158,103 +175,6 @@
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.junit"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"/>
+-
+-   <plugin
+-         id="org.hamcrest.core"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.junit.jupiter.api"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.junit.jupiter.engine"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.junit.jupiter.migrationsupport"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.junit.jupiter.params"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.junit.platform.commons"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.junit.platform.engine"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.junit.platform.launcher"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.junit.platform.runner"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.junit.platform.suite.api"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.junit.vintage.engine"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.opentest4j"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apiguardian"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin
+--- eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml.orig	2018-08-17 01:24:16.000000000 +0100
++++ eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml	2018-08-19 12:53:08.128130452 +0100
+@@ -21,6 +21,8 @@
+ 
+    <requires>
+       <import feature="org.eclipse.jdt" version="3.15.0" match="compatible"/>
++      <import plugin="org.objectweb.asm" />
++      <import plugin="org.objectweb.asm.tree" />
+    </requires>
+ 
+    <plugin
+@@ -83,20 +85,6 @@
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.objectweb.asm"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.objectweb.asm.tree"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin
+--- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml.orig	2017-01-04 10:57:15.000000000 +0000
++++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml	2017-01-13 11:29:16.371473551 +0000
+@@ -23,69 +23,6 @@
+    </license>
+ 
+    <plugin
+-         id="javax.el"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="javax.servlet"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="javax.servlet.jsp"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="com.sun.el"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.commons.logging"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.jasper.glassfish"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.lucene.analyzers-common"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.lucene.core"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.lucene.analyzers-smartcn"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.equinox.http.jetty"
+          download-size="0"
+          install-size="0"
+@@ -142,55 +79,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.eclipse.jetty.continuation"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.jetty.http"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.jetty.io"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.jetty.security"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.jetty.server"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.jetty.servlet"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.jetty.util"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.core.net"
+          download-size="0"
+          install-size="0"
+@@ -204,4 +92,22 @@
+          version="0.0.0"
+          unpack="false"/>
+ 
++   <requires>
++      <import plugin="javax.el-api" />
++      <import plugin="javax.servlet-api" />
++      <import plugin="javax.servlet.jsp" />
++      <import plugin="com.sun.el.javax.el" />
++      <import plugin="org.apache.commons.logging" />
++      <import plugin="org.glassfish.web.javax.servlet.jsp" />
++      <import plugin="org.apache.lucene.analyzers-common" />
++      <import plugin="org.apache.lucene.core" />
++      <import plugin="org.apache.lucene.analyzers-smartcn" />
++      <import plugin="org.eclipse.jetty.continuation" />
++      <import plugin="org.eclipse.jetty.http" />
++      <import plugin="org.eclipse.jetty.io" />
++      <import plugin="org.eclipse.jetty.security" />
++      <import plugin="org.eclipse.jetty.server" />
++      <import plugin="org.eclipse.jetty.servlet" />
++      <import plugin="org.eclipse.jetty.util" />
++   </requires>
+ </feature>
+--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig	2018-08-19 13:57:13.249904259 +0100
++++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	2018-08-19 14:03:19.527742984 +0100
+@@ -22,6 +22,22 @@
+    <requires>
+       <import feature="org.eclipse.emf.common" version="2.7.0" match="compatible"/>
+       <import feature="org.eclipse.emf.ecore" version="2.7.0" match="compatible"/>
++      <import plugin="org.apache.batik.constants" />
++      <import plugin="org.apache.batik.css" />
++      <import plugin="org.apache.batik.i18n" />
++      <import plugin="org.apache.batik.util" />
++      <import plugin="org.apache.xmlgraphics" />
++      <import plugin="org.w3c.css.sac" />
++      <import plugin="org.w3c.dom.svg" />
++      <import plugin="javax.inject" />
++      <import plugin="org.apache.felix.scr" />
++      <import plugin="com.ibm.icu" />
++      <import plugin="org.apache.felix.gogo.command" />
++      <import plugin="org.apache.felix.gogo.runtime" />
++      <import plugin="org.apache.felix.gogo.shell" />
++      <import plugin="org.apache.commons.io" />
++      <import plugin="org.apache.commons.jxpath" />
++      <import plugin="org.apache.commons.logging" />
+    </requires>
+ 
+    <plugin
+@@ -95,62 +111,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.apache.batik.css"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.w3c.css.sac"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.batik.util"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.w3c.dom.svg"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.w3c.dom.smil"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.w3c.dom.events"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="javax.inject"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="javax.annotation"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.e4.core.di"
+          download-size="0"
+          install-size="0"
+@@ -172,34 +132,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.apache.batik.constants"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.xmlgraphics"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.commons.io"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.commons.logging"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.e4.core.di.extensions"
+          download-size="0"
+          install-size="0"
+@@ -245,13 +177,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.apache.felix.scr"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.equinox.ds"
+          download-size="0"
+          install-size="0"
+@@ -343,13 +268,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="com.ibm.icu"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.equinox.preferences"
+          download-size="0"
+          install-size="0"
+@@ -624,27 +542,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.apache.felix.gogo.command"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.felix.gogo.runtime"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.felix.gogo.shell"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.equinox.console"
+          download-size="0"
+          install-size="0"
+@@ -670,13 +567,6 @@
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.commons.jxpath"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin
+--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.orig	2017-01-04 10:54:36.000000000 +0000
++++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml	2017-01-13 11:28:25.827041896 +0000
+@@ -60,12 +60,7 @@
+                   </requirement>
+                   <requirement>
+                     <type>eclipse-plugin</type>
+-                    <id>javax.annotation</id>
+-                    <versionRange>0.0.0</versionRange>
+-                  </requirement>
+-                  <requirement>
+-                    <type>eclipse-plugin</type>
+-                    <id>javax.el</id>
++                    <id>javax.el-api</id>
+                     <versionRange>0.0.0</versionRange>
+                   </requirement>
+                   <requirement>
+@@ -75,7 +70,7 @@
+                   </requirement>
+                   <requirement>
+                     <type>eclipse-plugin</type>
+-                    <id>javax.servlet</id>
++                    <id>javax.servlet-api</id>
+                     <versionRange>0.0.0</versionRange>
+                   </requirement>
+                   <requirement>
+@@ -95,7 +90,7 @@
+                   </requirement>
+                   <requirement>
+                     <type>eclipse-plugin</type>
+-                    <id>org.apache.jasper.glassfish</id>
++                    <id>org.glassfish.web.javax.servlet.jsp</id>
+                     <versionRange>0.0.0</versionRange>
+                   </requirement>
+                   <requirement>
+--- eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF.orig	2017-02-15 10:01:24.202436806 +0000
++++ eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF	2017-02-15 10:01:35.454301845 +0000
+@@ -39,8 +39,7 @@
+  org.eclipse.e4.ui.dialogs;bundle-version="1.0.0",
+  org.eclipse.e4.emf.xpath
+ Bundle-ActivationPolicy: lazy
+-Import-Package: javax.annotation,
+- javax.inject;version="1.0.0",
++Import-Package: javax.inject;version="1.0.0",
+  org.osgi.framework;version="1.5.0",
+  org.osgi.service.event;version="1.3.1"
+ Export-Package: org.eclipse.e4.tools.emf.ui.common;version="0.12.0.qualifier";x-friends:="org.eclipse.e4.tools.emf.editor3x,org.eclipse.e4.tools.model.spy",
+--- eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF.orig	2017-02-15 10:00:56.352770853 +0000
++++ eclipse.platform.ui.tools/bundles/org.eclipse.e4.tools.services/META-INF/MANIFEST.MF	2017-02-15 10:01:06.757646050 +0000
+@@ -14,7 +14,6 @@
+  org.eclipse.e4.core.di;bundle-version="0.9.0"
+ Service-Component: OSGI-INF/resourcepoolfunction.xml, OSGI-INF/resourceservice.xml
+ Bundle-ActivationPolicy: lazy
+-Import-Package: javax.annotation,
+- javax.inject;version="1.0.0"
++Import-Package: javax.inject;version="1.0.0"
+ Bundle-Activator: org.eclipse.e4.tools.services.ToolsServicesActivator
+ Automatic-Module-Name: org.eclipse.e4.tools.services

eclipse-fix-comaptibility-class.patch

@@ -1,60 +0,0 @@
---- eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml.orig	2013-01-28 12:14:02.000000000 +0100
-+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml	2013-01-29 11:02:15.865494675 +0100
-@@ -28,4 +28,57 @@
-       </resource>
-     </resources>
-   </build>
-+  <profiles>
-+  <profile>
-+    <activation>
-+      <file>
-+        <missing>classes/org/eclipse/core/runtime/IPluginDescriptor.class</missing>
-+      </file>
-+    </activation>
-+  <build>
-+  <plugins>
-+        <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <version>1.7</version>
-+            <executions>
-+              <execution>
-+                <id>natives</id>
-+                <phase>generate-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <copy todir="classes/org/eclipse/core/runtime" file="../org.eclipse.core.runtime/target/classes/org/eclipse/core/runtime/IPluginDescriptor.class"/>
-+                    </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+            </executions>
-+            <dependencies>
-+              <dependency>
-+                <groupId>bsf</groupId>
-+                <artifactId>bsf</artifactId>
-+                <version>2.4.0</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>rhino</groupId>
-+                <artifactId>js</artifactId>
-+                <version>1.7R2</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-apache-bsf</artifactId>
-+                <version>1.8.3</version>
-+              </dependency>
-+              <dependency>
-+                <groupId>org.apache.ant</groupId>
-+                <artifactId>ant-nodeps</artifactId>
-+                <version>1.8.1</version>
-+              </dependency>
-+            </dependencies>
-+          </plugin>
-+     </plugins>
-+   </build>
-+ </profile>
-+ </profiles>
- </project>

eclipse-fix-dropins.patch

@@ -75,11 +75,11 @@
  		}
  		return engine.perform(plan, phaseSet, monitor);
  	}
---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java	2013-06-10 09:33:20.000000000 +0200
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java	2013-06-11 15:44:28.654682088 +0200
-@@ -145,7 +145,7 @@
- 	}
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java.orig	2018-04-25 20:31:57.931223008 +0100
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java	2018-04-25 20:32:11.069144336 +0100
+@@ -148,7 +148,7 @@
  
+ 	@Override
  	public boolean performCancel() {
 -		String[] buttons = new String[] {IDialogConstants.YES_LABEL, ProvUIMessages.MigrationPage_LATER_BUTTON, IDialogConstants.NO_LABEL};
 +		String[] buttons = new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL};

eclipse-fix-startup-class-refresh.patch

@@ -1,7 +0,0 @@
---- rt.equinox.bundles/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF.bak	2013-03-14 11:36:30.000000000 +0100
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.common/META-INF/MANIFEST.MF	2013-04-23 19:28:14.777666704 +0200
-@@ -35,3 +35,4 @@
- Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2
- Eclipse-LazyStart: true
- Bundle-ActivationPolicy: lazy
-+Require-Capability: osgi.identity; filter:="(osgi.identity=org.eclipse.core.runtime)"; resolution:=optional

eclipse-fix-tests.patch

@@ -0,0 +1,276 @@
+--- eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/MinimalTargetDefinitionPersistenceTests.java.orig	2016-04-19 20:07:36.947017206 +0100
++++ eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/target/MinimalTargetDefinitionPersistenceTests.java	2016-04-19 20:09:59.166077383 +0100
+@@ -77,7 +77,7 @@
+ 	 */
+ 	protected IPath getJdtFeatureLocation() {
+ 		IPath path = new Path(TargetPlatform.getDefaultLocation());
+-		path = path.append("features");
++		path = path.append("droplets").append("eclipse-jdt").append("eclipse").append("features");
+ 		File dir = path.toFile();
+ 		assertTrue("Missing features directory", dir.exists() && !dir.isFile());
+ 		String[] files = dir.list();
+@@ -613,4 +613,4 @@
+ 		assertTrue(iubc.getIncludeSource());
+ 	}
+ 
+-}
+\ No newline at end of file
++}
+diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
+index f1f38f0..f9111e6 100644
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java
+@@ -214,7 +214,7 @@
+ 					if (parent != null) {
+ 						File[] children = parent.listFiles((FileFilter) pathname -> {
+ 							String name = pathname.getName();
+-							return name.startsWith("eclipse-platform-");
++							return name.startsWith("eclipse-SDK-");
+ 						});
+ 						if (children != null && children.length == 1)
+ 							file = children[0];
+diff --git eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
+index 376daa6..1742a8d 100644
+--- eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
++++ eclipse.jdt.core/org.eclipse.jdt.apt.pluggable.tests/build.properties
+@@ -14,6 +14,7 @@ bin.includes = .,\
+                resources/,\
+                lib/
+ src.includes = about.html
+-jars.compile.order = .
++jars.compile.order = .,\
++                     lib/annotations.jar
+ source.. = src/
+-output.. = bin/
++source.lib/annotations.jar = src/
+diff --git eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
+index f34ae40..0f9877d 100644
+--- eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
++++ eclipse.jdt.core/org.eclipse.jdt.apt.tests/build.properties
+@@ -21,4 +21,6 @@ bin.includes = plugin.xml,\
+                plugin.properties
+ src.includes = about.html
+ src.excludes = src-resources/
+-jars.compile.order = aptext.jar,apt.jar,.
++jars.compile.order = aptext.jar,apt.jar,.,\
++                     resources/question.jar
++source.resources/question.jar = src-resources/
+diff --git eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
+index bc8963d..fbe4da3 100644
+--- eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
++++ eclipse.jdt.core/org.eclipse.jdt.compiler.apt.tests/build.properties
+@@ -25,3 +25,6 @@
+ src.includes = about.html
+ compilerArg=-proc:none
+ jars.extra.classpath = java10/java10api.jar
++source.lib/apttestprocessors.jar = processors/
++jars.compile.order = lib/apttestprocessors.jar,\
++                     .
+--- eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties.orig	2016-03-24 14:25:47.076289150 +0000
++++ eclipse.platform/ant/org.eclipse.ant.tests.ui/build.properties	2016-03-24 14:26:39.528660802 +0000
+@@ -25,6 +25,8 @@
+                         Ant Tests/
+ 						
+ source.lib/antUITestsSupport.jar = test support/
+-jars.compile.order=anttestsui.jar,lib/antUITestsSupport.jar
++source.testbuildfiles/antUITestsSupport.jar = test support/
++jars.compile.order=anttestsui.jar,lib/antUITestsSupport.jar,testbuildfiles/antUITestsSupport.jar
+ output.lib/antUITestsSupport.jar = test_support_bin/
++output.testbuildfiles/antUITestsSupport.jar = test_support_bin/
+ output.anttestsui.jar = bin/
+--- eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties.orig	2016-03-25 15:09:40.557786910 +0000
++++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/build.properties	2016-03-25 15:12:08.476059326 +0000
+@@ -22,3 +22,5 @@
+             leaks/,\
+             performance/
+ javacWarnings..=-raw,-unchecked
++source.testresources/nls.jar = nls/
++jars.compile.order = .,testresources/nls.jar
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Client.java	2004-11-12 14:37:36.000000000 +0000
+@@ -0,0 +1,25 @@
++/*******************************************************************************
++ * Copyright (c) 2000, 2004 IBM Corporation and others.
++ * All rights reserved. This program and the accompanying materials 
++ * are made available under the terms of the Common Public License v1.0
++ * which accompanies this distribution, and is available at
++ * http://www.eclipse.org/legal/cpl-v10.html
++ * 
++ * Contributors:
++ *     IBM Corporation - initial API and implementation
++ *******************************************************************************/
++package pkg;
++
++public class Client {
++	
++    public String s;
++	
++	{
++		s= Messages.getString("test");
++		s= Messages.getString("test_undefined");
++		s= Messages.getString("duplicate");
++		s= Messages.getString("test.long.key");
++		s= Messages.getString("SearchResultView.removed_resource");
++	}
++
++}
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Messages.java	2004-11-12 14:37:28.000000000 +0000
+@@ -0,0 +1,58 @@
++/*******************************************************************************
++ * Copyright (c) 2000, 2004 IBM Corporation and others.
++ * All rights reserved. This program and the accompanying materials 
++ * are made available under the terms of the Common Public License v1.0
++ * which accompanies this distribution, and is available at
++ * http://www.eclipse.org/legal/cpl-v10.html
++ * 
++ * Contributors:
++ *     IBM Corporation - initial API and implementation
++ *******************************************************************************/
++package pkg;
++
++import java.text.MessageFormat;
++import java.util.MissingResourceException;
++import java.util.ResourceBundle;
++
++public class Messages extends Object {
++    private static final String RESOURCE_BUNDLE = Messages.class.getName();
++    private static ResourceBundle fgResourceBundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);
++
++    private Messages() {}
++
++    /**
++     * Gets a string from the resource bundle and formats it with the argument
++     *
++     * @param key   the string used to get the bundle value, must not be null
++     */
++    public static String getFormattedString(String key, Object arg) {
++        String format = null;
++
++        try {
++            format = fgResourceBundle.getString(key);
++        } catch (MissingResourceException e) {
++            return "!" + key + "!"; //$NON-NLS-2$ //$NON-NLS-1$
++        }
++
++        if (arg == null) {
++            arg = ""; //$NON-NLS-1$
++        }
++
++        return MessageFormat.format(format, new Object[] { arg });
++    }
++
++    /**
++     * Gets a string from the resource bundle and formats it with arguments
++     */
++    public static String getFormattedString(String key, String[] args) {
++        return MessageFormat.format(fgResourceBundle.getString(key), args);
++    }
++
++    public static String getString(String key) {
++        try {
++            return fgResourceBundle.getString(key);
++        } catch (MissingResourceException e) {
++            return "!" + key + "!"; //$NON-NLS-2$ //$NON-NLS-1$
++        }
++    }
++}
+--- /dev/null	1970-01-01 01:00:00.000000000 +0100
++++ eclipse.jdt.ui/org.eclipse.jdt.ui.tests/nls/pkg/Messages.properties	2004-11-12 14:38:06.000000000 +0000
+@@ -0,0 +1,15 @@
++###############################################################################
++# Copyright (c) 2000, 2004 IBM Corporation and others.
++# All rights reserved. This program and the accompanying materials 
++# are made available under the terms of the Common Public License v1.0
++# which accompanies this distribution, and is available at
++# http://www.eclipse.org/legal/cpl-v10.html
++# 
++# Contributors:
++#     IBM Corporation - initial API and implementation
++###############################################################################
++test= Hello World
++duplicate= Duplicate 1
++test.long.key= Hello World Long
++duplicate= Duplicate 2
++SearchResultView.removed_resource= <removed resource>
+--- eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties.orig	2017-03-03 14:20:53.868573338 +0000
++++ eclipse.platform/ant/org.eclipse.ant.tests.core/build.properties	2017-03-06 14:26:42.382365639 +0000
+@@ -23,6 +23,8 @@
+ source.anttestscore.jar = test plugin/,\
+                           tests/
+ source.lib/antTestsSupport.jar = test support/
+-jars.compile.order=anttestscore.jar,lib/antTestsSupport.jar
++source.testlib/classpathOrdering1.jar = testlib_src/classpathOrdering1/
++source.testlib/classpathOrdering2.jar = testlib_src/classpathOrdering2/
++jars.compile.order=anttestscore.jar,lib/antTestsSupport.jar,testlib/classpathOrdering1.jar,testlib/classpathOrdering2.jar
+ output.lib/antTestsSupport.jar = test_support_bin/
+ output.anttestscore.jar = bin/
+--- /dev/null	2017-02-12 18:27:14.283389371 +0000
++++ eclipse.platform/ant/org.eclipse.ant.tests.core/testlib_src/classpathOrdering1/ClasspathOrdering.java	2017-03-06 14:28:57.742879825 +0000
+@@ -0,0 +1,10 @@
++import java.io.PrintStream;
++
++public class ClasspathOrdering
++{
++  public static void main(String[] args)
++  {
++    System.out.println("classpathOrdering1");
++  }
++}
++
+--- /dev/null	2017-02-12 18:27:14.283389371 +0000
++++ eclipse.platform/ant/org.eclipse.ant.tests.core/testlib_src/classpathOrdering2/ClasspathOrdering.java	2017-03-06 14:29:45.759352762 +0000
+@@ -0,0 +1,10 @@
++import java.io.PrintStream;
++
++public class ClasspathOrdering
++{
++  public static void main(String[] args)
++  {
++    System.out.println("classpathOrdering2");
++  }
++}
++
+--- eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml.orig	2017-04-07 10:44:33.764607961 +0100
++++ eclipse.jdt.core/org.eclipse.jdt.core.tests.builder/pom.xml	2017-04-07 11:26:44.511961798 +0100
+@@ -26,4 +26,24 @@
+     <testClass>org.eclipse.jdt.core.tests.builder.BuilderTests</testClass>
+     <testSuite>${project.artifactId}</testSuite>
+   </properties>
++
++  <build>
++    <plugins>
++      <plugin>
++        <groupId>org.eclipse.tycho</groupId>
++        <artifactId>target-platform-configuration</artifactId>
++        <configuration>
++          <dependency-resolution>
++            <extraRequirements>
++              <requirement>
++                <type>eclipse-plugin</type>
++                <id>org.eclipse.jdt.annotation</id>
++                <versionRange>0.0.0</versionRange>
++              </requirement>
++            </extraRequirements>
++          </dependency-resolution>
++        </configuration>
++      </plugin>
++    </plugins>
++  </build>
+ </project>
+--- eclipse.pde.build/org.eclipse.pde.build.tests/test.xml.orig	2017-04-28 11:49:47.046123546 +0100
++++ eclipse.pde.build/org.eclipse.pde.build.tests/test.xml	2017-04-28 12:05:11.947521737 +0100
+@@ -156,13 +156,6 @@
+         id="org.eclipse.jdt.source.feature.group"
+         version="" />
+       <iu
+-        id="org.eclipse.rcp.configuration.feature.group"
+-        version="" />
+-
+-      <iu
+-        id="org.eclipse.equinox.executable"
+-        version="" />
+-      <iu
+         id="org.eclipse.e4.rcp.feature.group"
+         version="" />
+       <iu

eclipse-help-doc-adjust-dependencies.patch

@@ -1,54 +0,0 @@
-diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
-index c63d1e1..8e7cc30 100644
---- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
-+++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml
-@@ -42,7 +42,7 @@
-          unpack="false"/>
- 
-    <plugin
--         id="com.sun.el"
-+         id="javax.el"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-@@ -56,7 +56,7 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.apache.jasper.glassfish"
-+         id="org.glassfish.web.javax.servlet.jsp"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF b/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF
-index 0af7e6b..1985d9e 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF
-+++ b/eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF
-@@ -43,8 +43,8 @@ Require-Bundle: org.eclipse.ant.core;bundle-version="3.2.200";resolution:=option
-  org.eclipse.core.runtime;bundle-version="3.6.0",
-  org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
-  org.eclipse.core.expressions;bundle-version="[3.4.200,4.0.0)",
-- org.apache.lucene.analysis;bundle-version="[3.5.0,4.0.0)",
-- org.apache.lucene.core;bundle-version="[3.5.0,4.0.0)",
-+ org.apache.lucene.analysis;bundle-version="[3.5.0,5.0.0)",
-+ org.apache.lucene.core;bundle-version="[3.5.0,5.0.0)",
-  org.eclipse.core.net;bundle-version="1.2.200"
- Import-Package: com.ibm.icu.text,
-  org.eclipse.equinox.http.jetty;resolution:=optional
-diff --git a/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
-index 12beb8e..e20ea19 100644
---- a/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
-+++ b/eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF
-@@ -25,9 +25,9 @@ Bundle-Vendor: Eclipse.org
- Bundle-ClassPath: ua-tests.jar
- Import-Package: javax.servlet;version="2.4.0",
-  javax.servlet.http;version="2.4.0",
-- org.apache.lucene.index;core=split;version="[3.5.0,4.0.0)",
-- org.apache.lucene.search;core=split;version="[3.5.0,4.0.0)",
-- org.apache.lucene.store;core=split;version="[3.5.0,4.0.0)"
-+ org.apache.lucene.index;version="[3.5.0,5.0.0)",
-+ org.apache.lucene.search;version="[3.5.0,5.0.0)",
-+ org.apache.lucene.store;version="[3.5.0,5.0.0)"
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Export-Package: org.eclipse.ua.tests,
-  org.eclipse.ua.tests.browser,

eclipse-hide-droplets-from-install-wizard.patch

@@ -0,0 +1,64 @@
+commit 4bfc5a7c6d8c2aaf954c113d805419472de2bcaf
+Author: Mat Booth <mat.booth@redhat.com>
+Date:   Thu May 3 15:58:49 2018 +0100
+
+    Bug 534326 - Awkward p2 UI when many droplets are installed
+    
+    Filter out software site locations where we know that they are p2
+    droplets in places we show the list to the user.
+    
+    Change-Id: I12364223850862783cb7cffd32fb7428fbf6b270
+    Signed-off-by: Mat Booth <mat.booth@redhat.com>
+
+diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
+index e6eef8c39..fe5970e79 100644
+--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
++++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/RepositorySelectionGroup.java
+@@ -300,6 +300,19 @@ public class RepositorySelectionGroup {
+ 	void fillRepoCombo(final String selection) {
+ 		RepositoryTracker tracker = ui.getRepositoryTracker();
+ 		URI[] sites = tracker.getKnownRepositories(ui.getSession());
++		// Filter out sites that are actually installed p2 droplets
++		String fragments = System.getProperty("p2.fragments"); //$NON-NLS-1$
++		ArrayList<URI> filteredSites = new ArrayList<>(Arrays.asList(sites));
++		if (fragments != null) {
++			for (String root : fragments.split(",")) { //$NON-NLS-1$
++				for (URI uri : sites) {
++					if (uri.getPath() != null && uri.getPath().startsWith(root)) {
++						filteredSites.remove(uri);
++					}
++				}
++			}
++		}
++		sites = filteredSites.toArray(new URI[0]);
+ 		boolean hasLocalSites = getLocalSites().length > 0;
+ 		final String[] items;
+ 		if (hasLocalSites) {
+diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
+index d796aefd0..c03924f90 100644
+--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
++++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/RepositoryManipulationPage.java
+@@ -130,9 +130,22 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb
+ 			if (cachedElements == null) {
+ 				Object[] children = super.fetchChildren(o, monitor);
+ 				cachedElements = new Hashtable<>(children.length);
++				String fragments = System.getProperty("p2.fragments"); //$NON-NLS-1$
+ 				for (int i = 0; i < children.length; i++) {
+ 					if (children[i] instanceof MetadataRepositoryElement) {
+-						put((MetadataRepositoryElement) children[i]);
++						// Filter out locations that are actually installed p2 droplets
++						if (fragments != null) {
++							boolean isDroplet = false;
++							for (String root : fragments.split(",")) { //$NON-NLS-1$
++								URI childLoc = ((MetadataRepositoryElement) children[i]).getLocation();
++								if (childLoc.getPath() != null && childLoc.getPath().startsWith(root)) {
++									isDroplet = true;
++								}
++							}
++							if (!isDroplet) {
++								put((MetadataRepositoryElement) children[i]);
++							}
++						}
+ 					}
+ 				}
+ 			}

eclipse-jetty-9.patch

@@ -1,599 +0,0 @@
-From eaca20d2a41ba2771bd379408d87673b12646390 Wed, 27 Feb 2013 09:33:50 +0100
-From: Krzysztof Daniel <kdaniel@redhat.com>
-Date: Tue, 26 Feb 2013 21:25:42 +0100
-Subject: [PATCH] Adopt jetty 9
-
-diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/META-INF/MANIFEST.MF rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/META-INF/MANIFEST.MF
-index deb06c3..f993d0e 100755
---- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/META-INF/MANIFEST.MF
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/META-INF/MANIFEST.MF
-@@ -9,23 +9,20 @@
- Import-Package: javax.servlet;version="[2.6.0,4.0.0)",
-  javax.servlet.http;version="[2.6.0,4.0.0)",
-  org.eclipse.equinox.http.servlet;version="1.0.0",
-- org.eclipse.jetty.http;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.io.bio;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.io.nio;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.server;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.server.bio;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.server.handler;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.server.nio;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.server.session;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.server.ssl;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.servlet;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.util;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.util.component;version="[8.0.0,9.0.0)",
-- org.eclipse.jetty.util.log;version="[8.0.0,9.0.0)",
-+ org.eclipse.jetty.http;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.server;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.server.handler;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.server.nio;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.server.session;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.servlet;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.util;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.util.component;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.util.log;version="[9.0.0,10.0.0)",
-+ org.eclipse.jetty.util.ssl;version="[9.0.0,10.0.0)",
-  org.osgi.framework;version="1.3.0",
-  org.osgi.service.cm;version="[1.4, 2.0)",
-  org.osgi.service.startlevel;version="1.0"
--Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
- Export-Package: org.eclipse.equinox.http.jetty;version="1.1.0"
- Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2
- Eclipse-LazyStart: true
-diff --git rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/jetty6-to-jetty7.patch rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/jetty6-to-jetty7.patch
-deleted file mode 100644
-index d55a157..0000000
---- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/jetty6-to-jetty7.patch
-+++ /dev/null
-@@ -1,204 +0,0 @@
--Index: .project
--===================================================================
--RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6/.project,v
--retrieving revision 1.3
--diff -u -r1.3 .project
----- .project	25 Apr 2008 14:38:54 -0000	1.3
--+++ .project	16 Apr 2010 21:35:58 -0000
--@@ -1,6 +1,6 @@
-- <?xml version="1.0" encoding="UTF-8"?>
-- <projectDescription>
---	<name>org.eclipse.equinox.http.jetty6</name>
--+	<name>org.eclipse.equinox.http.jetty7</name>
-- 	<comment></comment>
-- 	<projects>
-- 	</projects>
--Index: META-INF/MANIFEST.MF
--===================================================================
--RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6/META-INF/MANIFEST.MF,v
--retrieving revision 1.24
--diff -u -r1.24 MANIFEST.MF
----- META-INF/MANIFEST.MF	24 Apr 2009 20:54:41 -0000	1.24
--+++ META-INF/MANIFEST.MF	16 Apr 2010 21:35:58 -0000
--@@ -4,23 +4,28 @@
-- Bundle-Vendor: %providerName
-- Bundle-Localization: plugin
-- Bundle-SymbolicName: org.eclipse.equinox.http.jetty
---Bundle-Version: 2.0.0.qualifier
--+Bundle-Version: 3.0.0.qualifier
-- Bundle-Activator: org.eclipse.equinox.http.jetty.internal.Activator
-- Import-Package: javax.servlet;version="[2.5.0,2.6.0)",
--  javax.servlet.http;version="[2.5.0,2.6.0)",
--  org.eclipse.equinox.http.servlet;version="1.0.0",
--- org.mortbay.component;version="[6.1.0,7.0.0)",
--- org.mortbay.jetty;version="[6.1.0,7.0.0)",
--- org.mortbay.jetty.bio;version="[6.1.0,7.0.0)",
--- org.mortbay.jetty.handler;version="[6.1.0,7.0.0)",
--- org.mortbay.jetty.nio;version="[6.1.0,7.0.0)",
--- org.mortbay.jetty.security;version="[6.1.0,7.0.0)",
--- org.mortbay.jetty.servlet;version="[6.1.0,7.0.0)",
--- org.mortbay.log;version="[6.1.0,7.0.0)",
--+ org.eclipse.jetty.http;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.io.bio;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.io.nio;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.server;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.server.bio;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.server.handler;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.server.nio;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.server.session;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.server.ssl;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.servlet;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.util;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.util.component;version="[7.0.0,8.0.0)",
--+ org.eclipse.jetty.util.log;version="[7.0.0,8.0.0)",
--  org.osgi.framework;version="1.3.0",
--  org.osgi.service.cm;version="1.2.0",
--  org.osgi.service.startlevel;version="1.0"
---Bundle-RequiredExecutionEnvironment: J2SE-1.4
--+Bundle-RequiredExecutionEnvironment: J2SE-1.5
-- Export-Package: org.eclipse.equinox.http.jetty;version="1.1.0"
-- Comment-Header: Both Eclipse-LazyStart and Bundle-ActivationPolicy are specified for compatibility with 3.2
-- Eclipse-LazyStart: true
--Index: src/org/eclipse/equinox/http/jetty/JettyCustomizer.java
--===================================================================
--RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/JettyCustomizer.java,v
--retrieving revision 1.2
--diff -u -r1.2 JettyCustomizer.java
----- src/org/eclipse/equinox/http/jetty/JettyCustomizer.java	17 Apr 2009 21:58:58 -0000	1.2
--+++ src/org/eclipse/equinox/http/jetty/JettyCustomizer.java	16 Apr 2010 21:35:58 -0000
--@@ -33,13 +33,13 @@
-- 	 * framework. Changing those may cause breakage and thus must be avoided.
-- 	 * </p>
-- 	 * @param context 
---	 *             	the Jetty context; in case of Jetty 6 the context is of 
---	 *             	type <code>org.mortbay.jetty.servlet.Context</code>
--+	 *             	the Jetty context; in case of Jetty 7 the context is of 
--+	 *             	type <code>org.eclipse.jetty.servlet.ServletContextHandler</code>
-- 	 * @param settings
-- 	 * 				the settings as passed to {@link JettyConfigurator#startServer(String, Dictionary)}
-- 	 * @return context
---	 *             	the customized context; in case of Jetty 6 the context is of 
---	 *             	type <code>org.mortbay.jetty.servlet.Context</code>
--+	 *             	the customized context; in case of Jetty 7 the context is of 
--+	 *             	type <code>org.eclipse.jetty.servlet.ServletContextHandler</code>
-- 	 */
-- 	public Object customizeContext(Object context, Dictionary settings) {
-- 		return context;
--@@ -52,13 +52,13 @@
-- 	 * Implementors may perform additional configuration of the Jetty Connector.
-- 	 * </p>
-- 	 * @param connector 
---	 *             	the Jetty connector; in case of Jetty 6 the context is of 
---	 *             	type <code>org.mortbay.jetty.Connector</code>
--+	 *             	the Jetty connector; in case of Jetty 7 the context is of 
--+	 *             	type <code>org.eclipse.jetty.server.Connector</code>
-- 	 * @param settings
-- 	 * 				the settings as passed to {@link JettyConfigurator#startServer(String, Dictionary)}
-- 	 * @return connector
-- 	 *             	the customized connector; in case of Jetty 6 the connector is of 
---	 *             	type <code>org.mortbay.jetty.Connector</code>
--+	 *             	type <code>org.eclipse.jetty.server.Connector</code>
-- 	 */
-- 	public Object customizeHttpConnector(Object connector, Dictionary settings) {
-- 		return connector;
--@@ -71,13 +71,13 @@
-- 	 * Implementors may perform additional configuration of the Jetty Connector.
-- 	 * </p>
-- 	 * @param connector 
---	 *             	the Jetty connector; in case of Jetty 6 the connector is of 
---	 *             	type <code>org.mortbay.jetty.Connector</code>
--+	 *             	the Jetty connector; in case of Jetty 7 the connector is of 
--+	 *             	type <code>oorg.eclipse.jetty.server.Connector</code>
-- 	 * @param settings
-- 	 * 				the settings as passed to {@link JettyConfigurator#startServer(String, Dictionary)}
-- 	 * @return connector
---	 *             	the customized connector; in case of Jetty 6 the connector is of 
---	 *             	type <code>org.mortbay.jetty.Connector</code>
--+	 *             	the customized connector; in case of Jetty 7 the connector is of 
--+	 *             	type <code>org.eclipse.jetty.server.Connector</code>
-- 	 */
-- 	public Object customizeHttpsConnector(Object connector, Dictionary settings) {
-- 		return connector;
--Index: src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java
--===================================================================
--RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java,v
--retrieving revision 1.20
--diff -u -r1.20 HttpServerManager.java
----- src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java	20 May 2009 21:12:37 -0000	1.20
--+++ src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java	16 Apr 2010 21:35:58 -0000
--@@ -18,12 +18,15 @@
-- import org.eclipse.equinox.http.jetty.JettyConstants;
-- import org.eclipse.equinox.http.jetty.JettyCustomizer;
-- import org.eclipse.equinox.http.servlet.HttpServiceServlet;
---import org.mortbay.jetty.Connector;
---import org.mortbay.jetty.Server;
---import org.mortbay.jetty.bio.SocketConnector;
---import org.mortbay.jetty.nio.SelectChannelConnector;
---import org.mortbay.jetty.security.SslSocketConnector;
---import org.mortbay.jetty.servlet.*;
--+import org.eclipse.jetty.server.Connector;
--+import org.eclipse.jetty.server.Server;
--+import org.eclipse.jetty.server.bio.SocketConnector;
--+import org.eclipse.jetty.server.nio.SelectChannelConnector;
--+import org.eclipse.jetty.server.session.HashSessionManager;
--+import org.eclipse.jetty.server.session.SessionHandler;
--+import org.eclipse.jetty.server.ssl.SslSocketConnector;
--+import org.eclipse.jetty.servlet.ServletContextHandler;
--+import org.eclipse.jetty.servlet.ServletHolder;
-- import org.osgi.framework.Constants;
-- import org.osgi.service.cm.ConfigurationException;
-- import org.osgi.service.cm.ManagedServiceFactory;
--@@ -98,12 +101,12 @@
-- 		if (otherInfo != null)
-- 			holder.setInitParameter(JettyConstants.OTHER_INFO, otherInfo);
-- 
---		Context httpContext = createHttpContext(dictionary);
--+		ServletContextHandler httpContext = createHttpContext(dictionary);
-- 		if (null != customizer)
---			httpContext = (Context) customizer.customizeContext(httpContext, dictionary);
--+			httpContext = (ServletContextHandler) customizer.customizeContext(httpContext, dictionary);
-- 
-- 		httpContext.addServlet(holder, "/*"); //$NON-NLS-1$
---		server.addHandler(httpContext);
--+		server.setHandler(httpContext);
-- 
-- 		try {
-- 			server.start();
--@@ -241,8 +244,8 @@
-- 		return sslConnector;
-- 	}
-- 
---	private Context createHttpContext(Dictionary dictionary) {
---		Context httpContext = new Context();
--+	private ServletContextHandler createHttpContext(Dictionary dictionary) {
--+		ServletContextHandler httpContext = new ServletContextHandler();
-- 		httpContext.setAttribute(INTERNAL_CONTEXT_CLASSLOADER, Thread.currentThread().getContextClassLoader());
-- 		httpContext.setClassLoader(this.getClass().getClassLoader());
-- 
--Index: src/org/slf4j/Logger.java
--===================================================================
--RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.http.jetty6/src/org/slf4j/Logger.java,v
--retrieving revision 1.2
--diff -u -r1.2 Logger.java
----- src/org/slf4j/Logger.java	17 Apr 2009 20:24:43 -0000	1.2
--+++ src/org/slf4j/Logger.java	16 Apr 2010 21:35:58 -0000
--@@ -10,8 +10,8 @@
--  *******************************************************************************/
-- package org.slf4j;
-- 
---import org.mortbay.log.Log;
---import org.mortbay.log.StdErrLog;
--+import org.eclipse.jetty.util.log.Log;
--+import org.eclipse.jetty.util.log.StdErrLog;
-- 
-- // NOTE: This class is not a real SLF4J implementation and MUST NOT be exported as a general implementation!
-- // It is a place-holder to allow overriding the default logging done in Jetty
--@@ -80,7 +80,7 @@
-- 			setDebugEnabled(true);
-- 	}
-- 
---	public org.mortbay.log.Logger getLogger(String name) {
--+	public org.eclipse.jetty.util.log.Logger getLogger(String name) {
-- 		if ((name == null && this.localName == null) || (name != null && name.equals(this.localName)))
-- 			return this;
-- 		return new Logger(name);
---- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java.orig	2014-03-24 10:46:20.000000000 +0000
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/EquinoxStdErrLog.java	2014-03-24 14:59:31.662164402 +0000
-@@ -169,6 +169,12 @@ public class EquinoxStdErrLog implements Logger {
- 		realLogger.debug(thrown);
- 	}
-
-+	public void debug(String msg, long value) {
-+		if (threshold > DEBUG)
-+			return;
-+		realLogger.debug(msg, value);
-+	}
-+
- 	public void ignore(Throwable ignored) {
- 		// Just post this to debug
- 		debug(ignored);
---- rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java.orig	2014-03-24 10:46:20.000000000 +0000
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java	2014-03-24 14:59:31.662164402 +0000
-@@ -18,21 +18,21 @@
- import org.eclipse.equinox.http.jetty.JettyConstants;
- import org.eclipse.equinox.http.jetty.JettyCustomizer;
- import org.eclipse.equinox.http.servlet.HttpServiceServlet;
--import org.eclipse.jetty.server.Connector;
--import org.eclipse.jetty.server.Server;
--import org.eclipse.jetty.server.bio.SocketConnector;
--import org.eclipse.jetty.server.nio.SelectChannelConnector;
-+import org.eclipse.jetty.server.*;
- import org.eclipse.jetty.server.session.HashSessionManager;
- import org.eclipse.jetty.server.session.SessionHandler;
--import org.eclipse.jetty.server.ssl.SslSocketConnector;
- import org.eclipse.jetty.servlet.ServletContextHandler;
- import org.eclipse.jetty.servlet.ServletHolder;
-+import org.eclipse.jetty.util.ssl.SslContextFactory;
- import org.osgi.framework.Constants;
- import org.osgi.service.cm.ConfigurationException;
- import org.osgi.service.cm.ManagedServiceFactory;
- 
- public class HttpServerManager implements ManagedServiceFactory {
- 
-+	private static final String HTTP_1_1 = "http/1.1"; //$NON-NLS-1$
-+	private static final int DEFAULT_IDLE_TIMEOUT = 30000;
-+	private static final String HTTPS = "https"; //$NON-NLS-1$
- 	private static final String CONTEXT_TEMPDIR = "javax.servlet.context.tempdir"; //$NON-NLS-1$
- 	private static final String DIR_PREFIX = "pid_"; //$NON-NLS-1$
- 	private static final String INTERNAL_CONTEXT_CLASSLOADER = "org.eclipse.equinox.http.jetty.internal.ContextClassLoader"; //$NON-NLS-1$
-@@ -68,18 +68,38 @@
- 
- 		JettyCustomizer customizer = createJettyCustomizer(dictionary);
- 
--		Connector httpConnector = createHttpConnector(dictionary);
-+		/**
-+		 * May be modified by createHttp(s)Connector.
-+		 */
-+		HttpConfiguration http_config = new HttpConfiguration();
-+
-+		ServerConnector httpConnector = createHttpConnector(dictionary, server, http_config);
-+
-+		ServerConnector httpsConnector = createHttpsConnector(dictionary, server, http_config);
-+
- 		if (null != customizer)
--			httpConnector = (Connector) customizer.customizeHttpConnector(httpConnector, dictionary);
-+			httpConnector = (ServerConnector) customizer.customizeHttpConnector(httpConnector, dictionary);
- 
--		if (httpConnector != null)
-+		if (httpConnector != null) {
-+			try {
-+				httpConnector.open();
-+			} catch (IOException e) {
-+				e.printStackTrace();
-+			}
- 			server.addConnector(httpConnector);
-+		}
- 
--		Connector httpsConnector = createHttpsConnector(dictionary);
- 		if (null != customizer)
--			httpsConnector = (Connector) customizer.customizeHttpsConnector(httpsConnector, dictionary);
--		if (httpsConnector != null)
-+			httpsConnector = (ServerConnector) customizer.customizeHttpsConnector(httpsConnector, dictionary);
-+
-+		if (httpsConnector != null) {
-+			try {
-+				httpsConnector.open();
-+			} catch (IOException e) {
-+				e.printStackTrace();
-+			}
- 			server.addConnector(httpsConnector);
-+		}
- 
- 		ServletHolder holder = new ServletHolder(new InternalHttpServiceServlet());
- 		holder.setInitOrder(0);
-@@ -111,11 +131,76 @@
- 		try {
- 			server.start();
- 		} catch (Exception e) {
--			throw new ConfigurationException(pid, e.getMessage(), e);
-+			//throw new ConfigurationException(pid, e.getMessage(), e);
- 		}
- 		servers.put(pid, server);
- 	}
- 
-+	private ServerConnector createHttpsConnector(@SuppressWarnings("rawtypes") Dictionary dictionary, Server server, HttpConfiguration http_config) {
-+		ServerConnector httpsConnector = null;
-+		if (isHttpsEnabled(dictionary)) {
-+			// SSL Context Factory for HTTPS and SPDY
-+			SslContextFactory sslContextFactory = new SslContextFactory();
-+			//sslContextFactory.setKeyStore(KeyS)
-+			//Not sure if the next tree are properly migrated from jetty 8...
-+			sslContextFactory.setKeyStorePath((String) dictionary.get(JettyConstants.SSL_KEYSTORE));
-+			sslContextFactory.setKeyStorePassword((String) dictionary.get(JettyConstants.SSL_PASSWORD));
-+			sslContextFactory.setKeyManagerPassword((String) dictionary.get(JettyConstants.SSL_KEYPASSWORD));
-+
-+			String keystoreType = (String) dictionary.get(JettyConstants.SSL_KEYSTORETYPE);
-+			if (keystoreType != null) {
-+				sslContextFactory.setKeyStoreType(keystoreType);
-+			}
-+
-+			String protocol = (String) dictionary.get(JettyConstants.SSL_PROTOCOL);
-+			if (protocol != null) {
-+				sslContextFactory.setProtocol(protocol);
-+			}
-+
-+			Object wantClientAuth = dictionary.get(JettyConstants.SSL_WANTCLIENTAUTH);
-+			if (wantClientAuth != null) {
-+				if (wantClientAuth instanceof String)
-+					wantClientAuth = Boolean.valueOf((String) wantClientAuth);
-+
-+				sslContextFactory.setWantClientAuth((Boolean) wantClientAuth);
-+			}
-+
-+			Object needClientAuth = dictionary.get(JettyConstants.SSL_NEEDCLIENTAUTH);
-+			if (needClientAuth != null) {
-+				if (needClientAuth instanceof String)
-+					needClientAuth = Boolean.valueOf((String) needClientAuth);
-+
-+				sslContextFactory.setNeedClientAuth(((Boolean) needClientAuth));
-+			}
-+
-+			// HTTPS Configuration
-+			HttpConfiguration https_config = new HttpConfiguration(http_config);
-+			https_config.addCustomizer(new SecureRequestCustomizer());
-+
-+			// HTTPS connector
-+			httpsConnector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory, HTTP_1_1), new HttpConnectionFactory(https_config));
-+			httpsConnector.setPort(getIntProperty(dictionary, JettyConstants.HTTPS_PORT));
-+		}
-+		return httpsConnector;
-+	}
-+
-+	private ServerConnector createHttpConnector(@SuppressWarnings("rawtypes") Dictionary dictionary, Server server, HttpConfiguration http_config) {
-+		ServerConnector httpConnector = null;
-+		if (isHttpEnabled(dictionary)) {
-+			// HTTP Configuration
-+			if (isHttpsEnabled(dictionary)) {
-+				http_config.setSecureScheme(HTTPS);
-+				http_config.setSecurePort(getIntProperty(dictionary, JettyConstants.HTTPS_PORT));
-+			}
-+			// HTTP connector
-+			httpConnector = new ServerConnector(server, new HttpConnectionFactory(http_config));
-+			httpConnector.setPort(getIntProperty(dictionary, JettyConstants.HTTP_PORT));
-+			httpConnector.setHost((String) dictionary.get(JettyConstants.HTTP_HOST));
-+			httpConnector.setIdleTimeout(DEFAULT_IDLE_TIMEOUT);
-+		}
-+		return httpConnector;
-+	}
-+
- 	public synchronized void shutdown() throws Exception {
- 		for (Iterator<Server> it = servers.values().iterator(); it.hasNext();) {
- 			Server server = it.next();
-@@ -124,155 +209,46 @@
- 		servers.clear();
- 	}
- 
--	private Connector createHttpConnector(@SuppressWarnings("rawtypes") Dictionary dictionary) {
--		Boolean httpEnabled = null;
--		Object httpEnabledObj = dictionary.get(JettyConstants.HTTP_ENABLED);
--		if (httpEnabledObj instanceof Boolean) {
--			httpEnabled = (Boolean) httpEnabledObj;
--		} else if (httpEnabledObj instanceof String) {
--			httpEnabled = Boolean.parseBoolean(httpEnabledObj.toString());
--		}
--		if (httpEnabled != null && !httpEnabled.booleanValue())
--			return null;
--
-+	private Integer getIntProperty(@SuppressWarnings("rawtypes") Dictionary dictionary, String property) {
- 		Integer httpPort = null;
--		Object httpPortObj = dictionary.get(JettyConstants.HTTP_PORT);
-+		Object httpPortObj = dictionary.get(property);
- 		if (httpPortObj instanceof Integer) {
- 			httpPort = (Integer) httpPortObj;
- 		} else if (httpPortObj instanceof String) {
- 			httpPort = Integer.valueOf(httpPortObj.toString());
- 		}
--		if (httpPort == null)
--			return null;
--
--		Boolean nioEnabled = null;
--		Object nioEnabledObj = dictionary.get(JettyConstants.HTTP_NIO);
--		if (nioEnabledObj instanceof Boolean) {
--			nioEnabled = (Boolean) nioEnabledObj;
--		} else if (nioEnabledObj instanceof String) {
--			nioEnabled = Boolean.parseBoolean(nioEnabledObj.toString());
--		}
--		if (nioEnabled == null)
--			nioEnabled = getDefaultNIOEnablement();
--
--		Connector connector;
--		if (nioEnabled.booleanValue())
--			connector = new SelectChannelConnector();
--		else
--			connector = new SocketConnector();
--
--		connector.setPort(httpPort.intValue());
--
--		String httpHost = (String) dictionary.get(JettyConstants.HTTP_HOST);
--		if (httpHost != null) {
--			connector.setHost(httpHost);
--		}
--
--		if (connector.getPort() == 0) {
--			try {
--				connector.open();
--			} catch (IOException e) {
--				// this would be unexpected since we're opening the next available port 
--				e.printStackTrace();
--			}
-+		if (httpPort == null) {
-+			throw new IllegalArgumentException("Expected " + property + "property, but it is not set."); //$NON-NLS-1$//$NON-NLS-2$
- 		}
--		return connector;
-+		return httpPort;
- 	}
- 
--	private Boolean getDefaultNIOEnablement() {
--		Properties systemProperties = System.getProperties();
--		String javaVendor = systemProperties.getProperty("java.vendor", ""); //$NON-NLS-1$ //$NON-NLS-2$
--		if (javaVendor.equals("IBM Corporation")) { //$NON-NLS-1$
--			String javaVersion = systemProperties.getProperty("java.version", ""); //$NON-NLS-1$ //$NON-NLS-2$
--			if (javaVersion.startsWith("1.4")) //$NON-NLS-1$
--				return Boolean.FALSE;
--			// Note: no problems currently logged with 1.5
--			if (javaVersion.equals("1.6.0")) { //$NON-NLS-1$
--				String jclVersion = systemProperties.getProperty("java.jcl.version", ""); //$NON-NLS-1$ //$NON-NLS-2$
--				if (jclVersion.startsWith("2007")) //$NON-NLS-1$
--					return Boolean.FALSE;
--				if (jclVersion.startsWith("2008") && !jclVersion.startsWith("200811") && !jclVersion.startsWith("200812")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
--					return Boolean.FALSE;
--			}
-+	/**
-+	 * If not configured -> enable
-+	 */
-+	private boolean isHttpEnabled(@SuppressWarnings("rawtypes") Dictionary dictionary) {
-+		Boolean httpEnabled = true;
-+		Object httpEnabledObj = dictionary.get(JettyConstants.HTTP_ENABLED);
-+		if (httpEnabledObj instanceof Boolean) {
-+			httpEnabled = (Boolean) httpEnabledObj;
-+		} else if (httpEnabledObj instanceof String) {
-+			httpEnabled = Boolean.parseBoolean(httpEnabledObj.toString());
- 		}
--		return Boolean.TRUE;
-+		return httpEnabled;
- 	}
- 
--	@SuppressWarnings("deprecation")
--	private Connector createHttpsConnector(@SuppressWarnings("rawtypes") Dictionary dictionary) {
--		Boolean httpsEnabled = null;
-+	/**
-+	 * If not configured -> disable.
-+	 */
-+	private boolean isHttpsEnabled(@SuppressWarnings("rawtypes") Dictionary dictionary) {
-+		Boolean httpsEnabled = false;
- 		Object httpsEnabledObj = dictionary.get(JettyConstants.HTTPS_ENABLED);
- 		if (httpsEnabledObj instanceof Boolean) {
- 			httpsEnabled = (Boolean) httpsEnabledObj;
- 		} else if (httpsEnabledObj instanceof String) {
- 			httpsEnabled = Boolean.parseBoolean(httpsEnabledObj.toString());
- 		}
--		if (httpsEnabled == null || !httpsEnabled.booleanValue())
--			return null;
--
--		Integer httpsPort = null;
--		Object httpsPortObj = dictionary.get(JettyConstants.HTTPS_PORT);
--		if (httpsPortObj instanceof Integer) {
--			httpsPort = (Integer) httpsPortObj;
--		} else if (httpsPortObj instanceof String) {
--			httpsPort = Integer.valueOf(httpsPortObj.toString());
--		}
--		if (httpsPort == null)
--			return null;
--
--		SslSocketConnector sslConnector = new SslSocketConnector();
--		sslConnector.setPort(httpsPort.intValue());
--
--		String httpsHost = (String) dictionary.get(JettyConstants.HTTPS_HOST);
--		if (httpsHost != null) {
--			sslConnector.setHost(httpsHost);
--		}
--
--		String keyStore = (String) dictionary.get(JettyConstants.SSL_KEYSTORE);
--		if (keyStore != null)
--			sslConnector.setKeystore(keyStore);
--
--		String password = (String) dictionary.get(JettyConstants.SSL_PASSWORD);
--		if (password != null)
--			sslConnector.setPassword(password);
--
--		String keyPassword = (String) dictionary.get(JettyConstants.SSL_KEYPASSWORD);
--		if (keyPassword != null)
--			sslConnector.setKeyPassword(keyPassword);
--
--		Object needClientAuth = dictionary.get(JettyConstants.SSL_NEEDCLIENTAUTH);
--		if (needClientAuth != null) {
--			if (needClientAuth instanceof String)
--				needClientAuth = Boolean.valueOf((String) needClientAuth);
--
--			sslConnector.setNeedClientAuth(((Boolean) needClientAuth).booleanValue());
--		}
--
--		Object wantClientAuth = dictionary.get(JettyConstants.SSL_WANTCLIENTAUTH);
--		if (wantClientAuth != null) {
--			if (wantClientAuth instanceof String)
--				wantClientAuth = Boolean.valueOf((String) wantClientAuth);
--
--			sslConnector.setWantClientAuth(((Boolean) wantClientAuth).booleanValue());
--		}
--
--		String protocol = (String) dictionary.get(JettyConstants.SSL_PROTOCOL);
--		if (protocol != null)
--			sslConnector.setProtocol(protocol);
--
--		String keystoreType = (String) dictionary.get(JettyConstants.SSL_KEYSTORETYPE);
--		if (keystoreType != null)
--			sslConnector.setKeystoreType(keystoreType);
--
--		if (sslConnector.getPort() == 0) {
--			try {
--				sslConnector.open();
--			} catch (IOException e) {
--				// this would be unexpected since we're opening the next available port 
--				e.printStackTrace();
--			}
--		}
--		return sslConnector;
-+		return httpsEnabled;
- 	}
- 
- 	private ServletContextHandler createHttpContext(@SuppressWarnings("rawtypes") Dictionary dictionary) {

eclipse-lucene-4.patch

@@ -1,448 +0,0 @@
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java
-index 4e6786c..49dc51b 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/Analyzer_en.java
-@@ -10,10 +10,14 @@
-  *******************************************************************************/
- package org.eclipse.help.internal.search;
- import java.io.*;
--import java.util.HashSet;
--import java.util.Set;
-+import java.util.ArrayList;
-+import java.util.List;
- 
- import org.apache.lucene.analysis.*;
-+import org.apache.lucene.analysis.en.*;
-+import org.apache.lucene.analysis.core.*;
-+import org.apache.lucene.analysis.util.*;
-+import org.apache.lucene.util.Version;
- /**
-  * Lucene Analyzer for English. LowerCaseTokenizer->StopFilter->PorterStemFilter
-  */
-@@ -25,18 +29,22 @@ public final class Analyzer_en extends Analyzer {
- 		super();
- 	}
- 	/**
--	 * Creates a TokenStream which tokenizes all the text in the provided
-+	 * Creates a TokenStreamComponents which tokenizes all the text in the provided
- 	 * Reader.
- 	 */
--	public final TokenStream tokenStream(String fieldName, Reader reader) {
--		return new PorterStemFilter(new StopFilter(false, new LowerCaseAndDigitsTokenizer(reader), getStopWords(), false));
-+	@Override
-+	public final TokenStreamComponents createComponents(String fieldName, Reader reader) {
-+		CharArraySet stopWordsSet = StopFilter.makeStopSet(Version.LUCENE_47, getStopWords(), true);
-+		Tokenizer source = new LowerCaseAndDigitsTokenizer(reader);
-+		TokenStream filter = new PorterStemFilter(new StopFilter(Version.LUCENE_47, source, stopWordsSet));
-+		return new TokenStreamComponents(source, filter);
- 	}
- 	
--	private Set<String> stopWords;
-+	private List<String> stopWords;
- 	
--	private Set<String> getStopWords() {
-+	private List<String> getStopWords() {
- 		if ( stopWords == null ) {
--			stopWords = new HashSet<String>();
-+			stopWords = new ArrayList<String>();
- 			for (int i = 0; i < STOP_WORDS.length; i++) {
- 			    stopWords.add(STOP_WORDS[i]);
- 			}
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java
-index 50258d2..f72615f 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/DefaultAnalyzer.java
-@@ -15,8 +15,10 @@ import java.util.StringTokenizer;
- import com.ibm.icu.text.BreakIterator;
- 
- import org.apache.lucene.analysis.Analyzer;
--import org.apache.lucene.analysis.LowerCaseFilter;
-+import org.apache.lucene.analysis.core.LowerCaseFilter;
-+import org.apache.lucene.analysis.Tokenizer;
- import org.apache.lucene.analysis.TokenStream;
-+import org.apache.lucene.util.Version;
- 
- import org.eclipse.help.internal.base.HelpBasePlugin;
- 
-@@ -82,11 +84,14 @@ public final class DefaultAnalyzer extends Analyzer {
- 	}
- 
- 	/**
--	 * Creates a TokenStream which tokenizes all the text in the provided
-+	 * Creates a TokenStreamComponents which tokenizes all the text in the provided
- 	 * Reader.
- 	 */
--	public final TokenStream tokenStream(String fieldName, Reader reader) {
--		return new LowerCaseFilter(new WordTokenStream(fieldName, reader, locale));
-+	@Override
-+	public final TokenStreamComponents createComponents(String fieldName, Reader reader) {
-+		Tokenizer source = new WordTokenStream(fieldName, reader, locale);
-+		LowerCaseFilter filter = new LowerCaseFilter(Version.LUCENE_47, source);
-+		return new TokenStreamComponents(source, filter);
- 	}
- 
- 	/**
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java
-index 0dd3943..d101ae9 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/LowerCaseAndDigitsTokenizer.java
-@@ -12,7 +12,8 @@ package org.eclipse.help.internal.search;
- 
- import java.io.*;
- 
--import org.apache.lucene.analysis.*;
-+import org.apache.lucene.analysis.util.*;
-+import org.apache.lucene.util.Version;
- 
- /**
-  * Tokenizer breaking words around letters or digits.
-@@ -20,13 +21,14 @@ import org.apache.lucene.analysis.*;
- public class LowerCaseAndDigitsTokenizer extends CharTokenizer {
- 
-     public LowerCaseAndDigitsTokenizer(Reader input) {
--        super(input);
-+        super(Version.LUCENE_47, input);
-     }
-     protected char normalize(char c) {
-         return Character.toLowerCase(c);
-     }
- 
--    protected boolean isTokenChar(char c) {
-+    @Override
-+    public boolean isTokenChar(int c) {
-         return Character.isLetterOrDigit(c);
-     }
- 
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
-index 00c2799..9f9962d 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/QueryBuilder.java
-@@ -243,16 +243,24 @@ public class QueryBuilder {
- 	private List<String> analyzeText(Analyzer analyzer, String fieldName, String text) {
- 		List<String> words = new ArrayList<String>(1);
- 		Reader reader = new StringReader(text);
--		TokenStream tStream = analyzer.tokenStream(fieldName, reader);
- 		
--		CharTermAttribute termAttribute = (CharTermAttribute) tStream.getAttribute(CharTermAttribute.class);
-+		TokenStream tStream = null;
- 		try {
-+			tStream = analyzer.tokenStream(fieldName, reader);
-+			tStream.reset();
-+			CharTermAttribute termAttribute = (CharTermAttribute) tStream.getAttribute(CharTermAttribute.class);
- 			while (tStream.incrementToken()) {
- 				String term = termAttribute.toString();
- 				words.add(term);
- 			}
--			reader.close();
- 		} catch (IOException ioe) {
-+		} finally {
-+			if (tStream != null) {
-+				try {
-+					tStream.close();
-+				} catch (IOException e) {
-+				}
-+			}
- 		}
- 		
- 		return words;
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
-index e860c8d..0d5a8b6 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java
-@@ -31,13 +31,20 @@ import java.util.Set;
- import java.util.zip.ZipEntry;
- import java.util.zip.ZipInputStream;
- 
-+import org.apache.lucene.analysis.Analyzer;
-+import org.apache.lucene.analysis.miscellaneous.LimitTokenCountAnalyzer;
- import org.apache.lucene.document.Document;
- import org.apache.lucene.document.Field;
-+import org.apache.lucene.index.AtomicReader;
-+import org.apache.lucene.index.DirectoryReader;
-+import org.apache.lucene.index.DocsEnum;
- import org.apache.lucene.index.IndexReader;
- import org.apache.lucene.index.IndexWriter;
-+import org.apache.lucene.index.IndexWriterConfig;
-+import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-+import org.apache.lucene.index.LogDocMergePolicy;
-+import org.apache.lucene.index.SlowCompositeReaderWrapper;
- import org.apache.lucene.index.Term;
--import org.apache.lucene.index.TermDocs;
--import org.apache.lucene.index.IndexWriter.MaxFieldLength;
- import org.apache.lucene.search.BooleanQuery;
- import org.apache.lucene.search.IndexSearcher;
- import org.apache.lucene.search.Query;
-@@ -265,10 +272,10 @@ public class SearchIndex implements IHelpSearchIndex {
- 			if (iw != null) {
- 				iw.close();
- 			}
--			boolean create = false;
-+			OpenMode create = OpenMode.APPEND;
- 			if (!indexDir.exists() || !isLuceneCompatible() || !isAnalyzerCompatible()
- 					|| inconsistencyFile.exists() && firstOperation) {
--				create = true;
-+				create = OpenMode.CREATE;
- 				indexDir.mkdirs();
- 				if (!indexDir.exists())
- 					return false; // unable to setup index directory
-@@ -276,9 +283,13 @@ public class SearchIndex implements IHelpSearchIndex {
- 			indexedDocs = new HelpProperties(INDEXED_DOCS_FILE, indexDir);
- 			indexedDocs.restore();
- 			setInconsistent(true);
--			MaxFieldLength max = new MaxFieldLength(1000000);
--			iw = new IndexWriter(luceneDirectory, analyzerDescriptor.getAnalyzer(), create, max);
--			iw.setMergeFactor(20);
-+			Analyzer wrapper = new LimitTokenCountAnalyzer(analyzerDescriptor.getAnalyzer(), 1000000);
-+			IndexWriterConfig iconfig = new IndexWriterConfig(org.apache.lucene.util.Version.LUCENE_47, wrapper);
-+			iconfig.setOpenMode(create);
-+			LogDocMergePolicy policy = new LogDocMergePolicy();
-+			policy.setMergeFactor(20);
-+			iconfig.setMergePolicy(policy);
-+			iw = new IndexWriter(luceneDirectory, iconfig);
- 			return true;
- 		} catch (IOException e) {
- 			HelpBasePlugin.logError("Exception occurred in search indexing at beginAddBatch.", e); //$NON-NLS-1$
-@@ -297,7 +308,7 @@ public class SearchIndex implements IHelpSearchIndex {
- 			indexedDocs = new HelpProperties(INDEXED_DOCS_FILE, indexDir);
- 			indexedDocs.restore();
- 			setInconsistent(true);
--			ir = IndexReader.open(luceneDirectory, false);
-+			ir = DirectoryReader.open(luceneDirectory);
- 			return true;
- 		} catch (IOException e) {
- 			HelpBasePlugin.logError("Exception occurred in search indexing at beginDeleteBatch.", e); //$NON-NLS-1$
-@@ -313,7 +324,7 @@ public class SearchIndex implements IHelpSearchIndex {
- 			if (ir != null) {
- 				ir.close();
- 			}
--			ir = IndexReader.open(luceneDirectory, false);
-+			ir = DirectoryReader.open(luceneDirectory);
- 			return true;
- 		} catch (IOException e) {
- 			HelpBasePlugin.logError("Exception occurred in search indexing at beginDeleteBatch.", e); //$NON-NLS-1$
-@@ -331,7 +342,7 @@ public class SearchIndex implements IHelpSearchIndex {
- 	public IStatus removeDocument(String name) {
- 		Term term = new Term(FIELD_NAME, name);
- 		try {
--			ir.deleteDocuments(term);
-+			iw.deleteDocuments(term);
- 			indexedDocs.remove(name);
- 		} catch (IOException e) {
- 			return new Status(IStatus.ERROR, HelpBasePlugin.PLUGIN_ID, IStatus.ERROR,
-@@ -350,7 +361,7 @@ public class SearchIndex implements IHelpSearchIndex {
- 			if (iw == null)
- 				return false;
- 			if (optimize)
--				iw.optimize();
-+				iw.forceMerge(1);
- 			iw.close();
- 			iw = null;
- 			// save the update info:
-@@ -369,7 +380,7 @@ public class SearchIndex implements IHelpSearchIndex {
- 			 * know about this change. Close it so that it gets reloaded next search.
- 			 */
- 			if (searcher != null) {
--				searcher.close();
-+				searcher.getIndexReader().close();
- 				searcher = null;
- 			}
- 			return true;
-@@ -401,7 +412,7 @@ public class SearchIndex implements IHelpSearchIndex {
- 			 * know about this change. Close it so that it gets reloaded next search.
- 			 */
- 			if (searcher != null) {
--				searcher.close();
-+				searcher.getIndexReader().close();
- 				searcher = null;
- 			}
- 			return true;
-@@ -505,8 +516,8 @@ public class SearchIndex implements IHelpSearchIndex {
- 		}
- 		Directory[] luceneDirs = dirList.toArray(new Directory[dirList.size()]);
- 		try {
--			iw.addIndexesNoOptimize(luceneDirs);
--			iw.optimize();
-+			iw.addIndexes(luceneDirs);
-+			iw.forceMerge(1);
- 		} catch (IOException ioe) {
- 			HelpBasePlugin.logError("Merging search indexes failed.", ioe); //$NON-NLS-1$
- 			return new HashMap<String, String[]>();
-@@ -515,18 +526,19 @@ public class SearchIndex implements IHelpSearchIndex {
- 	}
- 
- 	public IStatus removeDuplicates(String name, String[] index_paths) {
--		TermDocs hrefDocs = null;
--		TermDocs indexDocs = null;
--		Term hrefTerm = new Term(FIELD_NAME, name);
- 		try {
-+			AtomicReader ar = SlowCompositeReaderWrapper.wrap(ir);
-+			DocsEnum hrefDocs = null;
-+			DocsEnum indexDocs = null;
-+			Term hrefTerm = new Term(FIELD_NAME, name);
- 			for (int i = 0; i < index_paths.length; i++) {
- 				Term indexTerm = new Term(FIELD_INDEX_ID, index_paths[i]);
- 				if (i == 0) {
--					hrefDocs = ir.termDocs(hrefTerm);
--					indexDocs = ir.termDocs(indexTerm);
-+					hrefDocs = ar.termDocsEnum(hrefTerm);
-+					indexDocs = ar.termDocsEnum(indexTerm);
- 				} else {
--					hrefDocs.seek(hrefTerm);
--					indexDocs.seek(indexTerm);
-+					hrefDocs = ar.termDocsEnum(hrefTerm);
-+					indexDocs = ar.termDocsEnum(indexTerm);
- 				}
- 				removeDocuments(hrefDocs, indexDocs);
- 			}
-@@ -535,19 +547,6 @@ public class SearchIndex implements IHelpSearchIndex {
- 					"IO exception occurred while removing duplicates of document " + name //$NON-NLS-1$
- 							+ " from index " + indexDir.getAbsolutePath() + ".", //$NON-NLS-1$ //$NON-NLS-2$
- 					ioe);
--		} finally {
--			if (hrefDocs != null) {
--				try {
--					hrefDocs.close();
--				} catch (IOException e) {
--				}
--			}
--			if (indexDocs != null) {
--				try {
--					indexDocs.close();
--				} catch (IOException e) {
--				}
--			}
- 		}
- 		return Status.OK_STATUS;
- 	}
-@@ -559,33 +558,33 @@ public class SearchIndex implements IHelpSearchIndex {
- 	 * @param docs2
- 	 * @throws IOException
- 	 */
--	private void removeDocuments(TermDocs doc1, TermDocs docs2) throws IOException {
--		if (!doc1.next()) {
-+	private void removeDocuments(DocsEnum doc1, DocsEnum docs2) throws IOException {
-+		if (doc1.nextDoc() == DocsEnum.NO_MORE_DOCS) {
- 			return;
- 		}
--		if (!docs2.next()) {
-+		if (docs2.nextDoc() == DocsEnum.NO_MORE_DOCS) {
- 			return;
- 		}
- 		while (true) {
--			if (doc1.doc() < docs2.doc()) {
--				if (!doc1.skipTo(docs2.doc())) {
--					if (!doc1.next()) {
-+			if (doc1.docID() < docs2.docID()) {
-+				if (doc1.advance(docs2.docID()) == DocsEnum.NO_MORE_DOCS) {
-+					if (doc1.nextDoc() == DocsEnum.NO_MORE_DOCS) {
- 						return;
- 					}
- 				}
--			} else if (doc1.doc() > docs2.doc()) {
--				if (!docs2.skipTo(doc1.doc())) {
--					if (!doc1.next()) {
-+			} else if (doc1.docID() > docs2.docID()) {
-+				if (docs2.advance(doc1.docID()) == DocsEnum.NO_MORE_DOCS) {
-+					if (doc1.nextDoc() == DocsEnum.NO_MORE_DOCS) {
- 						return;
- 					}
- 				}
- 			}
--			if (doc1.doc() == docs2.doc()) {
--				ir.deleteDocument(doc1.doc());
--				if (!doc1.next()) {
-+			if (doc1.docID() == docs2.docID()) {
-+				iw.tryDeleteDocument(ir, doc1.docID());
-+				if (doc1.nextDoc() == DocsEnum.NO_MORE_DOCS) {
- 					return;
- 				}
--				if (!docs2.next()) {
-+				if (docs2.nextDoc() == DocsEnum.NO_MORE_DOCS) {
- 					return;
- 				}
- 			}
-@@ -792,7 +791,7 @@ public class SearchIndex implements IHelpSearchIndex {
- 	public void openSearcher() throws IOException {
- 		synchronized (searcherCreateLock) {
- 			if (searcher == null) {
--				searcher = new IndexSearcher(luceneDirectory, false);
-+				searcher = new IndexSearcher(DirectoryReader.open(luceneDirectory));
- 			}
- 		}
- 	}
-@@ -814,7 +813,7 @@ public class SearchIndex implements IHelpSearchIndex {
- 				if (searches.isEmpty()) {
- 					if (searcher != null) {
- 						try {
--							searcher.close();
-+							searcher.getIndexReader().close();
- 						} catch (IOException ioe) {
- 						}
- 					}
-@@ -888,9 +887,11 @@ public class SearchIndex implements IHelpSearchIndex {
- 	 */
- 	private void cleanOldIndex() {
- 		IndexWriter cleaner = null;
--		MaxFieldLength max = new MaxFieldLength(10000);
- 		try {
--			cleaner = new IndexWriter(luceneDirectory, analyzerDescriptor.getAnalyzer(), true, max);
-+			Analyzer wrapper = new LimitTokenCountAnalyzer(analyzerDescriptor.getAnalyzer(), 10000);
-+			IndexWriterConfig iconfig = new IndexWriterConfig(org.apache.lucene.util.Version.LUCENE_47, wrapper);
-+			iconfig.setOpenMode(OpenMode.CREATE);
-+			cleaner = new IndexWriter(luceneDirectory, iconfig);
- 		} catch (IOException ioe) {
- 		} finally {
- 			try {
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java
-index d0a7bb7..df31d89 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SmartAnalyzer.java
-@@ -18,7 +18,7 @@ import org.apache.lucene.analysis.*;
-  * Smart Analyzer. Chooses underlying implementation based on the field which
-  * text is analyzed.
-  */
--public final class SmartAnalyzer extends Analyzer {
-+public final class SmartAnalyzer extends AnalyzerWrapper {
- 	Analyzer pluggedInAnalyzer;
- 	Analyzer exactAnalyzer;
- 
-@@ -31,14 +31,14 @@ public final class SmartAnalyzer extends Analyzer {
- 		this.exactAnalyzer = new DefaultAnalyzer(locale);
- 	}
- 	/**
--	 * Creates a TokenStream which tokenizes all the text in the provided
--	 * Reader. Delegates to DefaultAnalyzer when field used to search for exact
-+	 * Delegates to DefaultAnalyzer when field used to search for exact
- 	 * match, and to plugged-in analyzer for other fields.
- 	 */
--	public final TokenStream tokenStream(String fieldName, Reader reader) {
-+	@Override
-+	public final Analyzer getWrappedAnalyzer(String fieldName) {
- 		if (fieldName != null && fieldName.startsWith("exact_")) { //$NON-NLS-1$
--			return exactAnalyzer.tokenStream(fieldName, reader);
-+			return exactAnalyzer;
- 		}
--		return pluggedInAnalyzer.tokenStream(fieldName, reader);
-+		return pluggedInAnalyzer;
- 	}
- }
-diff --git a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java
-index 1360599..f622417 100644
---- a/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java
-+++ b/eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java
-@@ -35,6 +35,7 @@ public final class WordTokenStream extends Tokenizer {
- 	 * Constructor
- 	 */
- 	public WordTokenStream(String fieldName, Reader reader, Locale locale) {
-+		super(reader);
- 		this.reader = reader;
- 		boundary = BreakIterator.getWordInstance(locale);
- 
-@@ -105,6 +106,7 @@ public final class WordTokenStream extends Tokenizer {
- 	}
- 	  
- 	public void close() throws IOException {
-+		super.close();
- 		/// Unlikely to be called as this is a reused
- 	    if (this.reader != null) {
- 	    	this.reader.close();

eclipse-make-droplets-runnable.patch

@@ -0,0 +1,47 @@
+From decc6ec5f3c5ce87fa50c2cfe932d66e89496810 Mon Sep 17 00:00:00 2001
+From: Roland Grunberg <rgrunber@redhat.com>
+Date: Wed, 3 Aug 2016 14:57:10 -0400
+Subject: [PATCH] p2 Droplets should be recognized as runnable repositories.
+
+Normally, a runnable repository is identified by the 'p2.runnable'
+property contained within the artifact repository (artifact.xml).
+However, in Fedora we ship p2 Droplets without this file so we need a
+way to let methods like getRunnableRepositories in
+o.e.equinox.internal.p2.touchpoint.eclipse.Util know that p2 Droplets
+are runnable repositories.
+
+Change-Id: I0ad0a7557f998b4d032466f89e6cc76036d1fb38
+---
+ .../ExtensionLocationArtifactRepository.java             | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
+index 342e33e..425a166 100644
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/ExtensionLocationArtifactRepository.java
+@@ -260,6 +260,22 @@ public class ExtensionLocationArtifactRepository extends AbstractRepository<IArt
+ 		return artifactRepository.getProperties();
+ 	}
+ 
++	public String getProperty(String key) {
++		if (IArtifactRepository.PROP_RUNNABLE.equals(key)) {
++			String candidate = getLocation().getPath();
++			String fragments = System.getProperty("p2.fragments");
++			if (fragments != null) {
++				String[] rootPaths = fragments.split(",");
++				for (String root : rootPaths) {
++					if (candidate.startsWith(root)) {
++						return Boolean.TRUE.toString();
++					}
++				}
++			}
++		}
++		return super.getProperty(key);
++	}
++
+ 	@Override
+ 	public String setProperty(String key, String value, IProgressMonitor monitor) {
+ 		try {
+-- 
+2.7.4
+

eclipse-mockito.patch

@@ -1,65 +1,46 @@
 --- eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF.orig	2014-03-26 11:42:36.169928566 +0000
 +++ eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF	2014-03-26 12:56:27.970146198 +0000
-@@ -43,9 +43,9 @@
+@@ -42,8 +42,9 @@
   org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.10.0",
   org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.10.0",
   org.eclipse.osgi.services;bundle-version="3.3.100",
 - org.hamcrest;bundle-version="1.1.0",
-- org.objenesis;bundle-version="1.0.0",
 - org.mockito;bundle-version="1.8.4"
 + org.hamcrest.core,
-+ org.objenesis,
++ org.hamcrest.library,
 + org.mockito.mockito-core
  Eclipse-AutoStart: true
  Export-Package: org.eclipse.ui.tests.api,
   org.eclipse.ui.tests.menus
 --- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF.orig	2014-03-26 11:44:04.400306048 +0000
 +++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF	2014-03-26 12:58:07.608331033 +0000
-@@ -31,9 +31,9 @@
+@@ -31,8 +31,8 @@
   org.eclipse.core.expressions;bundle-version="3.4.200",
   org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.9.0",
   org.eclipse.e4.ui.css.swt;bundle-version="0.11.0",
 - org.hamcrest;bundle-version="1.1.0",
-- org.objenesis;bundle-version="1.0.0",
 - org.mockito;bundle-version="1.8.4",
 + org.hamcrest.core,
-+ org.objenesis,
 + org.mockito.mockito-core,
-  org.eclipse.e4.ui.css.core;bundle-version="0.10.100"
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- Bundle-ActivationPolicy: lazy
+  org.eclipse.e4.ui.css.core;bundle-version="0.10.100",
+  org.eclipse.test.performance;bundle-version="3.13.0"
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 --- eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF.orig	2014-04-22 14:31:35.155774270 +0100
 +++ eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF	2014-04-22 14:33:47.599498477 +0100
-@@ -10,9 +10,9 @@
+@@ -10,8 +10,8 @@
   org.w3c.css.sac,
   org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.1",
   org.eclipse.ui;bundle-version="3.106.0",
 - org.hamcrest;bundle-version="1.1.0",
-- org.objenesis;bundle-version="1.0.0",
 - org.mockito;bundle-version="1.8.4",
 + org.hamcrest.core,
-+ org.objenesis,
 + org.mockito.mockito-core,
-  org.eclipse.equinox.preferences;bundle-version="3.5.200"
- Bundle-ActivationPolicy: lazy
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
---- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.orig	2014-03-26 11:39:33.756282231 +0000
-+++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml	2014-03-26 13:03:00.971974954 +0000
-@@ -469,13 +469,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.hamcrest"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.hamcrest.core"
-          download-size="0"
-          install-size="0"
-@@ -504,7 +497,7 @@
+  org.eclipse.equinox.preferences;bundle-version="3.5.200",
+  org.eclipse.ui.forms,
+  org.eclipse.ui.views.properties.tabbed
+--- eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml.orig	2017-04-04 17:30:21.859313175 +0100
++++ eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml	2017-04-04 17:30:47.748038958 +0100
+@@ -75,7 +75,7 @@
           unpack="false"/>
  
     <plugin
@@ -68,3 +49,22 @@
           download-size="0"
           install-size="0"
           version="0.0.0"
+--- eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF.orig	2018-08-20 12:54:25.245305107 +0100
++++ eclipse.jdt.debug/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF	2018-08-20 12:54:37.952261537 +0100
+@@ -33,6 +33,7 @@
+  org.eclipse.ui.workbench.texteditor;resolution:=optional,
+  org.eclipse.ui.editors;resolution:=optional,
+  org.junit,
++ org.hamcrest.core,
+  org.eclipse.core.resources,
+  org.eclipse.core.variables,
+  org.eclipse.ui,
+--- ./eclipse.platform.ui/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF.orig	2018-08-20 13:22:04.987695821 +0100
++++ ./eclipse.platform.ui/tests/org.eclipse.tests.urischeme/META-INF/MANIFEST.MF	2018-08-20 13:22:28.507613518 +0100
+@@ -7,4 +7,5 @@
+ Fragment-Host: org.eclipse.urischeme;bundle-version="1.0.0"
+ Automatic-Module-Name: org.eclipse.urischeme.tests
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+-Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)"
++Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
++ org.hamcrest.core;bundle-version="1.3.0"

eclipse-no-source-for-dependencies.patch

@@ -1,6 +1,6 @@
 --- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml.bak	2012-07-25 17:45:43.000000000 +0200
 +++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml	2012-07-31 07:41:13.103636303 +0200
-@@ -40,6 +40,24 @@
+@@ -40,6 +40,25 @@
                <excludes>
                  <plugin id="org.sat4j.core"/>
                  <plugin id="org.sat4j.pb"/>
@@ -22,12 +22,13 @@
 +		 <plugin id="org.eclipse.equinox.security.macosx"/>
 +		 <plugin id="org.eclipse.equinox.security.win32.x86"/>
 +		 <plugin id="org.eclipse.equinox.security.win32.x86_64"/>
++                <plugin id="org.tukaani.xz" />
                </excludes>
              </configuration>
            </execution>
 --- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak	2012-07-31 07:43:57.000000000 +0200
 +++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml	2012-07-31 08:05:24.279277920 +0200
-@@ -53,6 +53,17 @@
+@@ -34,6 +34,17 @@
              <goals>
                <goal>source-feature</goal>
              </goals>
@@ -45,9 +46,9 @@
            </execution>
          </executions>
        </plugin>
---- eclipse.pde/org.eclipse.pde-feature/pom.xml.bak	2013-01-29 11:22:47.065953870 +0100
-+++ eclipse.pde/org.eclipse.pde-feature/pom.xml	2013-01-29 11:23:18.630196529 +0100
-@@ -37,6 +37,8 @@
+--- eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml.bak	2013-01-29 11:22:47.065953870 +0100
++++ eclipse.pde.ui/features/org.eclipse.pde-feature/pom.xml	2013-01-29 11:23:18.630196529 +0100
+@@ -38,6 +38,8 @@
              <configuration>
                <excludes>
                    <plugin id="org.eclipse.pde"/>
@@ -58,158 +59,67 @@
              </configuration>
 --- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.orig	2013-02-20 16:32:38.000000000 +0100
 +++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml	2013-02-21 10:08:50.404275226 +0100
-@@ -57,6 +57,10 @@
+@@ -57,6 +57,8 @@
                <excludes>
                  <plugin id="org.eclipse.jdt"/>
                  <plugin id="org.eclipse.jdt.doc.user"/>
-+                <plugin id="org.eclipse.jdt.launching.macosx" />
-+                <plugin id="org.eclipse.jdt.launching.ui.macosx" />
 +                <plugin id="org.junit" />
 +                <plugin id="org.hamcrest.core" />
                </excludes>
              </configuration>
            </execution>
---- eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties.bak	2013-03-14 11:18:11.000000000 +0100
-+++ eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties	2013-03-14 12:45:12.956174290 +0100
-@@ -15,10 +15,7 @@
- license.html
- 
- 
--generate.feature@org.eclipse.rcp.source=org.eclipse.rcp,feature@org.eclipse.e4.rcp.source,plugin@com.ibm.icu.source;version=50.1.0.qualifier;unpack="false",\
--plugin@org.apache.felix.gogo.command.source;version=0.10.0.qualifier;unpack="false",\
--plugin@org.apache.felix.gogo.runtime.source;version=0.10.0.qualifier;unpack="false",\
--plugin@org.apache.felix.gogo.shell.source;version=0.10.0.qualifier;unpack="false"
-+generate.feature@org.eclipse.rcp.source=org.eclipse.rcp,feature@org.eclipse.e4.rcp.source
- 
- generate.feature@org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.user.ui,\
-            feature@org.eclipse.equinox.p2.core.feature.source,\
-@@ -31,16 +28,6 @@
-            plugin@org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\
-            plugin@org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
-            plugin@org.eclipse.ecf.provider.filetransfer.httpclient4.source;version=1.0.200.qualifier;unpack="false",\
--           plugin@org.eclipse.ecf.provider.filetransfer.httpclient4.ssl.source;version=1.0.0.qualifier;unpack="false",\
--           plugin@org.apache.commons.codec.source;version=1.4.0.qualifier;unpack="false,\
--           plugin@org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"
-+           plugin@org.eclipse.ecf.provider.filetransfer.httpclient4.ssl.source;version=1.0.0.qualifier;unpack="false"
-            
--generate.feature@org.eclipse.e4.rcp.source=org.eclipse.e4.rcp,\
-- plugin@javax.annotation.source;version=1.1.0.qualifier;unpack="false",\
-- plugin@javax.inject.source;version=1.0.0.qualifier;unpack="false",\
-- plugin@org.apache.batik.css.source;version=1.6.0.qualifier;unpack="false",\
-- plugin@org.apache.batik.util.gui.source;version=1.6.0.qualifier;unpack="false",\
-- plugin@org.apache.batik.util.source;version=1.6.0.qualifier;unpack="false",\
-- plugin@org.w3c.dom.smil.source;version=1.0.0.qualifier;unpack="false",\
-- plugin@org.w3c.dom.svg.source;version=1.1.0.qualifier;unpack="false",\
-- plugin@org.w3c.css.sac.source;version=1.3.1.qualifier;unpack="false"
-+generate.feature@org.eclipse.e4.rcp.source=org.eclipse.e4.rcp
-\ No newline at end of file
---- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig	2014-03-24 12:58:43.355826288 +0000
-+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml	2014-03-24 13:04:46.463916138 +0000
-@@ -75,6 +75,12 @@
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.orig  2014-11-28 15:27:07.874872769 +0000
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml       2014-11-28 15:31:02.592652099 +0000
+@@ -68,6 +68,8 @@
+                 <plugin id="org.eclipse.core.net.linux.x86_64"/>
                  <plugin id="org.eclipse.core.net.win32.x86"/>
                  <plugin id="org.eclipse.core.net.win32.x86_64"/>
-                 <plugin id="org.eclipse.equinox.security.macosx"/>
-+                <plugin id="org.eclipse.equinox.security.win32.x86"/>
-+                <plugin id="org.eclipse.equinox.security.win32.x86_64"/>
-+                <plugin id="org.eclipse.compare.win32"/>
-+                <plugin id="org.eclipse.ui.win32"/>
 +                <plugin id="com.jcraft.jsch"/>
 +                <plugin id="org.apache.ant"/>
                </excludes>
              </configuration>
            </execution>
---- eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml.orig	2014-04-23 15:44:51.755422154 +0100
-+++ eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/pom.xml	2014-04-23 15:45:22.730893380 +0100
-@@ -39,11 +39,9 @@
-               <features>
-                 <feature id="org.eclipse.sdk.examples"/>
-               </features>
--              <!-- 
-               <excludes>
--                <plugin id="org.eclipse.sdk.examples"/>
-+                <plugin id="org.eclipse.swt.examples.ole.win32"/>
-               </excludes>
--               -->
-             </configuration>
-           </execution>
-         </executions>
---- eclipse.platform.releng/features/org.eclipse.rcp/pom.xml.orig	2014-04-28 16:08:27.781454042 +0100
-+++ eclipse.platform.releng/features/org.eclipse.rcp/pom.xml	2014-04-28 16:08:55.067988282 +0100
-@@ -37,6 +37,7 @@
-             <configuration>
-               <excludes>
-                 <plugin id="org.eclipse.rcp"/>
-+                <plugin id="org.eclipse.ui.cocoa"/>
-               </excludes>
-             </configuration>
-           </execution>
---- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.bak	2013-03-14 11:18:11.000000000 +0100
-+++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties	2013-03-14 13:00:08.498377327 +0100
-@@ -11,31 +11,12 @@
- bin.includes=feature.xml,feature.properties
- 
- generate.feature@org.eclipse.platform.source=org.eclipse.platform,feature@org.eclipse.rcp.source,feature@org.eclipse.equinox.p2.user.ui.source;optional="true",plugin@org.eclipse.platform.doc.isv;unpack="false",\
--  plugin@org.apache.ant.source;version=1.8.4.qualifier;unpack="false",\
--  plugin@com.jcraft.jsch.source;version=0.1.46.qualifier;unpack="false",\
-   exclude@org.eclipse.platform.doc.user
-    
- generate.feature@org.eclipse.jdt.source=org.eclipse.jdt, plugin@org.eclipse.jdt.doc.isv;unpack="false",\
--plugin@org.junit.source;version=4.10.0.qualifier;unpack="false",\
--plugin@org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
- exclude@org.eclipse.jdt.doc.user
--generate.feature@org.eclipse.pde.source=org.eclipse.pde,plugin@org.objectweb.asm.source;version=3.3.1.qualifier;unpack="false",\exclude@org.eclipse.pde.doc.user
-+generate.feature@org.eclipse.pde.source=org.eclipse.pde,\exclude@org.eclipse.pde.doc.user
- generate.feature@org.eclipse.cvs.source=org.eclipse.cvs
--generate.feature@org.eclipse.help.source=org.eclipse.help,\
--  plugin@javax.servlet.source;version=3.0.0.qualifier;unpack="false",\
--  plugin@javax.servlet.jsp.source;version=2.2.0.qualifier;unpack="false",\
--  plugin@org.apache.jasper.glassfish.source;version=2.2.2.qualifier;unpack="false",\
--  plugin@com.sun.el.source;version=2.2.0.qualifier;unpack="false",\
--  plugin@org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\
--  plugin@org.apache.lucene.analysis.source;version=3.5.0.qualifier;unpack="false",\
--  plugin@org.apache.lucene.core.source;version=3.5.0.qualifier;unpack="false",\
--  plugin@org.eclipse.jetty.continuation.source;version=8.1.9.qualifier;unpack="false",\
--  plugin@org.eclipse.jetty.http.source;version=8.1.9.qualifier;unpack="false",\
--  plugin@org.eclipse.jetty.io.source;version=8.1.9.qualifier;unpack="false",\
--  plugin@org.eclipse.jetty.security.source;version=8.1.9.qualifier;unpack="false",\
--  plugin@org.eclipse.jetty.server.source;version=8.1.9.qualifier;unpack="false",\
--  plugin@org.eclipse.jetty.servlet.source;version=8.1.9.qualifier;unpack="false",\
--  plugin@org.eclipse.jetty.util.source;version=8.1.9.qualifier;unpack="false",\
--  plugin@javax.el.source;version=2.2.0.qualifier;unpack="false"
--
-+generate.feature@org.eclipse.help.source=org.eclipse.help
-+  
- generatedVersionLength=45
 --- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.orig	2014-05-26 18:37:25.406426611 +0300
 +++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	2014-05-26 18:37:47.327449374 +0300
-@@ -54,6 +54,30 @@
-                 <plugin id="org.eclipse.equinox.launcher.gtk.hpux.ia64"/>
+@@ -44,6 +44,22 @@
+                 <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
                  <plugin id="org.eclipse.equinox.launcher.win32.win32.x86"/>
                  <plugin id="org.eclipse.equinox.launcher.win32.win32.x86_64"/>
-+                <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
-+				<plugin id="org.apache.felix.gogo.command" />
-+               <plugin id="org.apache.batik.css" />
-+               <plugin id="org.w3c.css.sac" />
-+               <plugin id="org.apache.batik.util" />
-+               <plugin id="org.apache.batik.util.gui" />
-+               <plugin id="org.w3c.dom.svg" />
-+				<plugin id="javax.inject" />
-+				<plugin id="com.ibm.icu"/>
-+				<plugin id="org.apache.felix.gogo.runtime" />
-+				<plugin id="org.apache.felix.gogo.shell" />
-+				<plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
-+				<plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" />
-+				<plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64le" />
-+				<plugin id="org.eclipse.swt.win32.win32.x86" />
-+				<plugin id="org.eclipse.swt.win32.win32.x86_64" />
-+				<plugin id="org.eclipse.swt.cocoa.macosx.x86_64" />
-+               <plugin id="org.eclipse.swt.gtk.solaris.sparc" />
-+               <plugin id="org.eclipse.swt.gtk.solaris.x86" />
-+               <plugin id="org.eclipse.swt.cocoa.macosx" />
-+               <plugin id="org.eclipse.swt.gtk.aix.ppc" />
-+               <plugin id="org.eclipse.swt.gtk.aix.ppc64" />
-+               <plugin id="org.eclipse.swt.gtk.hpux.ia64" />
-+				<plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" />
++                <plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
++                <plugin id="org.eclipse.equinox.launcher.gtk.linux.aarch64" />
++                <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x" />
++                <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" />
++                <plugin id="org.apache.commons.jxpath" />
++                <plugin id="org.apache.felix.gogo.command" />
++                <plugin id="org.apache.batik.css" />
++                <plugin id="org.apache.batik.i18n" />
++                <plugin id="org.w3c.css.sac" />
++                <plugin id="org.apache.batik.util" />
++                <plugin id="org.apache.xmlgraphics" />
++                <plugin id="org.w3c.dom.svg" />
++                <plugin id="javax.inject" />
++                <plugin id="com.ibm.icu"/>
++                <plugin id="org.apache.felix.gogo.runtime" />
++                <plugin id="org.apache.felix.gogo.shell" />
                </excludes>
              </configuration>
            </execution>
+--- eclipse.platform.releng/features/org.eclipse.sdk/feature.xml.orig	2016-04-27 09:18:50.421221722 +0100
++++ eclipse.platform.releng/features/org.eclipse.sdk/feature.xml	2016-04-27 09:19:08.454957280 +0100
+@@ -51,16 +51,6 @@
+          id="org.eclipse.help.source"
+          version="0.0.0"/>
+ 
+-   <requires>
+-      <import feature="org.eclipse.emf.common.source" version="2.7.0" match="compatible"/>
+-      <import feature="org.eclipse.emf.ecore.source" version="2.7.0" match="compatible"/>
+-      <import feature="org.eclipse.ecf.core.feature.source" version="1.4.0" match="compatible"/>
+-      <import feature="org.eclipse.ecf.core.ssl.feature.source" version="1.1.0" match="compatible"/>
+-      <import feature="org.eclipse.ecf.filetransfer.feature.source" version="3.13.7" match="compatible"/>
+-      <import feature="org.eclipse.ecf.filetransfer.httpclient4.feature.source" version="3.13.7" match="compatible"/>
+-      <import feature="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source" version="1.1.0" match="compatible"/>
+-      <import feature="org.eclipse.ecf.filetransfer.ssl.feature.source" version="1.1.0" match="compatible"/>
+-   </requires>
+ 
+    <plugin
+          id="org.eclipse.sdk"

eclipse-no-target-platform.patch

@@ -1,16 +0,0 @@
---- eclipse-platform-parent/pom.xml.orig	2014-03-24 15:52:04.794208197 +0000
-+++ eclipse-platform-parent/pom.xml	2014-03-24 15:56:15.746202079 +0000
-@@ -170,13 +170,6 @@
-         <groupId>org.eclipse.tycho</groupId>
-         <artifactId>target-platform-configuration</artifactId>
-         <configuration>
--          <target>
--            <artifact>
--              <groupId>org.eclipse</groupId>
--              <artifactId>eclipse-sdk-prereqs</artifactId>
--              <version>4.4.0-SNAPSHOT</version>
--            </artifact>
--          </target>
-           <environments>
-             <environment>
-               <os>linux</os>

eclipse-p2-pick-up-renamed-jars.patch

@@ -1,11 +1,11 @@
---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java.orig	2012-05-05 15:24:03.000000000 +0200
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java	2012-05-17 16:14:48.607827015 +0200
-@@ -752,7 +752,7 @@
- 				//First check to see if there is already an IU around for this
- 				IInstallableUnit bundleIU = queryForIU(result, bundleDescriptions[i].getSymbolicName(), PublisherHelper.fromOSGiVersion(bd.getVersion()));
- 				IArtifactKey key = createBundleArtifactKey(bd.getSymbolicName(), bd.getVersion().toString());
--				if (bundleIU == null) {
-+				if (bundleIU == null || !bd.getLocation().equals(bundleIU.getProperty("file.name"))) {
- 					createAdviceFileAdvice(bundleDescriptions[i], info);
- 					// Create the bundle IU according to any shape advice we have
- 					bundleIU = doCreateBundleIU(bd, key, info);
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java.orig	2018-04-25 15:35:44.914031196 +0100
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java	2018-04-25 15:36:17.546856697 +0100
+@@ -880,7 +880,7 @@
+ 			//First check to see if there is already an IU around for this
+ 			IInstallableUnit bundleIU = queryForIU(result, bd.getSymbolicName(), PublisherHelper.fromOSGiVersion(bd.getVersion()));
+ 			IArtifactKey bundleArtKey = createBundleArtifactKey(bd.getSymbolicName(), bd.getVersion().toString());
+-			if (bundleIU == null) {
++			if (bundleIU == null || !bd.getLocation().equals(bundleIU.getProperty("file.name"))) {
+ 				createAdviceFileAdvice(bd, info);
+ 				// Create the bundle IU according to any shape advice we have
+ 				bundleIU = doCreateBundleIU(bd, bundleArtKey, info);

eclipse-pde-tp-support-droplets.patch

@@ -0,0 +1,114 @@
+From 72e58be8c9c5fbc6f6527318b4381a58cebfc120 Mon Sep 17 00:00:00 2001
+From: Roland Grunberg <rgrunber@redhat.com>
+Date: Thu, 7 Apr 2016 10:23:49 -0400
+Subject: [PATCH] Support reading BundleInfo from p2 Droplets enabled
+ installations.
+
+- Additionally support reading source bundles from p2 Droplets location
+---
+ ui/org.eclipse.pde.core/META-INF/MANIFEST.MF       |  3 +-
+ .../src/org/eclipse/pde/internal/core/P2Utils.java | 48 +++++++++++++++++++---
+ 2 files changed, 45 insertions(+), 6 deletions(-)
+
+diff --git eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
+index 7c20994..ab702e3 100644
+--- eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
++++ eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF
+@@ -102,6 +102,7 @@ Require-Bundle:
+  org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)"
+ Eclipse-LazyStart: true
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+-Import-Package: com.ibm.icu.util
++Import-Package: com.ibm.icu.util,
++ org.eclipse.equinox.internal.simpleconfigurator.utils
+ Bundle-ActivationPolicy: lazy
+ Automatic-Module-Name: org.eclipse.pde.core
+diff --git eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
+index fbd4b81..55cd40e 100644
+--- eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
++++ eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java
+@@ -12,11 +12,12 @@
+ package org.eclipse.pde.internal.core;
+ 
+ import java.io.*;
+-import java.net.MalformedURLException;
+-import java.net.URL;
++import java.net.*;
++import java.nio.file.Paths;
+ import java.util.*;
+ import org.eclipse.core.runtime.*;
+ import org.eclipse.equinox.frameworkadmin.BundleInfo;
++import org.eclipse.equinox.internal.simpleconfigurator.utils.SimpleConfiguratorUtils;
+ import org.eclipse.equinox.p2.core.IProvisioningAgent;
+ import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
+ import org.eclipse.equinox.p2.engine.*;
+@@ -29,6 +30,7 @@ import org.eclipse.osgi.service.resolver.*;
+ import org.eclipse.pde.core.plugin.*;
+ import org.eclipse.pde.internal.build.BundleHelper;
+ import org.eclipse.pde.internal.core.plugin.PluginBase;
++import org.eclipse.pde.internal.core.util.ManifestUtils;
+ import org.osgi.framework.Constants;
+ 
+ /**
+@@ -108,7 +110,16 @@ public class P2Utils {
+ 		try {
+ 			URL bundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), new File(configurationArea.getFile(), SimpleConfiguratorManipulator.BUNDLES_INFO_PATH).getAbsolutePath());
+ 			File home = basePath.toFile();
+-			BundleInfo bundles[] = getBundlesFromFile(bundlesTxt, home);
++			List<org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo> ibundleList = SimpleConfiguratorUtils.readConfiguration(bundlesTxt, home.toURI());
++			List<BundleInfo> bundleList = new ArrayList<>();
++			for (org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo b : ibundleList) {
++				URI location = b.getLocation();
++				if (!location.isAbsolute() && b.getBaseLocation() != null)
++					location = URIUtil.makeAbsolute(location, b.getBaseLocation());
++				BundleInfo binfo = new BundleInfo(b.getSymbolicName(), b.getVersion(), location, b.getStartLevel(), b.isMarkedAsStarted());
++				bundleList.add(binfo);
++			}
++			BundleInfo[] bundles = bundleList.toArray(new BundleInfo[0]);
+ 			if (bundles == null || bundles.length == 0) {
+ 				return null;
+ 			}
+@@ -140,11 +151,38 @@ public class P2Utils {
+ 		try {
+ 			File home = basePath.toFile();
+ 			URL srcBundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), configurationArea.getFile().concat(SimpleConfiguratorManipulator.SOURCE_INFO_PATH));
++			final List<BundleInfo> allSrcBundles = new ArrayList<>();
++			try {
++				for (File infoFile : SimpleConfiguratorUtils.getInfoFiles()) {
++					File pluginsDir = Paths.get(infoFile.getParent(), "plugins").toFile(); //$NON-NLS-1$
++					File[] sourceJars = pluginsDir.listFiles((dir, name) -> {
++						return name.matches(".*\\.source_.*\\.jar$"); //$NON-NLS-1$
++					});
++					for (File sourceJar : sourceJars) {
++						Map<String, String> manifest;
++						try {
++							manifest = ManifestUtils.loadManifest(sourceJar);
++							final String bsn = manifest.get(Constants.BUNDLE_SYMBOLICNAME);
++							final String version = manifest.get(Constants.BUNDLE_VERSION);
++							BundleInfo info = new BundleInfo(bsn, version, sourceJar.toURI(), -1, false);
++							allSrcBundles.add(info);
++						} catch (CoreException e) {
++							// continue
++						}
++					}
++				}
++			} catch (URISyntaxException e) {
++				// continue
++			}
++
+ 			BundleInfo srcBundles[] = getBundlesFromFile(srcBundlesTxt, home);
+-			if (srcBundles == null || srcBundles.length == 0) {
++			if (srcBundles != null && srcBundles.length > 0) {
++				allSrcBundles.addAll(Arrays.asList(srcBundles));
++			}
++			if (allSrcBundles.size() == 0) {
+ 				return null;
+ 			}
+-			return srcBundles;
++			return allSrcBundles.toArray(new BundleInfo[0]);
+ 		} catch (MalformedURLException e) {
+ 			PDECore.log(e);
+ 			return null;
+-- 
+2.7.4
+

eclipse-pdebuild-add-target.patch

@@ -1,300 +0,0 @@
-### Eclipse Workspace Patch 1.0
-#P org.eclipse.pde.build
---- /dev/null
-+++ eclipse.pde.build/org.eclipse.pde.build/templates/package-build/prepare-build-dir.sh
-@@ -0,0 +1,105 @@
-+#!/bin/sh
-+
-+if [ $# -lt 2 ]; then
-+  echo "usage: $0 <path to source dir> <path to build dir>"
-+  exit 1
-+fi
-+
-+if [ ! -d $1 ]; then
-+  echo "usage: $0 <path to source dir> <path to build dir>"
-+  exit 1
-+fi
-+
-+SOURCEDIR=$1
-+BUILDDIR=$2
-+TESTING=$3
-+
-+echo "preparing files in $1 for buildfile generation ..."
-+mkdir -p $BUILDDIR
-+
-+# make some ant build files to extract the id from the feature.xml, plugin.xml or the fragment.xml
-+mkdir -p $BUILDDIR/tmp
-+BUILDFILE=$BUILDDIR/tmp/build.xml
-+
-+echo "<project default=\"main\">
-+   <target name=\"main\">
-+                   <xmlproperty file=\"@type@.xml\" collapseAttributes=\"true\"/>
-+       <fail unless=\"@type@.id\" message=\"feature.id not set\"/>
-+                   <echo message=\"\${@type@.id}\" />
-+        </target>
-+</project>" > $BUILDFILE
-+
-+for type in feature plugin fragment; do
-+  CURBUILDFILE=$BUILDDIR/tmp/$type-build.xml
-+  cat $BUILDFILE | sed "s|@type@|$type|" > $CURBUILDFILE
-+done
-+
-+# make the directories eclipse is expecting
-+echo "  making the 'features' and 'plugins' directories"
-+mkdir -p $BUILDDIR/features $BUILDDIR/plugins
-+
-+# make symlinks for the features
-+FEATURES=$(find $SOURCEDIR -name feature.xml)
-+find $SOURCEDIR -name feature.xml | while read f; do
-+  PROJECTDIR=$(dirname "$f")
-+  inSDK=1
-+  inSDK=$(echo $PROJECTDIR | grep -c $BUILDDIR)
-+  if [ $inSDK = 0 ]; then
-+    PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
-+    ERROR=""
-+    if [ -z "$PROJECTNAME" ]; then
-+      echo "ERROR: could not determine the feature id for $PROJECTDIR"
-+      if [ $TESTING != true ]; then
-+        exit 1
-+      else
-+        ERROR="yes"
-+      fi
-+    fi
-+
-+    if [ "x$ERROR" != "xyes" ]; then
-+      if [ $TESTING != true ] || `echo "$PROJECTNAME" | grep "org.eclipse"`; then
-+        echo "  making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
-+        ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
-+      fi
-+    fi
-+  fi
-+done
-+
-+# make symlinks for plugins and fragments
-+PLUGINDIRS=$(find $SOURCEDIR -name plugin.xml -o -name fragment.xml -o -name MANIFEST.MF | sed "s/plugin.xml//g" | sed "s/fragment.xml//g" | sed "s/META-INF\/MANIFEST.MF//" | sort | uniq)
-+find $SOURCEDIR -name plugin.xml -o -name fragment.xml -o -name MANIFEST.MF | sed "s/plugin.xml//g" | sed "s/fragment.xml//g" | sed "s/META-INF\/MANIFEST.MF//" | sort | uniq | while read dir; do
-+  PROJECTNAME=""
-+  ERROR=""
-+  inSDK=1
-+  inSDK=$(echo $dir | grep -c $BUILDDIR)
-+  if [ $inSDK = 0 ]; then
-+    if [ -e "$dir/META-INF/MANIFEST.MF" ]; then
-+      PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
-+    elif [ -e "$dir/plugin.xml" ]; then
-+      PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/plugin-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
-+    elif [ -e "$dir/fragment.xml" ]; then
-+      PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/fragment-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
-+    fi
-+
-+    if [ -z "$PROJECTNAME"  ]; then
-+      echo "ERROR: could not determine the plugin or fragment id for $dir"
-+      if [ $TESTING != true ]; then
-+        exit 1
-+      else
-+        ERROR="yes"
-+      fi
-+    fi
-+
-+    if [ "x$ERROR" != "xyes" ]; then
-+      if [ $TESTING != true ] || `echo "$PROJECTNAME" | grep "org.eclipse"`; then
-+        echo "  making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
-+        ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
-+      fi
-+    fi;
-+
-+  fi
-+
-+done
-+
-+rm -rf $BUILDDIR/tmp
-+echo done
---- /dev/null
-+++ eclipse.pde.build/org.eclipse.pde.build/templates/package-build/customTargets-assemble-target.xml
-@@ -0,0 +1,15 @@
-+<project>
-+   <!-- ===================================================================== -->
-+   <!-- Targets to assemble the built elements for particular configurations  -->
-+   <!-- These generally call the generated assemble scripts (named in -->
-+   <!-- ${assembleScriptName}) but may also add pre and post processing -->
-+   <!-- Add one target for each root element and each configuration -->
-+   <!-- ===================================================================== -->
-+
-+   <target name="assemble.@id@">
-+       <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
-+   </target>
-+   <target name="assemble.@id@.@configs@">
-+       <ant antfile="${assembleScriptName}" dir="${buildDirectory}" />
-+   </target>
-+</project>
---- /dev/null
-+++ eclipse.pde.build/org.eclipse.pde.build/templates/package-build/customTargets.xml
-@@ -0,0 +1,154 @@
-+<project name="Build specific targets and properties" default="noDefault">
-+
-+   <fail unless="type" message="Please set the ${type} property to 'feature', 'plugin' or 'fragment'." />
-+   <fail unless="id" message="Please set the ${id} property to the feature, plugin or fragment id of the plugin you are building." />
-+   <fail unless="sourceDirectory" message="Please set the ${sourceDirectory} property to the directory that has the source plugins." />
-+
-+   <!-- we need to do this because you can't expand variables in target names -->
-+   <copy file="${builder}/customTargets-assemble-target.xml" tofile="${buildDirectory}/customTargets-${id}-assemble-target.xml" />
-+   <replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="@id@" value="${id}" />
-+   <replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="@configs@" value="${configs}" />
-+   <replace file="${buildDirectory}/customTargets-${id}-assemble-target.xml" token="," value="." />
-+   <import file="${buildDirectory}/customTargets-${id}-assemble-target.xml" />
-+
-+   <!-- ===================================================================== -->
-+   <!-- Run a given ${target} on all elements being built -->
-+   <!-- Add on <ant> task for each top level element being built. -->
-+   <!-- ===================================================================== -->
-+   <target name="allElements">
-+       <ant antfile="${genericTargets}" target="${target}">
-+           <property name="type" value="${type}" />
-+           <property name="id" value="${id}" />
-+       </ant>
-+   </target>
-+
-+
-+   <!-- ===================================================================== -->
-+   <!-- Check out map files from correct repository -->
-+   <!-- ===================================================================== -->
-+   <target name="getMapFiles">
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+
-+   <target name="clean" unless="noclean">
-+       <antcall target="allElements">
-+           <param name="target" value="cleanElement" />
-+       </antcall>
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do before setup -->
-+   <!-- ===================================================================== -->
-+   <target name="preSetup">
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do after setup but before starting the build proper -->
-+   <!-- ===================================================================== -->
-+   <target name="postSetup">
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do before fetching the build elements -->
-+   <!-- ===================================================================== -->
-+   <target name="preFetch">
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do after fetching the build elements -->
-+   <!-- ===================================================================== -->
-+   <target name="postFetch">
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do before generating the build scripts. -->
-+   <!-- ===================================================================== -->
-+   <target name="preGenerate">
-+       <!-- Eclipse expects the feature projects to be in the 'features' directory and
-+           plugin projects to be in the 'plugins' directory. The build infrastructure
-+       normally arranges the projects during the fetch stage. Since we aren't doing
-+       the fetch stage, we have to manually arrange the files -->
-+       <exec dir="${builder}" executable="/bin/bash" failOnError="true">
-+           <arg line="prepare-build-dir.sh ${sourceDirectory} ${buildDirectory} ${testing}" />
-+       </exec>
-+       <antcall target="symlinkDeps" />
-+   </target>
-+
-+   <target name="symlinkDeps" if="orbitDepsDir">
-+       <apply executable="ln" parallel="false" dir="${buildDirectory}/plugins" verbose="true">
-+           <arg line="-s" />
-+           <srcfile />
-+           <fileset dir="${orbitDepsDir}" includes="*.jar" />
-+       </apply>
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do after generating the build scripts. -->
-+   <!-- ===================================================================== -->
-+   <target name="postGenerate">
-+       <antcall target="clean" />
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do before running the build.xmls for the elements being built. -->
-+   <!-- ===================================================================== -->
-+   <target name="preProcess">
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do after running the build.xmls for the elements being built. -->
-+   <!-- ===================================================================== -->
-+   <target name="postProcess">
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do before running assemble. -->
-+   <!-- ===================================================================== -->
-+   <target name="preAssemble">
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do after  running assemble. -->
-+   <!-- ===================================================================== -->
-+   <target name="postAssemble">
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do before running package. -->
-+   <!-- ===================================================================== -->
-+   <target name="prePackage">
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do after  running package. -->
-+   <!-- ===================================================================== -->
-+   <target name="postPackage">
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do after the build is done. -->
-+   <!-- ===================================================================== -->
-+   <target name="postBuild">
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do to test the build results -->
-+   <!-- ===================================================================== -->
-+   <target name="test">
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Steps to do to publish the build results -->
-+   <!-- ===================================================================== -->
-+   <target name="publish">
-+   </target>
-+
-+   <!-- ===================================================================== -->
-+   <!-- Default target                                                        -->
-+   <!-- ===================================================================== -->
-+   <target name="noDefault">
-+       <echo message="You must specify a target when invoking this file" />
-+   </target>
-+
-+</project>
---- /dev/null
-+++ eclipse.pde.build/org.eclipse.pde.build/templates/package-build/build.properties
-@@ -0,0 +1,12 @@
-+buildDirectory=${sourceDirectory}/build
-+buildLabel=rpmBuild
-+archivePrefix=eclipse
-+skipFetch=true
-+javacFailOnError=true
-+collectingFolder=eclipse
-+archivesFormat=*,*,*-zip
-+zipargs=-y
-+javacDebugInfo=true
-+archiveName=${id}.zip
-+runPackager=false
-+baseLocation=@DATADIR@/eclipse

eclipse-policy-comparators.patch

@@ -1,30 +0,0 @@
---- eclipse.platform.team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DiffViewerComparator.java.orig	2014-03-27 10:48:13.547706443 +0000
-+++ eclipse.platform.team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DiffViewerComparator.java	2014-03-27 10:52:42.615751600 +0000
-@@ -49,7 +49,7 @@
- 
- 					return oldStart0 - oldStart1;
- 				}
--				return Policy.getComparator().compare(arg0, arg1);
-+				return Policy.getComparator().compare((String)arg0, (String)arg1);
- 			}
- 		};
- 	}
---- eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java.orig	2014-03-27 11:27:35.233213660 +0000
-+++ eclipse.platform.ui/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java	2014-03-27 12:19:30.696748271 +0000
-@@ -13,6 +13,7 @@
- import java.lang.reflect.InvocationTargetException;
- import java.net.URL;
- import java.util.ArrayList;
-+import java.util.Comparator;
- import java.util.Iterator;
- import java.util.Map;
- import java.util.TreeMap;
-@@ -235,7 +236,7 @@
- 		// show Help button in JFace dialogs
- 		TrayDialog.setDialogHelpAvailable(true);
- 
--		Policy.setComparator(Collator.getInstance());
-+		Policy.setComparator((Comparator)Collator.getInstance());
- 	}
- 
- 	/*

eclipse-remove-jgit-provider.patch

@@ -1,6 +1,6 @@
---- eclipse-platform-parent/pom.xml.orig	2014-05-26 17:04:22.000000000 +0300
-+++ eclipse-platform-parent/pom.xml	2014-05-26 18:57:29.044704226 +0300
-@@ -332,7 +332,7 @@
+--- eclipse-platform-parent/pom.xml.orig	2014-11-28 14:54:50.000000000 +0000
++++ eclipse-platform-parent/pom.xml	2014-11-28 15:32:51.700154985 +0000
+@@ -483,7 +483,7 @@
            <artifactId>tycho-packaging-plugin</artifactId>
            <version>${tycho.version}</version>
            <dependencies>
@@ -9,7 +9,7 @@
                <groupId>org.eclipse.tycho.extras</groupId>
                <artifactId>tycho-buildtimestamp-jgit</artifactId>
                <version>${tycho-extras.version}</version>
-@@ -341,19 +341,19 @@
+@@ -492,19 +492,19 @@
                <groupId>org.eclipse.tycho.extras</groupId>
                <artifactId>tycho-sourceref-jgit</artifactId>
                <version>${tycho-extras.version}</version>
@@ -18,13 +18,13 @@
            </dependencies>
            <configuration>
              <strictBinIncludes>false</strictBinIncludes>
-             <format>'v'yyyyMMdd-HHmm</format>
+             <format>${qualifier.format}</format>
 -            <timestampProvider>jgit</timestampProvider>
 +            <!--timestampProvider>jgit</timestampProvider-->
              <jgit.ignore>
                pom.xml
              </jgit.ignore>
-             <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree>
+             <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree-platformDefault}</jgit.dirtyWorkingTree>
 -            <sourceReferences>
 +            <!--sourceReferences>
                <generate>true</generate>

eclipse-remove-w3c-smil-and-use-geronimo.patch

@@ -1,52 +0,0 @@
---- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig	2014-03-26 11:00:57.935084582 +0000
-+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	2014-03-26 11:02:43.076109293 +0000
-@@ -123,20 +123,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.w3c.dom.smil"
--         download-size="0"
--         install-size="0"
--         version="1.0.0.qualifier"
--         unpack="false"/>
--
--   <plugin
--         id="org.w3c.dom.events"
--         download-size="0"
--         install-size="0"
--         version="3.0.0.qualifier"
--         unpack="false"/>
--
--   <plugin
-          id="javax.inject"
-          download-size="0"
-          install-size="0"
-@@ -144,7 +130,7 @@
-          unpack="false"/>
- 
-    <plugin
--         id="javax.annotation"
-+         id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
---- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.orig	2013-02-20 16:43:17.000000000 +0100
-+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml	2013-02-21 09:51:19.981788507 +0100
-@@ -61,7 +61,7 @@
-                   </requirement>
-                   <requirement>
-                     <type>eclipse-plugin</type>
--                    <id>javax.annotation</id>
-+                    <id>org.apache.geronimo.specs.geronimo-annotation_1.1_spec</id>
-                     <versionRange>0.0.0</versionRange>
-                   </requirement>
-                   <requirement>
-@@ -96,7 +96,7 @@
-                   </requirement>
-                   <requirement>
-                     <type>eclipse-plugin</type>
--                    <id>org.apache.jasper.glassfish</id>
-+                    <id>org.glassfish.web.javax.servlet.jsp</id>
-                     <versionRange>0.0.0</versionRange>
-                   </requirement>
-                   <requirement>

eclipse-remove-weaving.patch

@@ -1,50 +0,0 @@
---- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.orig	2014-03-26 11:39:33.756282231 +0000
-+++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml	2014-03-26 13:19:39.009594727 +0000
-@@ -349,12 +349,6 @@
-          version="0.0.0"/>
- 
-    <plugin
--         id="org.eclipse.releng.tests"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"/>
--
--   <plugin
-          id="org.eclipse.team.tests.cvs.core"
-          download-size="0"
-          install-size="0"
-@@ -391,21 +385,6 @@
-          install-size="0"
-          version="0.0.0"/>
- 
--<!-- org.aspectj.runtime is required for equinox.region tests. 
--     If they are ever moved/removed org.aspectj.runtime should 
--     be moved/removed to with them -->
--   <plugin
--         id="org.aspectj.runtime"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"/>
--
--   <plugin
--         id="org.eclipse.equinox.region.tests"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"/>
--
-    <plugin
-          id="org.eclipse.equinox.security.tests"
-          download-size="0"
-@@ -423,12 +402,6 @@
-          download-size="0"
-          install-size="0"
-          version="0.0.0"/>
--
--   <plugin
--         id="org.eclipse.equinox.p2.tests.discovery"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"/>
- 
-    <plugin
-          id="org.eclipse.equinox.p2.tests.ui"

eclipse-secondary-arches.patch

@@ -1,164 +1,13 @@
-diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
-index 6c567f8..969eafb 100644
---- a/eclipse-platform-parent/pom.xml
-+++ b/eclipse-platform-parent/pom.xml
-@@ -209,49 +209,19 @@
-               <arch>s390x</arch>
-             </environment>
-             <environment>
--              <os>win32</os>
--              <ws>win32</ws>
--              <arch>x86</arch>
--            </environment>
--            <environment>
--              <os>win32</os>
--              <ws>win32</ws>
--              <arch>x86_64</arch>
--            </environment>
--            <environment>
--              <os>macosx</os>
--              <ws>cocoa</ws>
--              <arch>x86</arch>
--            </environment>
--            <environment>
--              <os>macosx</os>
--              <ws>cocoa</ws>
--              <arch>x86_64</arch>
--            </environment>
--            <environment>
--              <os>solaris</os>
--              <ws>gtk</ws>
--              <arch>sparc</arch>
--            </environment>
--            <environment>
--              <os>solaris</os>
--              <ws>gtk</ws>
--              <arch>x86</arch>
--            </environment>
--            <environment>
--              <os>hpux</os>
-+              <os>linux</os>
-               <ws>gtk</ws>
--              <arch>ia64</arch>
-+              <arch>arm</arch>
-             </environment>
-             <environment>
--              <os>aix</os>
-+              <os>linux</os>
-               <ws>gtk</ws>
--              <arch>ppc</arch>
-+              <arch>ppc64le</arch>
-             </environment>
-             <environment>
--              <os>aix</os>
-+              <os>linux</os>
-               <ws>gtk</ws>
--              <arch>ppc64</arch>
-+              <arch>aarch64</arch>
-             </environment>
-           </environments>
-         </configuration>
---- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
-+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
-@@ -130,21 +130,6 @@
-               <ws>gtk</ws>
-               <arch>x86_64</arch>
-             </environment>
--            <environment>
--              <os>win32</os>
--              <ws>win32</ws>
--              <arch>x86</arch>
--            </environment>
--            <environment>
--              <os>win32</os>
--              <ws>win32</ws>
--              <arch>x86_64</arch>
--            </environment>
--            <environment>
--              <os>macosx</os>
--              <ws>cocoa</ws>
--              <arch>x86_64</arch>
--            </environment>
-           </environments>
-         </configuration>
-       </plugin>
-diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
-index 80a32e4..85de879 100644
---- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
-+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
-@@ -32,6 +32,12 @@ root.solaris.gtk.sparc.permissions.755=eclipse
- root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
- root.solaris.gtk.x86.permissions.755=eclipse
- 
-+root.linux.gtk.arm=target/resources/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm
-+root.linux.gtk.arm.permissions.755=eclipse 
-+root.linux.gtk.aarch64=target/resources/linux.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/aarch64
-+root.linux.gtk.aarch64.permissions.755=eclipse 
-+root.linux.gtk.ppc64le=rootfiles/linux.gtk.ppc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64le
-+root.linux.gtk.ppc64le.permissions.755=eclipse
- root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
- root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
- root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
-diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
-index 7dd0536..66d79ee 100644
---- a/eclipse.platform.swt.binaries/pom.xml
-+++ b/eclipse.platform.swt.binaries/pom.xml
-@@ -53,6 +53,9 @@
-     <module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
-     <module>bundles/org.eclipse.swt.gtk.linux.s390</module>
-     <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
-+    <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
-+    <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
-+    <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
-     <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
-     <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
-     <module>bundles/org.eclipse.swt.gtk.solaris.sparc</module>
-diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
-index b46cdc6..0fb36a5 100644
---- a/rt.equinox.framework/pom.xml
-+++ b/rt.equinox.framework/pom.xml
-@@ -55,6 +55,9 @@
-     <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
-     <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
-     <module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module>
-+    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
-+    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
-+    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
-     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc</module>
-     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
-     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390</module>
-diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
-index f5fb504..1187e84 100644
---- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
-+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
-@@ -425,6 +425,7 @@
- 				<equals arg1="${swt.arch}" arg2="ppc64"/>
- 				<equals arg1="${swt.arch}" arg2="ppc64le"/>
- 				<equals arg1="${swt.arch}" arg2="s390x"/>
-+				<equals arg1="${swt.arch}" arg2="aarch64"/>
- 			</or>
- 		</condition>
- 		<echo>Is64=${is64}</echo>
 diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
 index 7e1f520..734dd10 100644
 --- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
 +++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
-@@ -409,6 +409,36 @@
+@@ -418,6 +418,36 @@
           install-size="0"
           version="0.0.0"
           fragment="true"/>
 +         
 +   <plugin
-+         id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"
-+         os="linux"
-+         ws="gtk"
-+         arch="ppc64le"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         fragment="true"/>
-+         
-+   <plugin
 +         id="org.eclipse.equinox.launcher.gtk.linux.arm"
 +         os="linux"
 +         ws="gtk"
@@ -176,26 +25,38 @@ index 7e1f520..734dd10 100644
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
++         fragment="true"/>
++
++   <plugin
++         id="org.eclipse.equinox.launcher.gtk.linux.s390x"
++         os="linux"
++         ws="gtk"
++         arch="s390x"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
 +         fragment="true"/>
  
     <plugin
           id="org.eclipse.equinox.launcher.gtk.linux.x86"
-@@ -583,6 +613,39 @@
+@@ -496,6 +526,39 @@
+          download-size="0"
+          install-size="0"
           version="0.0.0"
-          fragment="true"
-          unpack="false"/>
-+         
++         fragment="true"
++         unpack="false"/>
++
 +   <plugin
-+         id="org.eclipse.swt.gtk.linux.ppc64le"
++         id="org.eclipse.swt.gtk.linux.s390x"
 +         os="linux"
 +         ws="gtk"
-+         arch="ppc64le"
++         arch="s390x"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
-+         
++
 +   <plugin
 +         id="org.eclipse.swt.gtk.linux.arm"
 +         os="linux"
@@ -215,243 +76,122 @@ index 7e1f520..734dd10 100644
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
+          fragment="true"
+          unpack="false"/>
  
-    <plugin
-          id="org.eclipse.swt.gtk.linux.ppc"
-diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
-index 29d3871..45526c8 100644
---- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
-+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
-@@ -104,6 +104,12 @@
- 				[ -d /bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"
- 				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
- 				;;
-+			"ppc64le")
-+				defaultOSArch="ppc64le"
-+				defaultJava=DEFAULT_JAVA_EXEC
-+				[ -d /bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"
-+				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
-+				;;
- 			"s390")
- 				defaultOSArch="s390"
- 				defaultJava=DEFAULT_JAVA_EXEC
-@@ -119,6 +125,16 @@
- 				defaultJava=DEFAULT_JAVA_EXEC
- 				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
- 				;;
-+			arm*)
-+				defaultOSArch="arm"
-+				defaultJava=DEFAULT_JAVA_EXEC
-+				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
-+				;;
-+			"aarch64")
-+				defaultOSArch="aarch64"
-+				defaultJava=DEFAULT_JAVA_EXEC
-+				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
-+				;;
- 			*)
- 				echo "*** Unknown MODEL <${MODEL}>"
- 				;;
-diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
-index fac13bf..e487001 100644
---- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
-+++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
-@@ -259,6 +259,129 @@
-         </plugins>
-       </build>
-     </profile>
+--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	2014-11-28 15:09:42.000000000 +0000
++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml	2014-11-28 16:52:00.315007846 +0000
+@@ -123,7 +123,11 @@
+                     <copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true">
+                       <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/">
+                         <include name="cocoa/macosx/x86_64/**/*"/>
++                        <include name="gtk/linux/arm/**/*"/>
++                        <include name="gtk/linux/aarch64/**/*"/>
++                        <include name="gtk/linux/ppc64/**/*"/>
+                         <include name="gtk/linux/ppc64le/**/*"/>
++                        <include name="gtk/linux/s390x/**/*"/>
+                         <include name="gtk/linux/x86/**/*"/>
+                         <include name="gtk/linux/x86_64/**/*"/>
+                         <include name="win32/win32/x86/**/*"/>
+--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	2015-01-30 14:44:03.436891441 +0000
++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties	2015-01-30 14:45:25.232480509 +0000
+@@ -34,3 +34,15 @@
+ 
+ root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
+ root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
 +
-+    <profile>
-+      <id>build-native-launchers-gtk.linux.ppc</id>
-+      <activation>
-+        <property>
-+          <name>native</name>
-+          <value>gtk.linux.ppc</value>
-+        </property>
-+      </activation>
-+      <build>
-+        <plugins>
-+          <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <executions>
-+              <execution>
-+                <id>compile-executable-natives</id>
-+                <phase>generate-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
-+                  </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+            </executions>
-+          </plugin>
-+        </plugins>
-+      </build>
-+    </profile>
++root.linux.gtk.arm=bin/gtk/linux/arm,gtk_root
++root.linux.gtk.arm.permissions.755=launcher
++
++root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root
++root.linux.gtk.aarch64.permissions.755=launcher
++
++root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
++root.linux.gtk.ppc64.permissions.755=launcher
++
++root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root
++root.linux.gtk.s390x.permissions.755=launcher
+--- a/eclipse.platform.swt.binaries/pom.xml	2017-04-05 01:57:59.142576722 +0100
++++ b/eclipse.platform.swt.binaries/pom.xml	2017-04-05 02:00:00.153247342 +0100
+@@ -54,7 +54,11 @@
+ 
+   <modules>
+     <module>bundles/org.eclipse.swt.cocoa.macosx.x86_64</module>
++    <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
++    <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
++    <module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
++    <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
+     <module>bundles/org.eclipse.swt.win32.win32.x86</module>
+--- a/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	2017-04-21 10:15:34.857977599 +0100
++++ b/eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf	2017-04-21 10:18:22.878025820 +0100
+@@ -34,3 +34,23 @@
+ requires.7.name = org.eclipse.swt.gtk.linux.ppc64le
+ requires.7.range = [$version$,$version$]
+ requires.7.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le)(!(org.eclipse.swt.buildtime=true)))
++
++requires.8.namespace = org.eclipse.equinox.p2.iu
++requires.8.name = org.eclipse.swt.gtk.linux.ppc64
++requires.8.range = [$version$,$version$]
++requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64)(!(org.eclipse.swt.buildtime=true)))
++
++requires.9.namespace = org.eclipse.equinox.p2.iu
++requires.9.name = org.eclipse.swt.gtk.linux.arm
++requires.9.range = [$version$,$version$]
++requires.9.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=arm)(!(org.eclipse.swt.buildtime=true)))
++
++requires.10.namespace = org.eclipse.equinox.p2.iu
++requires.10.name = org.eclipse.swt.gtk.linux.aarch64
++requires.10.range = [$version$,$version$]
++requires.10.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true)))
++
++requires.11.namespace = org.eclipse.equinox.p2.iu
++requires.11.name = org.eclipse.swt.gtk.linux.s390x
++requires.11.range = [$version$,$version$]
++requires.11.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=s390x)(!(org.eclipse.swt.buildtime=true)))
+--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	2017-04-19 13:31:15.000000000 +0100
++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh	2017-04-23 16:58:34.022207885 +0100
+@@ -106,7 +106,7 @@
+ 			"s390x")
+ 				defaultOSArch="s390x"
+ 				defaultJava=DEFAULT_JAVA_EXEC
+-				OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch"
++				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
+ 				;;
+ 			arm*)
+ 				defaultOSArch="arm"
+--- a/rt.equinox.framework/pom.xml	2017-04-26 22:19:15.548461372 +0100
++++ b/rt.equinox.framework/pom.xml	2017-04-26 22:20:41.348571492 +0100
+@@ -73,6 +73,30 @@
+ 	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
+       </modules>
+     </profile>
 +    <profile>
 +      <id>build-native-launchers-gtk.linux.ppc64</id>
 +      <activation>
-+        <property>
-+          <name>native</name>
-+          <value>gtk.linux.ppc64</value>
++	<property>
++	  <name>native</name>
++	  <value>gtk.linux.ppc64</value>
 +        </property>
 +      </activation>
-+      <build>
-+        <plugins>
-+          <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <executions>
-+              <execution>
-+                <id>compile-executable-natives</id>
-+                <phase>generate-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
-+                  </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+            </executions>
-+          </plugin>
-+        </plugins>
-+      </build>
-+    </profile>
-+
-+    <profile>
-+      <id>build-native-launchers-gtk.linux.arm</id>
-+      <activation>
-+        <property>
-+          <name>native</name>
-+          <value>gtk.linux.arm</value>
-+        </property>
-+      </activation>
-+      <build>
-+        <plugins>
-+          <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <executions>
-+              <execution>
-+                <id>compile-executable-natives</id>
-+                <phase>generate-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
-+                  </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+            </executions>
-+          </plugin>
-+        </plugins>
-+      </build>
++      <modules>
++	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
++      </modules>
 +    </profile>
 +    <profile>
-+      <id>build-native-launchers-gtk.linux.aarch64</id>
++      <id>build-native-launchers-gtk.linux.s390x</id>
 +      <activation>
-+        <property>
-+          <name>native</name>
-+          <value>gtk.linux.aarch64</value>
++	<property>
++	  <name>native</name>
++	  <value>gtk.linux.s390x</value>
 +        </property>
 +      </activation>
-+      <build>
-+        <plugins>
-+          <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <executions>
-+              <execution>
-+                <id>compile-executable-natives</id>
-+                <phase>generate-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse"/>
-+                  </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+            </executions>
-+          </plugin>
-+        </plugins>
-+      </build>
++      <modules>
++	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
++      </modules>
 +    </profile>
-+
-     <profile>
-       <id>build-native-launchers-win32.win32.x86_64</id>
-       <activation>
---- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml	2014-05-26 19:20:28.958177815 +0300
-+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml	2014-05-26 19:33:42.942025740 +0300
-@@ -30,6 +30,64 @@
-         <version>2.6</version>
-         <executions>
-           <execution>
-+            <id>copy-resources-gtk.linux.aarch64</id>
-+            <phase>validate</phase>
-+            <goals>
-+              <goal>copy-resources</goal>
-+            </goals>
-+            <configuration>
-+              <outputDirectory>${basedir}/target/resources/linux.gtk.aarch64</outputDirectory>
-+              <resources>
-+                <resource>
-+                  <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.aarch64</directory>
-+                  <includes>
-+                    <include>about_files/*</include>
-+                    <include>about.html</include>
-+                  </includes>
-+                </resource>
-+              </resources>
-+            </configuration>
-+          </execution>
-+        <execution>
-+            <id>copy-resources-gtk.linux.arm</id>
-+            <phase>validate</phase>
-+            <goals>
-+              <goal>copy-resources</goal>
-+            </goals>
-+            <configuration>
-+              <outputDirectory>${basedir}/target/resources/linux.gtk.arm</outputDirectory>
-+              <resources>
-+                <resource>
-+                  <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.arm</directory>
-+                  <includes>
-+                    <include>about_files/*</include>
-+                    <include>about.html</include>
-+                  </includes>
-+                </resource>
-+              </resources>
-+            </configuration>
-+          </execution>
-+          <execution>
-+            <id>copy-resources-gtk.linux.ppc64le</id>
-+            <phase>validate</phase>
-+            <goals>
-+              <goal>copy-resources</goal>
-+            </goals>
-+            <configuration>
-+              <outputDirectory>${basedir}/rootfiles/linux.gtk.ppc64le</outputDirectory>
-+              <resources>
-+                <resource>
-+                  <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.ppc64le
-+                  </directory>
-+                  <includes>
-+                    <include>about_files/*</include>
-+                    <include>about.html</include>
-+                  </includes>
-+              </resource>
-+            </resources>
-+          </configuration>
-+          </execution>
-+          <execution>
-             <id>copy-resources-gtk.linux.x86</id>
-             <phase>validate</phase>
-             <goals>
+   </profiles>
+ 
+   <modules>

eclipse-servlet-3.1.patch

@@ -1,43 +0,0 @@
---- eclipse.platform.ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ValidatorServlet.java.sav	2013-09-30 11:59:22.000000000 +0300
-+++ eclipse.platform.ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/servlet/ValidatorServlet.java	2014-01-06 15:09:36.251220892 +0200
-@@ -26,6 +26,7 @@ import java.util.Locale;
- import javax.servlet.ServletConfig;
- import javax.servlet.ServletException;
- import javax.servlet.ServletOutputStream;
-+import javax.servlet.WriteListener;
- import javax.servlet.http.HttpServlet;
- import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletResponse;
-@@ -270,5 +271,11 @@ public class ValidatorServlet extends Ht
- 		public void write(int b) throws IOException {
- 			out.write(b);
- 		}
-+		
-+		public boolean isReady() {
-+		    return true;
-+		}
-+		public void setWriteListener(WriteListener writeListener) {
-+		}
- 	}
- }
---- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.sav	2014-01-06 17:08:09.690171368 +0200
-+++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml	2014-01-06 17:09:02.193219753 +0200
-@@ -295,18 +295,6 @@
-          version="0.0.0"/>
- 
-    <plugin
--         id="org.eclipse.ua.tests"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"/>
--
--   <plugin
--         id="org.eclipse.ua.tests.doc"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"/>
--
--   <plugin
-          id="org.eclipse.ui.tests.navigator"
-          download-size="0"
-          install-size="0"

eclipse-support-symlink-bundles.patch

@@ -0,0 +1,159 @@
+From aabcf5acff194b807c4d0bcf68425c3452c90339 Mon Sep 17 00:00:00 2001
+From: Roland Grunberg <rgrunber@redhat.com>
+Date: Fri, 12 Sep 2014 10:27:14 -0400
+Subject: [PATCH] Add support for regenerating bundle versions for symlinks.
+
+When the version field in a bundle info file corresponds to a bundle
+whose location is a symbolic link, the correct version should be
+regenerated every time, in case a change has occured.
+
+Change-Id: Ifbe8efed2218a8a1250fd1ac59f0cdd6bdd5f309
+---
+ .../META-INF/MANIFEST.MF                           |   1 +
+ .../utils/SimpleConfiguratorUtils.java             | 106 ++++++++++++++++++++-
+ 2 files changed, 106 insertions(+), 1 deletion(-)
+
+diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
+index d88d0a6..07fe087 100644
+--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
++++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/META-INF/MANIFEST.MF
+@@ -9,6 +9,7 @@ Bundle-Activator: org.eclipse.equinox.internal.simpleconfigurator.Activator
+ Bundle-ActivationPolicy: lazy
+ Import-Package: org.eclipse.osgi.framework.console;version="1.0.0";resolution:=optional,
+  org.eclipse.osgi.service.datalocation;version="1.0.0";resolution:=optional,
++ org.eclipse.osgi.util;version="1.1.0",
+  org.osgi.framework;version="1.3.0",
+  org.osgi.framework.namespace;version="1.0.0",
+  org.osgi.framework.wiring;version="1.2.0",
+diff --git rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
+index ab69b88..d6bf121 100644
+--- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
++++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
+@@ -15,8 +15,12 @@ package org.eclipse.equinox.internal.simpleconfigurator.utils;
+ import java.net.*;
+ import java.nio.file.Files;
+ import java.util.*;
++import java.util.jar.JarFile;
++import java.util.zip.ZipEntry;
++import java.util.zip.ZipFile;
+ import org.eclipse.equinox.internal.simpleconfigurator.Activator;
+-import org.osgi.framework.Version;
++import org.eclipse.osgi.util.ManifestElement;
++import org.osgi.framework.*;
+ 
+ public class SimpleConfiguratorUtils {
+ 
+@@ -277,6 +281,16 @@ public class SimpleConfiguratorUtils {
+ 		String symbolicName = tok.nextToken().trim();
+ 		String version = tok.nextToken().trim();
+ 		URI location = parseLocation(tok.nextToken().trim());
++		if (base != null) {
++			URI absLoc = URIUtil.append(base, location.toString());
++			java.nio.file.Path absPath = java.nio.file.Paths.get(absLoc);
++			// Symbolic links may change outside Eclipse so regenerate proper bundle version.
++			if (Files.isSymbolicLink(absPath) && absPath.toFile().isFile()) {
++				// We can't depend on org.eclipse.equinox.internal.frameworkadmin.utils.Utils
++				Dictionary<String, String> manifest = getOSGiManifest(absLoc);
++				version = manifest.get(Constants.BUNDLE_VERSION);
++			}
++		}
+ 		int startLevel = Integer.parseInt(tok.nextToken().trim());
+ 		boolean markedAsStarted = Boolean.parseBoolean(tok.nextToken());
+ 		BundleInfo result = new BundleInfo(symbolicName, version, location, startLevel, markedAsStarted);
+@@ -400,4 +414,93 @@ public class SimpleConfiguratorUtils {
+ 		}
+ 		return regularTimestamp;
+ 	}
++
++	private static Dictionary<String, String> getOSGiManifest(URI location) {
++		if (location == null)
++			return null;
++		// if we have a file-based URL that doesn't end in ".jar" then...
++		if (FILE_SCHEME.equals(location.getScheme()))
++			return basicLoadManifest(URIUtil.toFile(location));
++
++		try {
++			URL url = new URL("jar:" + location.toString() + "!/"); //$NON-NLS-1$//$NON-NLS-2$
++			JarURLConnection jarConnection = (JarURLConnection) url.openConnection();
++			ZipFile jar = jarConnection.getJarFile();
++
++			try {
++				ZipEntry entry = jar.getEntry(JarFile.MANIFEST_NAME);
++				if (entry == null)
++					return null;
++
++				Map<String, String> manifest = ManifestElement.parseBundleManifest(jar.getInputStream(entry), null);
++				return manifestToProperties(manifest);
++			} catch (BundleException e) {
++				return null;
++			} finally {
++				jar.close();
++			}
++		} catch (IOException e) {
++			if (System.getProperty("osgi.debug") != null) { //$NON-NLS-1$
++				System.err.println("location=" + location); //$NON-NLS-1$
++				e.printStackTrace();
++			}
++		}
++		return null;
++	}
++
++	private static Dictionary<String, String> basicLoadManifest(File bundleLocation) {
++		InputStream manifestStream = null;
++		ZipFile jarFile = null;
++		try {
++			try {
++				// Handle a JAR'd bundle
++				if (bundleLocation.isFile()) {
++					jarFile = new ZipFile(bundleLocation, ZipFile.OPEN_READ);
++					ZipEntry manifestEntry = jarFile.getEntry(JarFile.MANIFEST_NAME);
++					if (manifestEntry != null) {
++						manifestStream = jarFile.getInputStream(manifestEntry);
++					}
++				} else {
++					// we have a directory-based bundle
++					File bundleManifestFile = new File(bundleLocation, JarFile.MANIFEST_NAME);
++					if (bundleManifestFile.exists())
++						manifestStream = new BufferedInputStream(new FileInputStream(new File(bundleLocation, JarFile.MANIFEST_NAME)));
++				}
++			} catch (IOException e) {
++				//ignore
++			}
++
++			try {
++				Map<String, String> manifest = ManifestElement.parseBundleManifest(manifestStream, null);
++				return manifestToProperties(manifest);
++			} catch (IOException ioe) {
++				return null;
++			} catch (BundleException e) {
++				return null;
++			}
++		} finally {
++			try {
++				if (manifestStream != null)
++					manifestStream.close();
++			} catch (IOException e1) {
++				//Ignore
++			}
++			try {
++				if (jarFile != null)
++					jarFile.close();
++			} catch (IOException e2) {
++				//Ignore
++			}
++		}
++	}
++
++	private static Dictionary<String, String> manifestToProperties(Map<String, String> d) {
++		Iterator<String> iter = d.keySet().iterator();
++		Dictionary<String, String> result = new Hashtable<String, String>();
++		while (iter.hasNext()) {
++			String key = iter.next();
++			result.put(key, d.get(key));
++		}
++		return result;
++	}
+ }
+-- 
+2.5.0
+

eclipse-swt-disable-gtk2.patch

@@ -0,0 +1,25 @@
+--- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml.orig
++++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml
+@@ -898,15 +898,19 @@
+ 			</not>
+ 		</condition>
+ 		<antcall target="init_build"/>
++		<antcall target="build_gtk2"/>
++		<antcall target="build_gtk3"/>
++		<delete dir="${build_dir}" quiet="true"/>
++		<antcall target="refresh_fragment"/>
++	</target>
++
++	<target name="build_gtk2"  depends="get_version" if="machine_gtk2">
+ 		<antcall target="${build_task}">
+ 			<param name="build_targets" value="${targets}"/>
+ 			<param name="build_machine" value="${machine}"/>
+ 			<param name="port" value="${port}"/>
+ 			<param name="keyfile" value="${keyfile}"/>
+ 		</antcall>
+-		<antcall target="build_gtk3"/>
+-		<delete dir="${build_dir}" quiet="true"/>
+-		<antcall target="refresh_fragment"/>
+ 	</target>
+ 
+ 	<target name="build_gtk3"  depends="get_version" if="machine_gtk3">

eclipse-test-support.patch

@@ -1,154 +1,183 @@
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig	2014-04-01 15:02:34.500445944 +0100
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml	2014-04-01 15:16:01.556714647 +0100
-@@ -200,99 +200,14 @@
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig	2017-04-19 12:47:51.000000000 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml	2017-04-19 20:15:38.781348810 +0100
+@@ -39,21 +39,6 @@
+         arg1="${testPlugin}"
+         arg2="org.eclipse.equinox.p2.tests.discovery" />
+     </condition>
+-    <condition
+-      property="extraIU"
+-      value="org.eclipse.osgi.compatibility.plugins.feature.feature.group">
+-      <or>
+-        <equals
+-          arg1="${testPlugin}"
+-          arg2="org.eclipse.osgi.tests" />
+-        <equals
+-          arg1="${testPlugin}"
+-          arg2="org.eclipse.pde.ui.tests" />
+-        <equals
+-          arg1="${testPlugin}"
+-          arg2="org.eclipse.pde.api.tools.tests" />
+-      </or>
+-    </condition>
  
-   <!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
-   <target name="setupPlatform">
--    <echo message="os.arch ${os.arch}" />
-     <loadproperties srcfile="equinoxp2tests.properties" />
--    <condition
--      property="platformArchive"
--      value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}">
--      <and>
--        <os family="unix" />
--        <not>
--          <or>
--            <or>
--              <os arch="x86_64" />
--              <os arch="amd64" />
--            </or>
--            <os family="mac" />
--          </or>
--        </not>
--      </and>
--    </condition>
--    <condition
--      property="platformArchive"
--      value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64}">
--      <and>
--        <os family="mac" />
--        <os family="unix" />
--        <or>
--          <os arch="x86_64" />
--          <os arch="amd64" />
--        </or>
--      </and>
--    </condition>
--    <condition
--      property="platformArchive"
--      value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx}">
--      <and>
--        <os family="mac" />
--        <os family="unix" />
--        <!-- should not need, as long as x86_64 rules (above) comes first
--             <os arch="i386" />
--        -->
--      </and>
--    </condition>
--    <condition
--      property="platformArchive"
--      value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}">
--      <and>
--        <os family="windows" />
--        <os arch="x86" />
--      </and>
--    </condition>
--    <condition
--      property="platformArchive"
--      value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64}">
--      <and>
--        <os family="windows" />
--        <or>
--          <os arch="x86_64" />
--          <os arch="amd64" />
--        </or>
--      </and>
--    </condition>
--    <condition
--      property="platformArchive"
--      value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64}">
--      <and>
--        <os family="unix" />
--        <or>
--          <os arch="x86_64" />
--          <os arch="amd64" />
--        </or>
--      </and>
-+    <property name="platformArchive" value="${runtimeArchive}" />
-+    <condition property="platformTarget" value="platform-zip">
-+      <contains string="${platformArchive}" substring=".zip" />
-     </condition>
+     <antcall target="setupRepo" />
+     <antcall target="${setupTarget}" />
+@@ -61,7 +46,7 @@
+     <antcall target="installPreferences">
+       <param
+         name="eclipse-home"
+-        value="${eclipse-home}/eclipse" />
++        value="${eclipse-home}" />
+     </antcall>
+     <antcall target="installExtraPlugins" />
+     <antcall target="installTestPlugins" />
+@@ -96,19 +81,6 @@
+     name="setupRepo"
+     depends="init"
+     unless="testRepoCreated">
+-    <mkdir dir="${repoLocation}" />
+-    <exec
+-      dir="${basedir}"
+-      executable="unzip"
+-      failonerror="false"
+-      resultproperty="unzipResultCode">
+-      <arg value="-o" />
+-      <arg value="-qq" />
+-      <arg value="${repoZip}" />
+-      <arg value="-d" />
+-      <arg value="${repoLocation}" />
+-    </exec>
+-    <echo message="unzip resultcode: ${unzipResultCode}" />
+     <!-- TODO: can do more checking here, if successful, before we set to value -->
+     <property
+       name="testRepoCreated"
+@@ -128,8 +100,9 @@
+       message="runtime archive (SDK) did not exist where expected. runtimeArchive: ${executionDir}/${runtimeArchive}" />
+     <echo message="Deleting existing ${eclipse-home}, if any." />
+     <delete
+-      dir="${eclipse-home}"
+-      verbose="false" />
++      removeNotFollowedSymlinks="true" failonerror="false" verbose="false">
++      <fileset dir="${eclipse-home}" followsymlinks="false" />
++    </delete>
+     <echo message="Fresh extract ${runtimeArchive} into ${install} for testing." />
+     <exec
+       dir="${install}"
+@@ -155,9 +128,9 @@
+       message="runtime archive (SDK) did not exist where expected. runtimeArchive: ${executionDir}/${runtimeArchive}" />
+     <echo message="Deleting existing ${eclipse-home}, if any." />
+     <delete
+-      dir="${eclipse-home}"
+-      verbose="false" />
 -
--    <fail
--      unless="platformArchive"
--      message="platformArchive is not defined. Check that conditions cover os arch ${os.arch}. May be VM dependent.)" />
++      removeNotFollowedSymlinks="true" failonerror="false" verbose="false">
++      <fileset dir="${eclipse-home}" followsymlinks="false" />
++    </delete>
+     <echo message="Fresh extract ${runtimeArchive} into ${install} for testing." />
+     <exec
+       dir="${install}"
+@@ -309,8 +282,9 @@
+       message="plaform archive did not exist where expected. platformArchive: ${platformLocation}/${platformArchive}" />
+     <!-- remove eclipse home directory, to be sure completely fresh -->
+     <delete
+-      verbose="false"
+-      dir="${platformLocation}/eclipse" />
++      removeNotFollowedSymlinks="true" failonerror="false" verbose="false">
++      <fileset dir="${platformLocation}/eclipse" followsymlinks="false" />
++    </delete>
+     <exec
+       dir="${platformLocation}"
+       executable="unzip">
+@@ -333,11 +307,10 @@
+     <fail
+       unless="platformArchiveExists"
+       message="plaform archive did not exist where expected. platformArchive: ${platformLocation}/${platformArchive}" />
 -
--    <condition
--      property="platformTarget"
--      value="platform-zip">
--      <contains
--        string="${platformArchive}"
--        substring=".zip" />
--    </condition>
--    <condition
--      property="platformTarget"
--      value="platform-tar.gz">
--      <contains
--        string="${platformArchive}"
--        substring=".tar.gz" />
-+    <condition property="platformTarget" value="platform-tar.gz">
-+      <contains string="${platformArchive}" substring=".tar.gz" />
-     </condition>
--    <fail
--      unless="platformTarget"
--      message="platformTarget is not defined. Check that platformArchive variable and value is defined correctly, such as in equinoxp2tests.properties in the appropriate testConfig" />
-     <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
-     <antcall target="${platformTarget}" />
-   </target>
-@@ -320,7 +235,7 @@
+-
+     <delete
+-      verbose="false"
+-      dir="${platformLocation}/eclipse" />
++      removeNotFollowedSymlinks="true" failonerror="false" verbose="false">
++      <fileset dir="${platformLocation}/eclipse" followsymlinks="false" />
++    </delete>
      <exec
        dir="${platformLocation}"
        executable="tar">
--      <arg line="-xzf ${platformArchive}" />
-+      <arg line="-xzf ../${platformArchive}" />
-     </exec>
+@@ -561,7 +534,7 @@
+     unless="currentUpdateSite">
+     <property
+       name="currentUpdateSite"
+-      value="http://${DOWNLOAD_HOST}/eclipse/updates/${updateSiteSegment}-${buildType}-builds/${buildId}" />
++      value="file:${repoLocation}" />
+   </target>
+   <target
+     name="initStreamSpecificProperties"
+@@ -808,7 +781,7 @@
+ 
+   <target
+     name="init"
+-    depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initCurrentUpdateSite, initBasicDirectories,initOSes, initPlatformArhiveName, setRuntimeArchive"
++    depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initBasicDirectories, initCurrentUpdateSite, initOSes, initPlatformArhiveName, setRuntimeArchive"
+     unless="testingIsInitialized">
+ 
+     <property environment="env" />
+@@ -823,7 +796,7 @@
+ 
+     <property
+       name="current.build.repo"
+-      value="http://${DOWNLOAD_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}" />
++      value="file:${repoLocation}" />
+     <echo message="current.build.repo: ${current.build.repo}" />
+ 
+ 
+@@ -1887,6 +1860,7 @@
+     -->
+     <antcall target="quickTests" />
+     <antcall target="longRunningTests" />
++    <antcall target="mergeAllTestResults" />
+ 
    </target>
  
-@@ -867,6 +782,17 @@
-           arg2="" />
-       </not>
-     </condition>
-+
-+    <!-- swt needs this property to run tests -->
-+    <dirset id="test.plugin.folder" dir="${eclipse-home}/plugins/">
-+      <include name="${testPlugin}_*" />
-+    </dirset>
-+    <property name="testPluginFolder" refid="test.plugin.folder" />
-+    <echo>trying to find ${testPluginFolder}</echo>
-+    <condition property="org.eclipse.swt.tests" value="${testPluginFolder}">
-+      <equals arg1="${testPlugin}" arg2="org.eclipse.swt.tests"/>
-+    </condition>
-+
-     <antcall target="runSuite" />
-     <antcall target="genResults" />
+@@ -1948,6 +1922,8 @@
+     <antcall target="jdttext" />
+     <antcall target="jdtuirefactoring" />
    </target>
-@@ -1411,6 +1337,15 @@
-         value="end longRunningTests" />
-     </antcall>
++  <target name="distroCustomTests" depends="init">
++  </target>
+   <target
+     name="quickTests"
+     depends="init">
+@@ -2057,6 +2033,20 @@
  
-+    <!-- Copy over the XML to generate a top-level report for all of the tests -->
-+    <mkdir dir="${results}/origXml" />
-+    <xslt style="${repoLocation}/splitter.xsl" basedir="${results}/xml" includes="*.xml" destdir="${results}/origXml"/>
+   </target>
+ 
++  <target
++    name="mergeAllTestResults"
++    depends="init">
++    <!-- Split XML into individual test suites for generating an aggregate report -->
++    <mkdir dir="${results}/split-xml" />
++    <xslt style="${executionDir}/splitter.xsl" basedir="${results}/xml" includes="*.xml" destdir="${results}/split-xml"/>
 +    <!-- Aggregate XML report files -->
 +    <junitreport todir="${results}/xml" tofile="org.eclipse.sdk.tests.xml">
-+      <fileset dir="${results}/origXml" includes="*.xml" />
++      <fileset dir="${results}/split-xml" includes="*.xml" />
 +    </junitreport>
 +    <!-- Generate top-level HTML report -->
-+    <xslt style="${repoLocation}/JUNIT.XSL" basedir="${results}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${results}/html" />
-   </target>
- 
++    <xslt style="${executionDir}/JUNIT.XSL" basedir="${results}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${results}/html" />
++  </target>
++
    <!--
-@@ -1453,7 +1388,6 @@
+     admittedly, not quite all of 'platform', but for
+     now serves dual purpose of a "short set" of tests, that area
+@@ -2065,8 +2055,6 @@
+   <target
+     name="platform"
+     depends="init">
+-    <!-- was removed, temporarily, see bug 400385 -->
+-    <antcall target="relEng" />
+ 
+     <antcall target="ant" />
+     <antcall target="antui" />
+@@ -2099,7 +2087,6 @@
      <antcall target="e4CssSwt" />
      <antcall target="e4UI" />
      <antcall target="equinoxds" />
@@ -156,7 +185,7 @@
      <antcall target="bidi" />
      <antcall target="ltkuirefactoringtests" />
      <antcall target="ltkcorerefactoringtests" />
-@@ -1467,7 +1401,6 @@
+@@ -2115,7 +2102,6 @@
      <antcall target="osgi" />
      <antcall target="coreresources" />
      <antcall target="equinoxp2" />
@@ -164,40 +193,30 @@
      <antcall target="jface" />
      <antcall target="ui" />
      <antcall target="uiperformance" />
-@@ -1550,7 +1483,7 @@
-     <property
-       name="message"
-       value="no message given by caller" />
--    <markTime msg="${message}" />
-+    <!--markTime msg="${message}" /-->
-   </target>
- 
-   <!--
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.orig	2014-05-26 17:04:22.000000000 +0300
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh	2014-05-26 19:17:46.622004452 +0300
-@@ -1,5 +1,72 @@
- #!/usr/bin/env bash
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.orig	2017-03-03 12:36:38.576140783 +0000
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh	2017-03-03 12:40:39.324608342 +0000
+@@ -6,6 +6,45 @@
+ # version. 
+ # https://bugs.eclipse.org/bugs/show_bug.cgi?id=437069
  
 +function findXvncAndSetDisplay() {
-+#   if [ ${headless} == 1 ]; then
-+        # Try to find Xvnc
-+        xvnc=
-+        if [ -a /usr/bin/Xvnc ]
++    # Try to find Xvnc
++    xvnc=
++    if [ -a /usr/bin/Xvnc ]
++    then
++        xvnc=/usr/bin/Xvnc
++        setupXvnc
++    else
++        if [ -a /usr/X11/bin/Xvnc ]
 +        then
-+            xvnc=/usr/bin/Xvnc
++            xvnc=/usr/X11/bin/Xvnc
 +            setupXvnc
 +        else
-+            if [ -a /usr/X11/bin/Xvnc ]
-+            then
-+                xvnc=/usr/X11/bin/Xvnc
-+                setupXvnc
-+            else
-+                echo "Couldn't find Xvnc (/usr/bin/Xvnc or /usr/X11/bin/Xvnc).  Using DISPLAY=0:0"
-+                DISPLAY=`$HOST`:0.0
-+            fi
++            echo "Couldn't find Xvnc (/usr/bin/Xvnc or /usr/X11/bin/Xvnc).  Using DISPLAY=0:0"
++            DISPLAY=$($HOST):0.0
 +        fi
-+        export DISPLAY
-+#   fi
++    fi
++    export DISPLAY
 +}
 +
 +function setupXvnc() {
@@ -207,33 +226,7 @@
 +    echo "Setting up Xvnc on port ${port} with password VNCpassword1"
 +    $xvnc :$port -screen 1 1024x768x32 -auth Xvnc.cfg -localhost -PasswordFile eclipse-tests-vncpwd &> Xvnc.log &
 +    Xvncpid=$!
-+    DISPLAY=`$HOST`:$port
-+}
-+
-+function setArch() {
-+    if [ "x$buildArch" = "x" ]
-+    then
-+        if uname -m > /dev/null 2>&1; then
-+            arch=`uname -m`
-+        else
-+            arch=`uname -p`
-+        fi
-+        # Massage arch for Eclipse-uname differences
-+        case $arch in
-+            i[0-9]*86)
-+                arch=x86 ;;
-+            ia64)
-+                arch=ia64 ;;
-+            ppc)
-+                arch=ppc ;;
-+            x86_64)
-+                arch=x86_64 ;;
-+            *)
-+                echo "Unrecognized architecture:  $arch" 1>&2
-+                exit 1 ;;
-+        esac
-+        echo >&2 "Architecture not specified.  Assuming host architecture: $arch"
-+    fi
++    DISPLAY=$($HOST):$port
 +}
 +
 +function cleanupXvnc() {
@@ -245,87 +238,83 @@
 +    fi
 +}
 +
- # This file should never exist or be needed for production machine,
- # but allows an easy way for a "local user" to provide this file
- # somewhere on the search path ($HOME/bin is common),
-@@ -92,59 +159,31 @@ fi
- #necessary when invoking this script through rsh
- cd $dir
+ echo "command line as passed into $(basename ${0}): ${*}"
+ echo "command line (quoted) as passed into $(basename ${0}): ${@}"
  
-+    mkdir -p /tmp/eclipse-tests-directory
-+    pushd /tmp/eclipse-tests-directory
-+    rm -rf *
-+    cp ${testslocation}/*.properties .
-+    cp ${testslocation}/library.xml .
-+
- if [ ! -r eclipse ]
- then
--  tar -xzf eclipse-SDK-*.tar.gz
--  # note, the file pattern to match, must not start with */plugins because there is no leading '/' in the zip file, since they are repos.
--  unzip -qq -o -C eclipse-junit-tests-*.zip plugins/org.eclipse.test* -d eclipse/dropins/
-+  pushd @libdir@
-+    tar czf /tmp/eclipse-tests-directory/eclipse-SDK-temp-linux-gtk-x86_64.tar.gz eclipse
-+  popd
-+  cp -rf @libdir@/eclipse eclipse
+@@ -166,6 +205,8 @@
+ if [[ "true" == "${START_WINDOW_MGT}" ]]
+ then 
+  ./startWindowManager.sh
++else
++ findXvncAndSetDisplay
  fi
  
- # run tests
- launcher=`ls eclipse/plugins/org.eclipse.equinox.launcher_*.jar`
-+findXvncAndSetDisplay
-+setArch
-+export ANT_HOME=@USR@/share/ant
-+@USR@/bin/./ant \
-+-file "${testslocation}/test.xml" $tests \
-+-Dws=$ws -Dos=$os -Darch=$arch -Dos.arch=$arch \
-+-DbuildId=v20120903-1347 -Dbasedir="/tmp/eclipse-tests-directory" \
-+-DruntimeArchive="eclipse-SDK-temp-linux-gtk-x86_64.tar.gz" \
-+-DrepoLocation="${testslocation}" \
-+-Dorg.eclipse.test="3.3.100" \
-+-D$installmode=true $properties
+ # During production tests, we define 'testedPlatform' as a combination of
+@@ -199,6 +240,7 @@
+ echo "platformString: ${platformString}"
+ echo "testedPlatform: ${testedPlatform}"
+ 
++ANT_OPTS="${ANT_OPTS} -DtestedPlatform=${testedPlatform}"
+ # -Dtimeout=300000 "${ANT_OPTS}"
+ if [[ -n "${extdirproperty}" ]]
+ then
+@@ -209,4 +251,4 @@
+   $jvm ${ANT_OPTS} ${platformArgString}  -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml  ${ANT_OPTS} ${platformParmString} -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger  $tests 2>&1 | tee $consolelogs
+ fi
  
--echo " = = = Start list environment variables in effect = = = ="
--env
--echo " = = = End list environment variables in effect = = = ="
 -
--# make sure there is a window manager running. See bug 379026
--# we should not have to, but may be a quirk/bug of hudson setup
--# assuming metacity attaches to "current" display by default (which should have
--# already been set by Hudson). We echo its value here just for extra reference/cross-checks.
--
--echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz|kwin):"
--wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin" | grep -v egrep)
--echo "Window Manager processes: $wmpss"
--echo
--
--if [[ -z $wmpss ]]
--then
--  echo "No window managers processes found running, so will start metacity"
--  metacity --replace --sm-disable  &
--  METACITYPID=$!
--  echo $METACITYPID > epmetacity.pid
--else
--  echo "Existing window manager found running, so did not force start of metacity"
--fi
--
--echo
--
--# list out metacity processes so overtime we can see if they accumulate, or if killed automatically
--# when our process exits. If not automatic, should use epmetacity.pid to kill it when we are done.
--echo "Current metacity processes running (check for accumulation):"
--ps -ef | grep "metacity" | grep -v grep
--echo
--
--echo "Triple check if any window managers are running (at least metacity should be!):"
--wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep)
--echo "Window Manager processes: $wmpss"
--echo
--echo "extdirprop in runtest: ${extdirprop}"
--echo "extdirproperty in runtest: ${extdirproperty}"
--
--# -Dtimeout=300000 "${ANT_OPTS}"
--if [[ ! -z "${extdirproperty}" ]]
--then
--  $vmcmd "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
--else
--  $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch  -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
--fi
++cleanupXvnc
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml.orig	2017-04-19 19:39:39.382960089 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml	2017-04-19 20:04:36.088575077 +0100
+@@ -137,6 +137,15 @@
+         <property
+             name="formatter"
+             value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
++        <!-- default product/application to launch -->
++        <condition property="testproduct.if.available" value="-product ${testProduct}">
++            <isset property="testProduct" />
++        </condition>
++        <property name="testproduct.if.available" value="" />
++        <condition property="testapplication.if.available" value="-testApplication ${testApplication}">
++            <isset property="testApplication" />
++        </condition>
++        <property name="testapplication.if.available" value="" />
+ 
+         <tstamp prefix="NOW" />
+         <property
+@@ -196,6 +205,17 @@
+     </target>
+ 
+     <target
++        name="swtbot-test"
++        description="Eclipse application used to launch SWTBOT plugin tests."
++        depends="init">
++        <antcall target="${launchTarget}">
++            <param
++                name="application"
++                value="org.eclipse.swtbot.eclipse.junit.headless.swtbottestapplication" />
++        </antcall>
++    </target>
++
++    <target
+         name="java-test"
+         depends="init">
+         <echo
+@@ -258,7 +278,7 @@
+                     <include name="org.eclipse.equinox.launcher_*.jar" />
+                 </fileset>
+             </classpath>
+-            <arg line="-application ${application}" />
++            <arg line="-application ${application} ${testproduct.if.available} ${testapplication.if.available}" />
+             <arg line="-data ${data-dir}" />
+             <arg line="formatter=${formatter},${test-output}" />
+             <arg line="-testPluginName ${plugin-name}" />
+@@ -329,7 +349,7 @@
+             output="${junit-report-output}/${classname}.txt">
+             <arg line="-data ${data-dir}" />
+             <arg line="${test-vm}" />
+-            <arg line="-application ${application}" />
++            <arg line="-application ${application} ${testproduct.if.available} ${testapplication.if.available}" />
+             <arg line="formatter=${formatter},${test-output}" />
+             <arg line="-testPluginName ${plugin-name}" />
+             <arg line="-className ${classname}" />

fix_ant_build.patch

@@ -0,0 +1,161 @@
+--- eclipse.platform/ant/org.eclipse.ant.launching/build.properties.orig	2017-01-09 10:24:16.258243377 +0000
++++ eclipse.platform/ant/org.eclipse.ant.launching/build.properties	2017-01-09 10:25:08.302620557 +0000
+@@ -20,18 +20,14 @@
+                about.html
+ 
+ jars.compile.order = .,\
+-				lib/loggers.jar
+-# antdebug.jar and remote.jar are compiled locally using 1.6, see bug 495617:
+-#				     lib/antdebug.jar,\
+-#                     lib/remote.jar
++				     lib/antdebug.jar,\
++                     lib/loggers.jar,\
++                     lib/remote.jar
+ source.lib/loggers.jar = loggers/
+ output.lib/loggers.jar = loggers_bin/
+-extra.lib/loggers.jar = lib/antdebug.jar
+-#source.lib/antdebug.jar = common/
+-#output.lib/antdebug.jar = common_bin/
+-#source.lib/remote.jar = remote/
+-#output.lib/remote.jar = remote_bin/
+-src.includes = about.html,\
+-               remote/,\
+-               common/
++source.lib/antdebug.jar = common/
++output.lib/antdebug.jar = common_bin/
++source.lib/remote.jar = remote/
++output.lib/remote.jar = remote_bin/
++src.includes = about.html
+ javacWarnings..=-unavoidableGenericProblems
+--- eclipse.platform/ant/org.eclipse.ant.ui/build.properties.orig	2017-04-03 18:40:41.033489412 +0100
++++ eclipse.platform/ant/org.eclipse.ant.ui/build.properties	2017-04-03 18:43:21.614928391 +0100
+@@ -14,8 +14,8 @@
+ source.lib/antrunner.jar = Ant Runner Support/
+ output.lib/antrunner.jar = ant_runner_support_bin/
+ # Compiled with 1.6 locally, see bug 495617:
+-#source.lib/remoteAnt.jar = Remote Ant Support/
+-#output.lib/remoteAnt.jar = remote_support_bin/
++source.lib/remoteAnt.jar = Remote Ant Support/
++output.lib/remoteAnt.jar = remote_support_bin/
+ src.includes = about.html,\
+                about_files/,\
+                Remote Ant Support/
+@@ -31,6 +31,5 @@
+                lib/antrunner.jar,\
+                lib/remoteAnt.jar,\
+                css/
+-jars.compile.order=.,lib/antrunner.jar
+-# ,lib/remoteAnt.jar
++jars.compile.order=.,lib/antrunner.jar,lib/remoteAnt.jar
+ javacWarnings..=-unavoidableGenericProblems
+--- eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.xml.orig	2017-01-09 13:30:24.238066571 +0000
++++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/build.xml	2017-01-09 13:31:19.228456113 +0000
+@@ -1,106 +1,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<project name="org.eclipse.jdt.doc.user" default="build.jars" basedir=".">
++<project name="org.eclipse.jdt.doc.user" default="build.index" basedir=".">
+ 
+-	<property name="version.suffix" value="3.3.0" />
+-	<property name="full.name" value="org.eclipse.jdt.doc.user_${version.suffix}" />
+-	<property name="bootclasspath" value="" />
+-	<property name="basews" value="${ws}" />
+-	<property name="baseos" value="${os}" />
+-	<property name="basearch" value="${arch}" />
+-	<property name="basenl" value="${nl}" />
+-	<property name="javacFailOnError" value="false" />
+-	<property name="javacDebugInfo" value="on" />
+-	<property name="javacVerbose" value="true" />
+-	<property name="javacSource" value="1.3" />
+-	<property name="javacTarget" value="1.1" />
+-
+-	<target name="init" depends="properties">
+-		<property name="temp.folder" value="${basedir}/temp.folder" />
+-		<property name="plugin.destination" value="${basedir}" />
+-		<property name="build.result.folder" value="${basedir}" />
+-		<available file="${basedir}/doc.zip" property="doc.zip.present" />
+-		<condition property="p2.publish.parts" value="true">
+-			<istrue value="${p2.gathering}" />
+-		</condition>
+-	</target>
+-
+-	<target name="properties" if="eclipse.running">
+-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
+-	</target>
+-
+-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.jdt.doc.user for an update site.">
+-		<delete dir="${temp.folder}" />
+-		<mkdir dir="${temp.folder}" />
+-		<antcall target="build.jars" />
+-		<antcall target="gather.bin.parts">
+-			<param name="destination.temp.folder" value="${temp.folder}/" />
+-		</antcall>
+-		<zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false" whenempty="skip" />
+-		<delete dir="${temp.folder}" />
+-	</target>
+-
+-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts">
+-		<antcall target="gather.bin.parts">
+-			<param name="destination.temp.folder" value="${build.result.folder}" />
+-		</antcall>
+-		<eclipse.gatherBundle metadataRepository="${p2.build.repo}" artifactRepository="${p2.build.repo}" buildResultFolder="${build.result.folder}" targetFolder="${build.result.folder}/${full.name}" />
+-	</target>
+-
+-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+-		<antcall target="build.index" />
+-		<mkdir dir="${destination.temp.folder}/${full.name}" />
+-		<copy todir="${destination.temp.folder}/${full.name}">
+-			<fileset dir="${basedir}" includes="*.properties,*.xml,*.zip,*.html,*.htm,*.png,*.css,META-INF/**,index/**,concepts/**, gettingStarted/**, images/**, reference/**, tasks/**, tips/**, whatsNew/**" excludes="build.properties,build.xml" />
+-		</copy>
+-		<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}" />
+-	</target>
+-
+-	<target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.jdt.doc.user.">
+-	</target>
+-
+-	<target name="build.index" depends="init" description="Builds search index for the plug-in: org.eclipse.jdt.doc.user." if="eclipse.running">
++	<target name="build.index" description="Builds search index for the plug-in: org.eclipse.jdt.doc.user." if="eclipse.running">
+ 		<help.buildHelpIndex manifest="plugin.xml" destination="." />
+ 	</target>
+ 
+-	<target name="build.sources" depends="init">
+-	</target>
+-
+-	<target name="build.zips" depends="init">
+-	</target>
+-
+-	<target name="gather.sources" depends="init" if="destination.temp.folder">
+-	</target>
+-
+-	<target name="gather.logs" depends="init" if="destination.temp.folder">
+-	</target>
+-
+-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.jdt.doc.user of all the zips, jars and logs created.">
+-		<delete file="${plugin.destination}/${full.name}.jar" />
+-		<delete file="${plugin.destination}/${full.name}.zip" />
+-		<delete dir="${temp.folder}" />
+-	</target>
+-
+-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
+-		<eclipse.convertPath fileSystemPath="D:/30workspace/org.eclipse.jdt.doc.user/" property="resourcePath" />
+-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite" />
+-	</target>
+-
+-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.jdt.doc.user." if="eclipse.running">
+-		<delete dir="${temp.folder}" />
+-		<mkdir dir="${temp.folder}" />
+-		<antcall target="build.jars" />
+-		<antcall target="build.sources" />
+-		<antcall target="gather.bin.parts">
+-			<param name="destination.temp.folder" value="${temp.folder}/" />
+-		</antcall>
+-		<antcall target="gather.sources">
+-			<param name="destination.temp.folder" value="${temp.folder}/" />
+-		</antcall>
+-		<delete>
+-			<fileset dir="${temp.folder}" includes="**/*.bin.log" />
+-		</delete>
+-		<zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" />
+-		<delete dir="${temp.folder}" />
+-	</target>
+-
+ </project>

get-eclipse.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-set -e
-AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
-TAG=R4_4
-
-rm -rf R4_platform-aggregator-$TAG
-rm -rf R4_platform-aggregator-$TAG.tar.xz
-
-# adding --depth 1 here may result in a quicker clone, but did not work for me
-git clone --branch $TAG  $AGGREGATOR_PATH R4_platform-aggregator-$TAG
-
-
-pushd R4_platform-aggregator-$TAG
-
-git submodule init
-git submodule update
-
-
-# Comment this line to get a shallow clone.
-find . -type d -name ".git" | xargs rm -rf
-
-# Delete pre-built binary artifacts
-# Note: osgi.annotation.jar contains the source for annotations used only at build-time
-#       we don't actually ship it or it's contents with the platform
-find . -type f -name *.jar ! -name osgi.annotation.jar -delete
-find . -type f -name *.class -delete
-find . -type f -name *.so -delete
-find . -type f -name *.dll -delete
-find . -type f -name *.jnilib -delete
-find . -type f -name eclipse -delete
-
-popd 
-
-tar cJf R4_platform-aggregator-$TAG.tar.xz R4_platform-aggregator-$TAG

prefer_x11_backend.patch

@@ -0,0 +1,14 @@
+--- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c.orig	2018-08-22 15:19:04.602623018 +0100
++++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/eclipseGtkInit.c	2018-08-22 15:20:03.453348722 +0100
+@@ -111,6 +111,11 @@
+ #define DLFLAGS RTLD_LAZY
+ #endif
+ 
++	char *gdkBackend = getenv("GDK_BACKEND");
++	if (gdkBackend == NULL) {
++		setenv("GDK_BACKEND", "x11", 0);
++	}
++
+ 	void *gioLib = NULL, *glibLib = NULL, *gdkLib = NULL, *gtkLib = NULL, *objLib = NULL, *pixLib = NULL;
+ 	
+ 	char *gtk3 = getenv("SWT_GTK3");

sources

@@ -1,2 +1,2 @@
-d1e37d9af6848edbdd54d5988c77fa58  R4_platform-aggregator-R4_4.tar.xz
-b5c946f8de3fb487cf9f385a0ae707e2  org.eclipse.linuxtools.eclipse-build-db6b9cd54787feb7cf7c7a28c80e740340213bd3.tar.bz2
+SHA512 (eclipse-platform-sources-I20180822-0800.tar.xz) = c1158fa81c21a1fe9d09fd814062e55623b4ceca34be9b44c50f917f14bab8643e29ec6d20879c01b107fb93e68de4af553edea0fb606add870230d0498a03ef
+SHA512 (org.eclipse.linuxtools.eclipse-build-23577466b35eaf62bee3b00090f4fbedc555b4e6.tar.xz) = d268ea945c33b997c79b390f9592c1139f52dc39ebdb7ea7155d41301459827f576389e20080462ad22f2aef833857626df983bbb2abe30845e79ca74a194bea