Update to latest I-build

Full non-bootstrap build

.gitignore

@@ -1,27 +1,14 @@
-eclipse-*-src.tar.bz2
-eclipse-build-*
 *.rpm
-eclipse-build-db208c33d1a67591d17b02148ae7948fd178a80d.tar.xz
-eclipse-build-eb76edf3fb5bbeb115c59d1b076f4821a6d47d74.tar.xz
-eclipse-3.8.0-M4c-src.tar.bz2
-eclipse-build-c7f168527c3ed0495e614dd21244285a57ca6e5c.tar.xz
-eclipse-build-90f6aec69b933e8e96d5e740b0151d3645a12529.tar.xz
-eclipse-3.8.0-M5-src.tar.bz2
-eclipse-build-0316c8034d15e2c083090fa759677166a76c8755.tar.xz
-eclipse-3.8.0-I20120207-0800-src.tar.bz2
-eclipse-build-34f1eef37f75faf19c8951c8351483e7a98467e9.tar.xz
-eclipse-build-f58835e3e02b0416d746bc17299acd628a72e506.tar.xz
-eclipse-3.8.0-I20120306-0800-src.tar.bz2
-eclipse-build-85830ed757416af1ca59aa1c43dce00791d12241.tar.xz
-eclipse-3.8.0-I20120314-1800-src.tar.bz2
-eclipse-build-2c0f2ac34e3aee110187aa1dea28430bec724bdb.tar.xz
-eclipse-4.2.0-I20120405-1114-src.tar.bz2
-eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz
-/.project
-eclipse-build-6df9efbd645d64284c969e9775d51be63fec7627.tar.xz
-eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz
-/R4_platform-aggregator
-/eclipse-source.tar.bz2
+eclipse-build-*.tar.gz
+eclipse-build-*.tar.xz
+/R4_platform-aggregator-*
 /eclipse-jdtpdeupdatesite.tar.bz2
 /x86_64
-/org.eclipse.linuxtools.eclipse-build-701400b0ca475ea73bd828c66b00fb63c5ec2c8c.tar.bz2
+/results_eclipse
+/.m2
+/.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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>eclipse</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.linuxtools.rpm.rpmlint.rpmlintBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.linuxtools.rpm.rpmlint.rpmlintNature</nature>
+		<nature>org.eclipse.linuxtools.rpm.core.rpmnature</nature>
+	</natures>
+</projectDescription>

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-change-build-packagings.patch

@@ -1,48 +0,0 @@
---- pom.xml.bak	2012-08-28 09:57:16.432181359 +0200
-+++ pom.xml	2012-08-28 09:58:00.791440793 +0200
-@@ -49,10 +49,13 @@
-     <module>rt.equinox.bundles</module>
-     <module>rt.equinox.framework</module>
-     <module>rt.equinox.p2</module>
-+    <module>rt.equinox.incubator</module>
- 
-     <module>eclipse.platform.releng</module>
- 
-     <module>TMP/org.eclipse.sdk.epp</module>
-+    <module>TMP/jdtpde</module>
-+    
-     <module>TMP/eclipse-junit-tests</module>
-   </modules>
- </project>
---- TMP/org.eclipse.sdk.epp/pom.xml.bak	2012-08-28 09:35:00.000000000 +0200
-+++ TMP/org.eclipse.sdk.epp/pom.xml	2012-08-28 10:02:35.739112336 +0200
-@@ -46,7 +46,7 @@
-               <profile>SDKProfile</profile>
-               <products>
-                 <product>
--                  <id>org.eclipse.sdk.epp</id>
-+                  <id>org.fedoraproject.eclipse.platform</id>
-                   <rootFolder>eclipse</rootFolder>
-                 </product>
-               </products>
---- TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product.bak	2012-08-28 10:04:10.214701605 +0200
-+++ TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product	2012-08-28 10:04:29.568822865 +0200
-@@ -1,7 +1,7 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <?pde version="3.5"?>
- 
--<product uid="org.eclipse.sdk.epp" name="Eclipse SDK" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.2.0.qualifier" useFeatures="true" includeLaunchers="true">
-+<product uid="org.fedoraproject.eclipse.platform" name="Eclipse SDK" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.2.0.qualifier" useFeatures="true" includeLaunchers="true">
- 
-    <configIni use="default">
-    </configIni>
-@@ -159,7 +159,8 @@
-    </plugins>
- 
-    <features>
--      <feature id="org.eclipse.sdk"/>
-+      <feature id="org.eclipse.platform"/>
-+      <feature id="org.eclipse.cvs"/>
-       <feature id="org.eclipse.equinox.p2.user.ui"/>
-       <!--
-       <feature id="org.eclipse.rcp.configuration"/>

eclipse-debug-symbols.patch

@@ -0,0 +1,23 @@
+--- 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 @@
+ 
+ MAKE_TYPE=make
+ 
+-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
+@@ -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_CFLAGS} ${M_ARCH} -g -s -Wall\
++CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -Wall\
+ 	-fpic \
+ 	-DLINUX \
+ 	-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-do-not-run-as-root.patch

@@ -1,45 +0,0 @@
---- rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java	2012-05-05 14:41:12.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java	2012-05-18 15:28:28.553493782 +0200
-@@ -8,7 +8,7 @@
-  * Contributors:
-  *     IBM Corporation - initial API and implementation
-  *     Anton Leherbauer (Wind River Systems) - bug 301226
-- *     Red Hat Inc. - bug 373640
-+ *     Red Hat Inc. - bug 373640, 379102
-  *******************************************************************************/
- package org.eclipse.equinox.launcher;
- 
-@@ -235,6 +235,9 @@
- 	protected BufferedWriter log = null;
- 	protected boolean newSession = true;
- 
-+	private boolean forbiddenMasterEclipse;
-+   private static final String FORBIDDEN_MASTER_ECLIPSE = "-preventMasterEclipseLaunch";
-+
- 	// for variable substitution
- 	public static final String VARIABLE_DELIM_STRING = "$"; //$NON-NLS-1$
- 	public static final char VARIABLE_DELIM_CHAR = '$';
-@@ -555,6 +558,12 @@
- 		setupVMProperties();
- 		processConfiguration();
- 
-+if (forbiddenMasterEclipse && System.getProperty(PROP_SHARED_CONFIG_AREA) == null) { //$NON-NLS-1$
-+           System.err.println("This application should not be run by the owner of the shared configuration.");
-+           System.setProperty(PROP_EXITCODE, "" + 14); //$NON-NLS-1$
-+           return;
-+       }
-+
- 		// need to ensure that getInstallLocation is called at least once to initialize the value.
- 		// Do this AFTER processing the configuration to allow the configuration to set
- 		// the install location.  
-@@ -1532,6 +1541,10 @@
- 				// passed thru this arg (i.e., do not set found = true)
- 				continue;
- 			}
-+ if (args[i].equalsIgnoreCase(FORBIDDEN_MASTER_ECLIPSE)) {
-+               forbiddenMasterEclipse = true;
-+               found = true;
-+           }
- 
- 			// check if development mode should be enabled for the entire platform
- 			// If this is the last arg or there is a following arg (i.e., arg+1 has a leading -), 

eclipse-dont-download-old-platform-for-p2-tests.patch

@@ -1,20 +0,0 @@
---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/pom.xml.bak	2012-08-02 10:43:30.000000000 +0200
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/pom.xml	2012-08-02 11:02:02.009984238 +0200
-@@ -34,7 +34,7 @@
- 	<build>
- 		<plugins>
- 
--			<plugin>
-+			<!-- plugin>
- 				<groupId>org.apache.maven.plugins</groupId>
- 				<artifactId>maven-antrun-plugin</artifactId>
- 				<version>1.6</version>
-@@ -54,7 +54,7 @@
- 						</goals>
- 					</execution>
- 				</executions>
--			</plugin>
-+			</plugin -->
- 
- 
- 			<plugin>

eclipse-drop-user-profile-on-platform-change.patch

@@ -1,32 +0,0 @@
---- rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java
-@@ -100,7 +100,10 @@
- 				URL userConfigURL = userConfig.toURL();
- 				List userBundles = SimpleConfiguratorUtils.readConfiguration(userConfigURL, base);
- 
--				return (userBundles.containsAll(sharedBundles)) ? userConfigURL : sharedConfigURL;
-+				boolean useUserConfigArea = userBundles.containsAll(sharedBundles);
-+				System.setProperty("org.eclipse.equinox.simpleconfigurator.shared.useUser", "" + System.currentTimeMillis());
-+
-+				return useUserConfigArea ? userConfigURL : sharedConfigURL;
- 			}
- 		} catch (MalformedURLException e) {
- 			return null;
---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
-@@ -236,8 +236,14 @@
- 		if (SELF.equals(id))
- 			id = self;
- 		Profile profile = getProfileMap().get(id);
--		if (profile == null && self != null && self.equals(id))
-+		String s = System.getProperty("org.eclipse.equinox.simpleconfigurator.shared.useUser");
-+		if (s != null && profile != null && (profile.getTimestamp() < new Long(s))) {
-+			profile = null;
-+		}
-+		if (profile == null && self != null && self.equals(id)) {
- 			profile = createSurrogateProfile(id);
-+			
-+		}
- 
- 		return profile;
- 	}

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-comilation-lucene-3.6-compile.patch

@@ -1,11 +0,0 @@
---- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java.sav	2012-06-27 16:52:22.000000000 +0300
-+++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java	2012-07-05 12:45:58.051494535 +0300
-@@ -95,4 +95,8 @@ public final class WordTokenStream exten
- 		return tokens.get(token++);
- 
- 	}
-+	
-+	public boolean incrementToken() {
-+		return false;
-+	}
- }

eclipse-fix-compatibility-class.patch

@@ -1,61 +0,0 @@
---- eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml.bak	2012-07-25 17:28:30.000000000 +0200
-+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml	2012-07-30 15:48:17.936540760 +0200
-@@ -23,4 +23,58 @@
-   <artifactId>org.eclipse.core.runtime.compatibility.registry</artifactId>
-   <version>3.5.100-SNAPSHOT</version>
-   <packaging>eclipse-plugin</packaging>
-+  
-+  <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>process-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-debug-ui.patch

@@ -1,22 +0,0 @@
---- eclipse.platform.debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java.bak	2012-07-30 14:27:39.000000000 +0200
-+++ eclipse.platform.debug/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java	2012-07-30 14:28:00.277726901 +0200
-@@ -182,7 +182,7 @@
- 					}
- 					int cmp;
- 					if (num1 instanceof Long && num2 instanceof Long) {
--						cmp = ((Long)num1).compareTo(num2);
-+						cmp = ((Long)num1).compareTo((Long)num2);
- 					} else {
- 						cmp = Double.compare(num1.doubleValue(), num2.doubleValue());
- 					}
---- eclipse.platform.debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java.bak	2012-07-25 17:26:39.000000000 +0200
-+++ eclipse.platform.debug/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/ui/BuilderPropertyPage.java	2012-07-30 15:09:46.416687878 +0200
-@@ -853,7 +853,7 @@
- 	 */
- 	private boolean isEnabled(Object element) {
- 		if (element instanceof ICommand) {
--			Boolean enabled= (Boolean)((ICommand) element).getArguments().get(COMMAND_ENABLED);
-+			Boolean enabled= (Boolean)(Object)((ICommand) element).getArguments().get(COMMAND_ENABLED);
- 			if (enabled != null) {
- 				return enabled.booleanValue();
- 			}

eclipse-fix-dropins.patch

@@ -0,0 +1,88 @@
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java.orig	2014-03-24 10:49:00.000000000 +0000
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java	2014-03-24 15:39:32.122246214 +0000
+@@ -39,6 +39,7 @@
+ 
+ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
+ 
++	private static final String PROP_IGNORE_USER_CONFIGURATION = "eclipse.ignoreUserConfiguration"; //$NON-NLS-1$
+ 	private static final String SIMPLE_PROFILE_REGISTRY_INTERNAL = "_simpleProfileRegistry_internal_"; //$NON-NLS-1$
+ 	private static final String PROFILE_REGISTRY = "profile registry"; //$NON-NLS-1$
+ 	private static final String PROFILE_PROPERTIES_FILE = "state.properties"; //$NON-NLS-1$
+@@ -266,6 +267,14 @@
+ 					//fragments support - remeber the property
+ 					internalSetProfileStateProperty(profile, profile.getTimestamp(), SIMPLE_PROFILE_REGISTRY_INTERNAL + getExtTimeStamp(), getExtTimeStamp());
+ 					agent.registerService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP, Long.toString(profile.getTimestamp()));
++
++					// this looks like a hack, but:
++					// (1) SimpleConfigurationImpl keeps returning master configuration as long as the property is set
++					// (2) SimpleConfigurationImpl sets the propery after it drops user configuration
++					// therefore dropins reconciliation can't load dropins plugins installed into user configuration
++					// after the user configuration has been dropped.
++					// It is necessary to unset this property.
++					//System.setProperty(PROP_IGNORE_USER_CONFIGURATION, "processed_and_unset"); //$NON-NLS-1$ //$NON-NLS-2$
+ 				} else {
+ 					//This is the first time we create the shared profile. Tag it as such and also remember the timestamp of the base
+ 					internalSetProfileStateProperty(profile, profile.getTimestamp(), IProfile.STATE_PROP_SHARED_INSTALL, IProfile.STATE_SHARED_INSTALL_VALUE_INITIAL);
+@@ -299,6 +308,13 @@
+ 		if (agent.getService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP) != null)
+ 			return false;
+ 
++		// if the property is set by OSGI, and there is no new timestamp (because of the previous condition)
++		// ignore current profile. This will happen only once, because SERVICE_SHARED_INSTALL_NEW_TIMESTAMP
++		// is set during profile reset.
++		if ("true".equals(System.getProperty(PROP_IGNORE_USER_CONFIGURATION))) { //$NON-NLS-1$ //$NON-NLS-2$
++			System.setProperty(PROP_IGNORE_USER_CONFIGURATION, "processed_and_unset"); //$NON-NLS-1$ //$NON-NLS-2$
++			return true;
++		}
+ 		String baseTimestamp = getBaseTimestamp(profile.getProfileId());
+ 		String extTimestamp = getExtTimeStamp();
+ 		if (baseTimestamp == null) {
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
+@@ -570,6 +570,7 @@
+ 
+ 		// get all IUs from all our repos 
+ 		IQueryResult<IInstallableUnit> allIUs = getAllIUsFromRepos();
++		HashSet<IInstallableUnit> removedFromAllIUs = new HashSet<IInstallableUnit>();
+ 		for (Iterator<IInstallableUnit> iter = allIUs.iterator(); iter.hasNext();) {
+ 			final IInstallableUnit iu = iter.next();
+ 			IInstallableUnit existing = profileIUs.get(iu);
+@@ -583,6 +584,7 @@
+ 				// (and more expensive) way to find this out is to do an IU profile property query.
+ 				if (two == null) {
+ 					// the IU is already installed so don't mark it as a dropin now - see bug 404619.
++					removedFromAllIUs.add(iu);
+ 					iter.remove();
+ 					continue;
+ 				}
+@@ -625,7 +627,7 @@
+ 			}
+ 			// if the IU from the profile is in the "all available" list, then it is already added
+ 			// otherwise if it isn't in the repo then we have to remove it from the profile.
+-			if (!all.contains(iu))
++			if (!all.contains(iu) && !removedFromAllIUs.contains(iu))
+ 				toRemove.add(iu);
+ 		}
+ 
+@@ -799,8 +801,8 @@
+ 			IStatus installerPlanStatus = engine.perform(plan.getInstallerPlan(), phaseSet, monitor);
+ 			if (!installerPlanStatus.isOK())
+ 				return installerPlanStatus;
+-
+-			applyConfiguration(true);
++			if (isReconciliationApplicationRunning())
++				applyConfiguration(true);
+ 		}
+ 		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.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};
+ 		MessageDialog dialog = new MessageDialog(getShell(), ProvUIMessages.MigrationPage_CONFIRMATION_TITLE, null, ProvUIMessages.MigrationPage_CONFIRMATION_DIALOG, MessageDialog.QUESTION, buttons, 2);
+ 
+ 		return rememberCancellationDecision(dialog.open());

eclipse-fix-equinox-ip-imports.patch

@@ -1,17 +0,0 @@
---- rt.equinox.bundles/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF.bak	2012-07-25 17:41:27.000000000 +0200
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.ip/META-INF/MANIFEST.MF	2012-07-27 12:30:04.415050626 +0200
-@@ -9,8 +9,6 @@
- Bundle-Activator: org.eclipse.equinox.internal.ip.impl.ProvisioningAgent
- DynamicImport-Package: org.osgi.service.permissionadmin; version="1.0"
- Import-Package: 
-- javax.servlet;version="2.1",
-- javax.servlet.http;version="2.1",
-  org.eclipse.equinox.internal.util.ref;version="1.0",
-  org.eclipse.equinox.internal.util.timer;version="1.0",
-  org.osgi.framework;version="1.0",
-@@ -39,4 +37,5 @@
- Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
-  J2SE-1.3
- Bundle-Localization: plugin
-+Require-Bundle: javax.servlet;bundle-version="3.0.0"
- 

eclipse-fix-icu-import.patch

@@ -1,29 +0,0 @@
---- eclipse.pde.build/org.eclipse.pde.build.product.feature/feature.xml.bak	2012-07-25 17:20:02.000000000 +0200
-+++ eclipse.pde.build/org.eclipse.pde.build.product.feature/feature.xml	2012-07-26 13:33:46.421478882 +0200
-@@ -19,7 +19,7 @@
-    </license>
- 
-    <plugin
--         id="com.ibm.icu.base"
-+         id="com.ibm.icu"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
---- eclipse.platform.releng/features/com.ibm.icu.base/feature.xml.bak	2012-07-25 17:26:52.000000000 +0200
-+++ eclipse.platform.releng/features/com.ibm.icu.base/feature.xml	2012-07-27 13:29:07.401548610 +0200
-@@ -4,14 +4,7 @@
-       version="1.2.0.qualifier">
- 
-    <plugin
--         id="com.ibm.icu.base"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="com.ibm.icu.base.source"
-+         id="com.ibm.icu"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"

eclipse-fix-master-ecf.patch

@@ -1,165 +0,0 @@
---- eclipse.platform.releng/features/master-ecf/feature.xml.bak	2012-07-25 17:26:52.000000000 +0200
-+++ eclipse.platform.releng/features/master-ecf/feature.xml	2012-07-27 13:39:12.136400473 +0200
-@@ -4,20 +4,12 @@
-       label="build utility feature for ecf plugins"
-       version="1.0.0.qualifier">
- 
--  <plugin
-+   <plugin
-          id="org.eclipse.ecf"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
--         
--  <plugin
--         id="org.eclipse.ecf.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--         
- 
-    <plugin
-          id="org.eclipse.ecf.filetransfer"
-@@ -26,41 +18,20 @@
-          version="0.0.0"
-          unpack="false"/>
- 
--  <plugin
--         id="org.eclipse.ecf.filetransfer.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
-    <plugin
-          id="org.eclipse.ecf.identity"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
--         
--    <plugin
--         id="org.eclipse.ecf.identity.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--            
-+
-    <plugin
-          id="org.eclipse.ecf.provider.filetransfer"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
--         
--   <plugin
--         id="org.eclipse.ecf.provider.filetransfer.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--         
-+
-    <plugin
-          id="org.eclipse.ecf.provider.filetransfer.ssl"
-          download-size="0"
-@@ -70,7 +41,7 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.ecf.provider.filetransfer.ssl.source"
-+         id="org.eclipse.ecf.ssl"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-@@ -78,77 +49,32 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.ecf.ssl"
-+         id="org.eclipse.ecf.provider.filetransfer.httpclient"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         fragment="true"
-          unpack="false"/>
--         
-+
-    <plugin
--         id="org.eclipse.ecf.ssl.source"
-+         id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          fragment="true"
-          unpack="false"/>
--                          
--    <plugin
--         id="org.eclipse.ecf.provider.filetransfer.httpclient"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--         
--    <plugin
--         id="org.eclipse.ecf.provider.filetransfer.httpclient.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"
-+         id="org.apache.commons.codec"
-          download-size="0"
-          install-size="0"
--         version="0.0.0"
--         fragment="true"
-+         version="0.0.0"
-          unpack="false"/>
--         
--    <plugin
--         id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source"
-+
-+   <plugin
-+         id="org.apache.commons.httpclient"
-          download-size="0"
-          install-size="0"
--         version="0.0.0"
--         fragment="true"
-+         version="3.1.0.qualifier"
-          unpack="false"/>
--   
--   <plugin      
--          id="org.apache.commons.codec"
--          download-size="0"
--          install-size="0"
--          version="1.3.0.qualifier"
--          unpack="false"/>
--          
--   <plugin      
--          id="org.apache.commons.codec.source"
--          download-size="0"
--          install-size="0"
--          version="1.3.0.qualifier"
--          unpack="false"/>
-- 
--    <plugin
--          id="org.apache.commons.httpclient"
--          download-size="0"
--          install-size="0"
--          version="3.1.0.qualifier"
--          unpack="false"/>
--          
--    <plugin
--          id="org.apache.commons.httpclient.source"
--          download-size="0"
--          install-size="0"
--          version="3.1.0.qualifier"
--          unpack="false"/>
--         
-+
- </feature>

eclipse-fix-master-equinox.patch

@@ -1,235 +0,0 @@
---- eclipse.platform.releng/features/master-equinox/feature.xml.bak	2012-07-25 17:26:52.000000000 +0200
-+++ eclipse.platform.releng/features/master-equinox/feature.xml	2012-07-27 14:02:59.042494959 +0200
-@@ -7,173 +7,153 @@
-    <includes
-          id="org.eclipse.equinox.sdk"
-          version="0.0.0"/>
--           
--    <plugin
-+
-+   <includes
-+         id="org.eclipse.equinox.starterkit.product.feature"
-+         version="0.0.0"/>
-+
-+   <includes
-+         id="org.eclipse.pde.build.product.feature"
-+         version="0.0.0"/>
-+
-+   <plugin
-          id="org.eclipse.equinox.supplement"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/>                         
--         
--    <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.equinox.http.registry"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/> 
--             
--    <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.equinox.http.jetty"
-          download-size="0"
-          install-size="0"
--         version="0.0.0" 
--         unpack="false"/> 
--           
--    <plugin
-+         version="0.0.0"
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.equinox.http.servlet"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
--         
--    <plugin
--         id="org.eclipse.equinox.http.servletbridge"         	
-+
-+   <plugin
-+         id="org.eclipse.equinox.http.servletbridge"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
--         
--    <plugin
--         id="org.eclipse.equinox.servletbridge"         	
-+
-+   <plugin
-+         id="org.eclipse.equinox.servletbridge"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
--                                    
--    <plugin
-+
-+   <plugin
-          id="javax.servlet"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/>        
--     
--    <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="javax.el"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/> 
--        
--    <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.apache.commons.logging"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/>        
--   
--    <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.jetty.continuation"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/>   
--    
--     <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.jetty.http"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/>   
--    
--     <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.eclipse.jetty.io"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
--    
--    <plugin
-+
-+   <plugin
-          id="org.eclipse.jetty.security"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
- 
--    <plugin
-+   <plugin
-          id="org.eclipse.jetty.server"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
- 
--<plugin
-+   <plugin
-          id="org.eclipse.jetty.servlet"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
- 
--<plugin
-+   <plugin
-          id="org.eclipse.jetty.util"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
--    
--    <plugin
-+
-+   <plugin
-          id="org.apache.felix.gogo.runtime"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/>      
--      
-+         unpack="false"/>
-+
-    <plugin
--         id="org.slf4j.api"
-+         id="slf4j.api"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/>       
--         
--    <plugin
-+         unpack="false"/>
-+
-+   <plugin
-          id="org.apache.mina.core"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/> 
--      
--    <plugin
--         id="org.apache.sshd.core"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
-          unpack="false"/>
--         
--     <plugin
--         id="org.apache.jasper.glassfish"
-+
-+   <plugin
-+         id="org.apache.sshd.core"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
-- 
-- <!-- see bug 368488 and bug 377314           
-- <includes
--         id="master-equinox-p2"
--         version="0.0.0"/>        
-- -->         
-- <includes
--         id="master-equinox-weaving"
--         version="0.0.0"/>
--         
-- <includes
--         id="org.eclipse.equinox.weaving.sdk"
--         version="0.0.0"/>    
- 
-- <includes
--         id="org.eclipse.equinox.starterkit.product.feature"
--         version="0.0.0"/>      
--    
-- <includes
--         id="org.eclipse.pde.build.product.feature"
--         version="0.0.0"/>
--                  
- </feature>

eclipse-fix-pde-ui-compilation.patch

@@ -1,29 +0,0 @@
---- eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/SkippedComponent.java.bak	2012-07-31 08:21:34.334028987 +0200
-+++ eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/search/SkippedComponent.java	2012-07-31 08:22:14.211252316 +0200
-@@ -142,7 +142,7 @@
- 	private String[] resolveRootErrors(ResolverError[] errors) {
- 		TreeSet collector = new TreeSet(new Comparator() {
- 			public int compare(Object o1, Object o2) {
--				return ((String)o1).compareTo(o2);
-+				return ((String)o1).compareTo((String)o2);
- 			}
- 		});
- 		ResolverError error = null;
-@@ -179,4 +179,4 @@
- 		}
- 		return SearchMessages.SkippedComponent_component_was_excluded;
- 	}
--}
-\ No newline at end of file
-+}
---- eclipse.pde.build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/SourceTests.java.bak	2012-07-31 08:38:47.168724521 +0200
-+++ eclipse.pde.build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/SourceTests.java	2012-07-31 08:40:15.781250931 +0200
-@@ -128,7 +128,7 @@
- 		properties.put("osgi.os", os);
- 		properties.put("osgi.ws", ws);
- 		properties.put("osgi.arch", arch);
--		assertTrue(FrameworkUtil.createFilter(filter).match(properties));
-+		//assertTrue(FrameworkUtil.createFilter(filter).match(properties));
- 	}
- 
- 	// test that '<' and '>' are properly escaped in generated source feature

eclipse-fix-sshd-id.patch

@@ -1,16 +0,0 @@
---- rt.equinox.incubator/console/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF.bak	2012-07-26 16:40:00.000000000 +0200
-+++ rt.equinox.incubator/console/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF	2012-07-26 16:40:17.896441807 +0200
-@@ -5,4 +5,4 @@
- Bundle-Version: 1.0.0.qualifier
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- DynamicImport-Package: org.eclipse.equinox.console.jaas
--Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0"
-+Fragment-Host: org.apache.sshd.core
---- rt.equinox.bundles/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF.bak	2012-07-25 17:41:27.000000000 +0200
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF	2012-07-27 09:17:27.641681636 +0200
-@@ -7,4 +7,4 @@
- Bundle-Version: 1.0.0.qualifier
- Bundle-RequiredExecutionEnvironment: JavaSE-1.6
- DynamicImport-Package: org.eclipse.equinox.console.jaas
--Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0"
-+Fragment-Host: org.apache.sshd.core

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-fix-transforms.patch

@@ -1,11 +0,0 @@
---- rt.equinox.bundles/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/xslt/Activator.java.bak	2012-07-31 08:57:28.993158697 +0200
-+++ rt.equinox.bundles/bundles/org.eclipse.equinox.transforms.xslt/src/org/eclipse/equinox/internal/transforms/xslt/Activator.java	2012-07-31 09:00:15.187466997 +0200
-@@ -32,7 +32,7 @@
- 		properties.put("equinox.transformerType", "xslt"); //$NON-NLS-1$ //$NON-NLS-2$
- 
- 		Object transformer = new XSLTStreamTransformer(logTracker);
--		registration = context.registerService(Object.class.getName(), transformer, properties);
-+		registration = context.registerService(Object.class.getName(), transformer, (java.util.Dictionary<java.lang.String,?>)(Object)properties);
- 
- 	}
- 

eclipse-help-feature-adjust-dependencies.patch

@@ -1,110 +0,0 @@
-diff -r -Nu eclipse-3.8.0-M1-src/features/org.eclipse.help/feature.xml eclipse-3.8.0-M1-src.patched/features/org.eclipse.help/feature.xml
---- eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml   2011-03-27 10:30:27.000000000 -0400
-+++ eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml   2011-08-23 14:01:19.026328809 -0400
-@@ -36,7 +36,7 @@
-          unpack="false"/>
-   
-    <plugin
--         id="com.sun.el"
-+         id="javax.el"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-@@ -50,14 +50,14 @@
-          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"
-          unpack="false"/>
- 
-    <plugin
--         id="org.apache.lucene"
-+         id="org.apache.lucene.core"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-diff -r -Nu eclipse-3.8.0-M1-src/plugins/org.eclipse.help.base/META-INF/MANIFEST.MF eclipse-3.8.0-M1-src.patched/plugins/org.eclipse.help.base/META
---- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java.old	2012-01-18 08:58:41.397436636 +0100
-+++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/SearchIndex.java	2012-01-18 08:59:35.994625494 +0100
-@@ -106,7 +106,7 @@
- 
- 	public static final String DEPENDENCIES_KEY_ANALYZER = "analyzer"; //$NON-NLS-1$
- 
--	private static final String LUCENE_BUNDLE_ID = "org.apache.lucene"; //$NON-NLS-1$
-+	private static final String LUCENE_BUNDLE_ID = "org.apache.lucene.core"; //$NON-NLS-1$
- 
- 	private static final String FIELD_NAME = "name"; //$NON-NLS-1$
- 
---- eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF.orig	2012-04-06 08:28:49.000000000 +0200
-+++ eclipse.platform.ua/org.eclipse.help.base/META-INF/MANIFEST.MF	2012-04-06 08:40:46.988519392 +0200
-@@ -39,8 +39,8 @@
-  org.eclipse.help.search,
-  org.eclipse.help.server,
-  org.eclipse.help.standalone
--Require-Bundle: org.apache.lucene;bundle-version="2.9.0";visibility:=reexport,
-- org.apache.lucene.analysis;bundle-version="2.9.0";visibility:=reexport,
-+Require-Bundle: org.apache.lucene.core;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
-+ org.apache.lucene.analysis;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
-  org.eclipse.ant.core;bundle-version="3.2.200";resolution:=optional,
-  org.eclipse.core.runtime;bundle-version="3.6.0",
-  org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
---- eclipse.platform.ua/org.eclipse.help.base/pom.xml.bak	2012-07-25 17:39:10.000000000 +0200
-+++ eclipse.platform.ua/org.eclipse.help.base/pom.xml	2012-07-26 14:34:22.971863419 +0200
-@@ -33,7 +33,7 @@
-             <extraRequirements>
-               <requirement>
-                 <type>eclipse-plugin</type>
--                <id>org.apache.lucene</id>
-+                <id>org.apache.lucene.core</id>
-                 <versionRange>[2.9,3.0)</versionRange>
-               </requirement>
-               <requirement>
---- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak	2012-07-25 17:26:52.000000000 +0200
-+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml	2012-07-27 14:39:44.824536490 +0200
-@@ -37,7 +37,7 @@
-             <extraRequirements> 
-               <requirement> 
-                 <type>eclipse-plugin</type> 
--                <id>org.apache.lucene</id> 
-+                <id>org.apache.lucene.core</id> 
-                 <versionRange>[2.9,3.0)</versionRange> 
-               </requirement>
-               <requirement>
---- eclipse.platform.ua/org.eclipse.help.base/pom.xml.bak	2012-08-28 09:32:59.754115174 +0200
-+++ eclipse.platform.ua/org.eclipse.help.base/pom.xml	2012-08-28 09:28:24.281350613 +0200
-@@ -34,12 +34,12 @@
-               <requirement>
-                 <type>eclipse-plugin</type>
-                 <id>org.apache.lucene.core</id>
--                <versionRange>[2.9,3.0)</versionRange>
-+                <versionRange>[3.0,4.0)</versionRange>
-               </requirement>
-               <requirement>
-                 <type>eclipse-plugin</type>
-                 <id>org.apache.lucene.analysis</id>
--                <versionRange>[2.9,3.0)</versionRange>
-+                <versionRange>[3.0,4.0)</versionRange>
-               </requirement>
-             </extraRequirements>
-           </dependency-resolution>
---- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak   2012-08-28 09:30:36.530197639 +0200
-+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml   2012-08-28 09:28:24.276350580 +0200
-@@ -38,12 +38,12 @@
-               <requirement> 
-                 <type>eclipse-plugin</type> 
-                 <id>org.apache.lucene.core</id> 
--                <versionRange>[2.9,3.0)</versionRange> 
-+                <versionRange>[3.0,4.0)</versionRange> 
-               </requirement>
-               <requirement>
-                 <type>eclipse-plugin</type>
-                 <id>org.apache.lucene.analysis</id>
--                <versionRange>[2.9,3.0)</versionRange>
-+                <versionRange>[3.0,4.0)</versionRange>
-               </requirement>
-             </extraRequirements>
-           </dependency-resolution>

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-ignore-version-when-calculating-home.patch

@@ -1,6 +1,17 @@
---- rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/LocationManager.java.orig	2012-05-05 14:40:27.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/LocationManager.java	2012-05-18 09:18:35.819051000 +0200
-@@ -317,7 +317,7 @@
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java.orig	2014-03-24 12:06:59.530918305 +0000
++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java	2014-03-24 12:07:42.709932098 +0000
+@@ -1362,7 +1362,7 @@
+ 				String appVersion = props.getProperty(PRODUCT_SITE_VERSION);
+ 				if (appVersion == null || appVersion.trim().length() == 0)
+ 					appVersion = ""; //$NON-NLS-1$
+-				appName += File.separator + appId + "_" + appVersion + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$
++				appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$
+ 			} catch (IOException e) {
+ 				// Do nothing if we get an exception.  We will default to a standard location 
+ 				// in the user's home dir.
+--- rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java.orig	2014-03-24 12:05:52.666896971 +0000
++++ rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java	2014-03-24 12:06:46.076914704 +0000
+@@ -296,7 +296,7 @@
  				String appVersion = props.getProperty(PRODUCT_SITE_VERSION);
  				if (appVersion == null || appVersion.trim().length() == 0)
  					appVersion = ""; //$NON-NLS-1$

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

@@ -0,0 +1,70 @@
+--- 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
+@@ -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.mockito;bundle-version="1.8.4"
++ org.hamcrest.core,
++ 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,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.mockito;bundle-version="1.8.4",
++ org.hamcrest.core,
++ org.mockito.mockito-core,
+  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,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.mockito;bundle-version="1.8.4",
++ org.hamcrest.core,
++ org.mockito.mockito-core,
+  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
+-         id="org.mockito"
++         id="org.mockito.mockito-core"
+          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,468 +1,13 @@
---- eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties.orig	2012-03-27 16:28:35.000000000 +0200
-+++ eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties	2012-03-30 09:03:43.205386499 +0200
-@@ -31,6 +31,4 @@
-            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.httpclient.source;version=4.0.200.qualifier;unpack="false",\
--           plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\
--           plugin@org.apache.commons.codec.source;version=1.3.0.qualifier;unpack="false,\
--           plugin@org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"
-\ No newline at end of file
-+           plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false"
-\ No newline at end of file
---- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.orig	2012-04-06 11:35:38.000000000 +0200
-+++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties	2012-04-06 13:02:22.997174313 +0200
-@@ -11,33 +11,12 @@
- bin.includes=eclipse_update_120.jpg,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.3.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=3.8.2.qualifier;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.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.source;version=2.9.1.qualifier;unpack="false",\
--  plugin@org.apache.lucene.analysis.source;version=2.9.1.qualifier;unpack="false",\
--  plugin@org.apache.lucene.core.source;version=2.9.1.qualifier;unpack="false",\
--  plugin@org.eclipse.jetty.continuation.source;version=8.1.3.qualifier;unpack="false",\
--  plugin@org.eclipse.jetty.http.source;version=8.1.3.qualifier;unpack="false",\
--  plugin@org.eclipse.jetty.io.source;version=8.1.3.qualifier;unpack="false",\
--  plugin@org.eclipse.jetty.security.source;version=8.1.3.qualifier;unpack="false",\
--  plugin@org.eclipse.jetty.server.source;version=8.1.3.qualifier;unpack="false",\
--  plugin@org.eclipse.jetty.servlet.source;version=8.1.3.qualifier;unpack="false",\
--  plugin@org.eclipse.jetty.util.source;version=8.1.3.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
---- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml.bak	2012-07-25 17:45:43.000000000 +0200
-+++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml	2012-07-26 15:53:52.708568166 +0200
-@@ -31,13 +31,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.apache.commons.codec.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.apache.commons.httpclient"
-          download-size="0"
-          install-size="0"
-@@ -45,13 +38,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.apache.commons.httpclient.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.apache.commons.logging"
-          download-size="0"
-          install-size="0"
-@@ -59,13 +45,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.apache.commons.logging.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.eclipse.equinox.p2.artifact.repository"
-          download-size="0"
-          install-size="0"
-@@ -458,13 +437,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.ecf.filetransfer.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.eclipse.ecf.identity"
-          download-size="0"
-          install-size="0"
-@@ -472,13 +444,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.ecf.identity.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.eclipse.ecf.provider.filetransfer"
-          download-size="0"
-          install-size="0"
-@@ -493,13 +458,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.ecf.provider.filetransfer.httpclient.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"
-          download-size="0"
-          install-size="0"
-@@ -508,20 +466,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.ecf.provider.filetransfer.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.eclipse.ecf.provider.filetransfer.ssl"
-          download-size="0"
-          install-size="0"
-@@ -530,20 +474,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.ecf.provider.filetransfer.ssl.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.eclipse.ecf.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.eclipse.ecf.ssl"
-          download-size="0"
-          install-size="0"
-@@ -552,13 +482,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.eclipse.ecf.ssl.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.eclipse.equinox.simpleconfigurator"
-          download-size="0"
-          install-size="0"
---- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/build.properties.bak	2012-07-25 17:45:43.000000000 +0200
-+++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/build.properties	2012-07-26 15:52:00.768876554 +0200
-@@ -11,17 +11,6 @@
- ###############################################################################
- bin.includes = feature.xml,feature.properties
- 
--generate.plugin@org.apache.commons.codec.source=org.apache.commons.codec
--generate.plugin@org.apache.commons.httpclient.source=org.apache.commons.httpclient
--generate.plugin@org.apache.commons.logging.source=org.apache.commons.logging
--generate.plugin@org.eclipse.ecf.filetransfer.source=org.eclipse.ecf.filetransfer
--generate.plugin@org.eclipse.ecf.identity.source=org.eclipse.ecf.identity
--generate.plugin@org.eclipse.ecf.provider.filetransfer.httpclient.source=org.eclipse.ecf.provider.filetransfer.httpclient
--generate.plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source=org.eclipse.ecf.provider.filetransfer.httpclient.ssl
--generate.plugin@org.eclipse.ecf.provider.filetransfer.source=org.eclipse.ecf.provider.filetransfer
--generate.plugin@org.eclipse.ecf.provider.filetransfer.ssl.source=org.eclipse.ecf.provider.filetransfer.ssl
--generate.plugin@org.eclipse.ecf.source=org.eclipse.ecf
--generate.plugin@org.eclipse.ecf.ssl.source=org.eclipse.ecf.ssl
- generate.plugin@org.eclipse.equinox.frameworkadmin.equinox.source=org.eclipse.equinox.frameworkadmin.equinox
- generate.plugin@org.eclipse.equinox.frameworkadmin.source=org.eclipse.equinox.frameworkadmin
- generate.plugin@org.eclipse.equinox.p2.artifact.repository.source=org.eclipse.equinox.p2.artifact.repository
---- rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml.bak	2012-07-25 17:42:07.000000000 +0200
-+++ rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml	2012-07-26 16:18:17.122501404 +0200
-@@ -356,13 +356,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.apache.felix.gogo.command.source"
--         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"
-@@ -370,13 +363,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.apache.felix.gogo.runtime.source"
--         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"
-@@ -384,13 +370,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.apache.felix.gogo.shell.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.apache.mina.core"
-          download-size="0"
-          install-size="0"
-@@ -398,24 +377,10 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.apache.mina.core.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="org.apache.sshd.core"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="org.apache.sshd.core.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
-          unpack="false"/>
- 
-    <plugin
---- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.orig	2012-07-25 17:41:27.000000000 +0200
-+++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml	2012-07-26 17:48:14.260030722 +0200
-@@ -50,32 +50,11 @@
-          unpack="false"/>
- 
-    <plugin
--         id="javax.servlet.jsp.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
--         id="javax.servlet.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--   <plugin
-          id="javax.el"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
--
--   <plugin
--         id="javax.el.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/> 
-          
-    <plugin
-          id="org.eclipse.equinox.http.jetty"
-@@ -152,40 +131,20 @@
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
--   <plugin
--         id="org.apache.jasper.glassfish.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         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.continuation.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>   
-+         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.http.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>   
-+         unpack="false"/>
- 
-     
-      <plugin
-@@ -195,13 +154,6 @@
-          version="0.0.0"
-          unpack="false"/>
- 
--     <plugin
--         id="org.eclipse.jetty.io.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
-     
-     <plugin
-          id="org.eclipse.jetty.security"
-@@ -211,28 +163,12 @@
-          unpack="false"/>
- 
-     <plugin
--         id="org.eclipse.jetty.security.source"
--         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.server.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
--         unpack="false"/>
--
--
-    <plugin
-          id="org.eclipse.jetty.servlet"
-          download-size="0"
-@@ -240,25 +176,11 @@
-          version="0.0.0"
-          unpack="false"/>
- 
--  <plugin
--         id="org.eclipse.jetty.servlet.source"
--         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.jetty.util.source"
--         download-size="0"
--         install-size="0"
--         version="0.0.0"
-          unpack="false"/>
- 
-    <plugin
---- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.bak	2012-07-27 09:19:13.000000000 +0200
-+++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml	2012-07-27 09:34:17.405316598 +0200
-@@ -125,12 +125,6 @@
-          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.eclipse.jetty.continuation"
---- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.bak	2012-07-25 17:40:44.000000000 +0200
-+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	2012-07-30 16:28:44.017838079 +0200
-@@ -67,6 +67,12 @@
-                 <plugin id="org.eclipse.swt.gtk.aix.ppc" />
-                 <plugin id="org.eclipse.swt.gtk.aix.ppc64" />
-                 <plugin id="org.eclipse.swt.gtk.hpux.ia64_32" />
-+
-+		<plugin id="org.w3c.dom.svg" /><plugin id="org.apache.batik.css"/><plugin id="org.apache.batik.util"/>
-+		<plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" /><plugin id="org.apache.batik.util.gui"/>
-+		<plugin id=" org.apache.felix.gogo.command" /><plugin id="javax.inject"/>
-+		<plugin id="org.apache.felix.gogo.runtime" /><plugin id="org.w3c.css.sac"/>
-+		<plugin id="org.apache.felix.gogo.shell" />
-               </excludes>
-             </configuration>
-           </execution>
 --- 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
-@@ -42,6 +42,17 @@
+@@ -40,6 +40,25 @@
                <excludes>
-                 <plugin id="org.sat4j.core" />
-                 <plugin id="org.sat4j.pb" />
+                 <plugin id="org.sat4j.core"/>
+                 <plugin id="org.sat4j.pb"/>
 +                <plugin id="org.apache.commons.codec" />
 +		 <plugin id="org.apache.commons.httpclient" />
++		 <plugin id="org.apache.httpcomponents.httpclient" />
++		 <plugin id="org.apache.httpcomponents.httpcore" />
 +		 <plugin id="org.apache.commons.logging" />
 +		 <plugin id="org.eclipse.ecf"/>
 +		 <plugin id="org.eclipse.ecf.filetransfer"/>
@@ -470,60 +15,111 @@
 +		 <plugin id="org.eclipse.ecf.provider.filetransfer"/>
 +		 <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient"/>
 +		 <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"/>
++		 <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4"/>
++		 <plugin id="org.eclipse.ecf.provider.filetransfer.httpclient4.ssl"/>
 +		 <plugin id="org.eclipse.ecf.provider.filetransfer.ssl"/>
 +		 <plugin id="org.eclipse.ecf.ssl"/>
++		 <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
-@@ -59,6 +59,17 @@
+@@ -34,6 +34,17 @@
              <goals>
                <goal>source-feature</goal>
              </goals>
 +            <configuration>
 +              <excludes>
-+                <plugin id="javax.servlet" /><plugin id="javax.el" /><plugin id="org.apache.el" /><plugin id="org.apache.commons.logging" />
++                <plugin id="javax.servlet-api" /><plugin id="javax.el" /><plugin id="com.sun.el.javax.el" /><plugin id="org.apache.el" /><plugin id="org.apache.commons.logging" />
 +                <plugin id="javax.servlet.jsp" /><plugin id="org.apache.lucene.analysis" /><plugin id="org.apache.lucene.core" />
 +                <plugin id="org.apache.tomcat" /><plugin id="org.eclipse.jetty.continuation" /><plugin id="org.eclipse.jetty.http" />
 +                <plugin id="org.apache.juli" /><plugin id="org.eclipse.jetty.io" /><plugin id="org.eclipse.jetty.security" />
 +                <plugin id="org.eclipse.jetty.util" /><plugin id="org.eclipse.jetty.server" />
-+                <plugin id="org.apache.jasper" /><plugin id="org.eclipse.jetty.servlet" />
++                <plugin id="org.glassfish.web.javax.servlet.jsp" /><plugin id="org.eclipse.jetty.servlet" />
 +                <plugin id="org.apache.commons.el" /><plugin id="org.glassfish.web.javax.servlet.jsp" />
 +              </excludes>
 +            </configuration>
            </execution>
          </executions>
        </plugin>
---- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.bak	2012-08-10 09:56:55.000000000 +0200
-+++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml	2012-08-10 10:09:14.758180621 +0200
-@@ -59,6 +59,8 @@
- 
-                 <plugin id="org.eclipse.equinox.security.macosx"/>
-                 <plugin id="org.eclipse.equinox.security.macosx"/>
+--- 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"/>
++		  <plugin id="org.objectweb.asm"/>
++		  <plugin id="org.objectweb.asm.tree"/>
+                   <plugin id="org.eclipse.pde.doc.user"/>
+               </excludes>
+             </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,8 @@
+               <excludes>
+                 <plugin id="org.eclipse.jdt"/>
+                 <plugin id="org.eclipse.jdt.doc.user"/>
++                <plugin id="org.junit" />
++                <plugin id="org.hamcrest.core" />
+               </excludes>
+             </configuration>
+           </execution>
+--- 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="com.jcraft.jsch"/>
 +                <plugin id="org.apache.ant"/>
                </excludes>
              </configuration>
            </execution>
---- eclipse.jdt/org.eclipse.jdt-feature/pom.xml.bak	2012-08-10 10:11:03.000000000 +0200
-+++ eclipse.jdt/org.eclipse.jdt-feature/pom.xml	2012-08-10 10:21:52.409764968 +0200
-@@ -40,6 +40,8 @@
-               <excludes>
-                 <plugin id="org.eclipse.jdt" />
-                 <plugin id="org.junit4" />
-+                <plugin id="org.junit" />
-+                <plugin id="org.hamcrest.core" />
-                 <plugin id="org.eclipse.jdt.doc.user" />
-               </excludes>
-             </configuration>
---- eclipse.pde/org.eclipse.pde-feature/pom.xml.bak	2012-08-10 10:23:32.000000000 +0200
-+++ eclipse.pde/org.eclipse.pde-feature/pom.xml	2012-08-10 10:36:43.211016068 +0200
-@@ -39,6 +39,7 @@
-             <configuration>
-               <excludes>
-                   <plugin id="org.eclipse.pde"/>
-+                  <plugin id="org.objectweb.asm"/>
-                   <plugin id="org.eclipse.pde.doc.user"/>
+--- 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
+@@ -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.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-osgi-serverside-patch-additional-imports.patch

@@ -1,25 +0,0 @@
---- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.old	2012-01-14 12:38:46.714594091 +0100
-+++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml	2012-01-14 12:39:04.959639056 +0100
-@@ -152,6 +152,21 @@
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
-+
-+  <plugin
-+         id="org.apache.jasper"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/> 
-+
-+  <plugin
-+         id="org.apache.commons.el"
-+         download-size="0"
-+         install-size="0"
-+         version="0.0.0"
-+         unpack="false"/> 
-+
- 
-     
-     <plugin
-

eclipse-osgi-unpack-sources.patch

@@ -1,109 +0,0 @@
---- rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml.bak	2012-07-25 17:42:07.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml	2012-07-30 12:05:54.525785334 +0200
-@@ -42,6 +42,84 @@
-           </dependency-resolution>
-         </configuration>
-       </plugin>
-+            <plugin>
-+        <groupId>org.eclipse.tycho</groupId>
-+        <artifactId>target-platform-configuration</artifactId>
-+        <configuration>
-+          <dependency-resolution>
-+            <extraRequirements>
-+              <requirement>
-+                <type>eclipse-plugin</type>
-+                <id>javax.servlet</id>
-+                <versionRange>0.0.0</versionRange>
-+              </requirement>
-+              <!--requirement>
-+                <type>eclipse-plugin</type>
-+                <id>org.eclipse.equinox.io</id>
-+                <versionRange>0.0.0</versionRange>
-+              </requirement-->
-+            </extraRequirements>
-+          </dependency-resolution>
-+        </configuration>
-+      </plugin>
-+      <plugin>
-+            <artifactId>maven-antrun-plugin</artifactId>
-+            <version>1.7</version>
-+            <executions>
-+              <execution>
-+                <id>extract-sources</id>
-+                <phase>process-resources</phase>
-+                <configuration>
-+                  <target>
-+                    <mkdir dir="src" /><mkdir dir="bin" />
-+                    <unzip src="src.zip" dest="src" overwrite="false"/>
-+                    <mkdir dir="src2/javax" />
-+                    <copy todir="src2/javax/"><fileset dir="../../../rt.equinox.bundles/bundles/org.eclipse.equinox.io/src/javax"/></copy>
-+                  </target>
-+                </configuration>
-+                <goals>
-+                  <goal>run</goal>
-+                </goals>
-+              </execution>
-+              <execution>
-+                <id>copy-classes-back</id>
-+                <phase>process-classes</phase>
-+                <configuration>
-+                  <target>
-+                    <copy todir="org/"><fileset dir="target/classes/org/"/></copy>
-+                    <!--unzip src="src.zip" dest="src" overwrite="false"/>
-+                    <mkdir dir="src2/javax" />
-+                    -->
-+                  </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>
- 
---- rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties.bak	2012-08-01 16:03:39.000000000 +0200
-+++ rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties	2012-08-01 16:22:16.274724843 +0200
-@@ -11,13 +11,16 @@
- bin.includes = plugin.properties,\
-                about.html,\
-                META-INF/,\
--               org/,\
-+               org/,\
-                about_files/
- src.includes = src.zip,\
-                about.html,\
-                about_files/
--source.. = .
--output.. = .
-+source.. = src/
-+output.. = bin/
- customBuildCallbacks=customBuildCallbacks.xml
- javacSource = 1.5
- javacTarget = 1.5
-+jars.compile.order = library.jar,\
-+                     src/
-+source.library.jar = src2/

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=/usr/share/eclipse

eclipse-populate-update-sites-from-master.patch

@@ -1,260 +0,0 @@
-diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
-index 2392378..526183c 100644
---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
-@@ -7,7 +7,7 @@
- Bundle-Activator: org.eclipse.equinox.internal.p2.core.Activator
- Bundle-Vendor: %providerName
- Bundle-Localization: plugin
--Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.repository",
-+Export-Package: org.eclipse.equinox.internal.p2.core;x-friends:="org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.repository,org.eclipse.equinox.p2.engine",
-  org.eclipse.equinox.internal.p2.core.helpers;
-   x-friends:="org.eclipse.equinox.frameworkadmin.test,
-    org.eclipse.equinox.p2.artifact.optimizers,
-diff --git a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
-index cb812be2..21ba682 100644
---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
-@@ -25,16 +25,19 @@
-  J2SE-1.4,
-  CDC-1.1/Foundation-1.1
- Bundle-ActivationPolicy: lazy
--Service-Component: OSGI-INF/profileRegistry.xml, OSGI-INF/engine.xml
-+Service-Component: OSGI-INF/profileRegistry.xml, OSGI-INF/engine.xml,
-+ OSGI-INF/MasterRepositoryPreferenceProvider.xml
- Import-Package: javax.xml.parsers,
-  org.eclipse.core.internal.preferences,
-  org.eclipse.core.runtime.preferences,
-+ org.eclipse.equinox.internal.p2.core,
-  org.eclipse.equinox.internal.p2.core.helpers,
-  org.eclipse.equinox.internal.p2.metadata,
-  org.eclipse.equinox.internal.p2.metadata.index,
-  org.eclipse.equinox.internal.p2.metadata.repository.io,
-  org.eclipse.equinox.internal.p2.persistence,
-  org.eclipse.equinox.internal.p2.repository,
-+ org.eclipse.equinox.internal.p2.repository.helpers,
-  org.eclipse.equinox.internal.provisional.p2.core.eventbus,
-  org.eclipse.equinox.internal.provisional.p2.repository,
-  org.eclipse.equinox.p2.core;version="[2.0.0,3.0.0)",
-diff --git a/bundles/org.eclipse.equinox.p2.engine/MasterRepositoryPreferenceProvider.xml b/bundles/org.eclipse.equinox.p2.engine/MasterRepositoryPreferenceProvider.xml
-new file mode 100644
-index 0000000..026fa0e
---- /dev/null
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/OSGI-INF/MasterRepositoryPreferenceProvider.xml
-@@ -0,0 +1,7 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.equinox.p2.engine.IMasterRepositoryPreferenceProviderService">
-+   <implementation class="org.eclipse.equinox.p2.engine.MasterProfilePreferencesProvider"/>
-+   <service>
-+      <provide interface="org.eclipse.equinox.internal.p2.repository.helpers.IMasterProfilePreferencesProvider"/>
-+   </service>
-+</scr:component>
-diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/MasterProfilePreferencesProvider.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/MasterProfilePreferencesProvider.java
-new file mode 100644
-index 0000000..0fef156
---- /dev/null
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/MasterProfilePreferencesProvider.java
-@@ -0,0 +1,65 @@
-+/*******************************************************************************
-+ * Copyright (c) 2012 Red Hat,Inc. and others.
-+ * All rights reserved. This program and the accompanying materials
-+ * are made available under the terms of the Eclipse Public License v1.0
-+ * which accompanies this distribution, and is available at
-+ * http://www.eclipse.org/legal/epl-v10.html
-+ * 
-+ * Contributors:
-+ *     Red Hat,Inc. - initial API and implementation
-+ *******************************************************************************/
-+package org.eclipse.equinox.p2.engine;
-+
-+import java.net.URI;
-+import java.net.URISyntaxException;
-+import java.util.Hashtable;
-+import org.eclipse.core.runtime.URIUtil;
-+import org.eclipse.equinox.internal.p2.core.ProvisioningAgent;
-+import org.eclipse.equinox.internal.p2.engine.EngineActivator;
-+import org.eclipse.equinox.internal.p2.repository.Activator;
-+import org.eclipse.equinox.internal.p2.repository.helpers.IMasterProfilePreferencesProvider;
-+import org.eclipse.equinox.p2.core.IAgentLocation;
-+import org.eclipse.equinox.p2.core.IProvisioningAgent;
-+import org.osgi.framework.ServiceRegistration;
-+import org.osgi.service.prefs.Preferences;
-+
-+public class MasterProfilePreferencesProvider implements IMasterProfilePreferencesProvider {
-+
-+   public Preferences getMasterPreferences(String profileName, String node) {
-+
-+       URI location;
-+       try {
-+           String sharedConfig = Activator.getContext().getProperty("osgi.sharedConfiguration.area"); //$NON-NLS-1$
-+
-+           if (sharedConfig == null)
-+               return null;
-+           //find where the profile is located by default
-+           location = URIUtil.fromString(sharedConfig + "../p2" + '/'); //$NON-NLS-1$
-+
-+       } catch (URISyntaxException e1) {
-+           //should not happen as Equinox will complain first.
-+           return null;
-+       }
-+
-+       if (location == null) {
-+           // no master location, quit
-+           return null;
-+       }
-+
-+       // This is copied from tests
-+       ProvisioningAgent agent = new ProvisioningAgent();
-+       agent.setLocation(location);
-+       agent.setBundleContext(EngineActivator.getContext());
-+       IAgentLocation agentLocation = (IAgentLocation) agent.getService(IAgentLocation.SERVICE_NAME);
-+       Hashtable<String, String> props = new Hashtable<String, String>();
-+       props.put("locationURI", location.toString()); //$NON-NLS-1$
-+
-+       @SuppressWarnings("rawtypes")
-+       ServiceRegistration reg = EngineActivator.getContext().registerService(IProvisioningAgent.SERVICE_NAME, agent, props);
-+       try {
-+           return new ProfileScope(agentLocation, profileName).getNode(node);
-+       } finally {
-+           reg.unregister();
-+       }
-+   }
-+}
-diff --git a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
-index e32ff0f..b1d12c1 100644
---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
-@@ -26,7 +26,8 @@
-    org.eclipse.equinox.p2.operations,
-    org.eclipse.equinox.p2.repository.tools,
-    org.eclipse.equinox.p2.ui,
--   org.eclipse.equinox.p2.updatesite",
-+   org.eclipse.equinox.p2.updatesite,
-+   org.eclipse.equinox.p2.engine",
-  org.eclipse.equinox.internal.provisional.p2.repository,
-  org.eclipse.equinox.p2.repository;version="2.0.0",
-  org.eclipse.equinox.p2.repository.artifact;version="2.1.0",
-@@ -41,6 +42,7 @@
-  CDC-1.1/Foundation-1.1
- Bundle-ActivationPolicy: lazy
- Import-Package: javax.xml.parsers,
-+ org.eclipse.core.internal.preferences,
-  org.eclipse.core.runtime.jobs,
-  org.eclipse.core.runtime.preferences;version="3.2.0",
-  org.eclipse.equinox.internal.p2.core,
-diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/IMasterProfilePreferencesProvider.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/IMasterProfilePreferencesProvider.java
-new file mode 100644
-index 0000000..fac54ea
---- /dev/null
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/IMasterProfilePreferencesProvider.java
-@@ -0,0 +1,22 @@
-+/*******************************************************************************
-+ * Copyright (c) 2012 Red Hat,Inc. and others.
-+ * All rights reserved. This program and the accompanying materials
-+ * are made available under the terms of the Eclipse Public License v1.0
-+ * which accompanies this distribution, and is available at
-+ * http://www.eclipse.org/legal/epl-v10.html
-+ * 
-+ * Contributors:
-+ *     Red Hat,Inc. - initial API and implementation
-+ *******************************************************************************/
-+package org.eclipse.equinox.internal.p2.repository.helpers;
-+
-+import org.osgi.service.prefs.Preferences;
-+
-+/**
-+ * This service does its best to locate master profile and get preferences
-+ * stored in master ProfileScope.
-+ *
-+ */
-+public interface IMasterProfilePreferencesProvider {
-+   public Preferences getMasterPreferences(String profileName, String node);
-+}
---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java.orig	2012-05-05 15:24:03.000000000 +0200
-+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java	2012-05-18 16:18:18.029669647 +0200
-@@ -9,6 +9,7 @@
-  *     IBM Corporation - initial API and implementation
-  *     Wind River - fix for bug 299227
-  *     Sonatype, Inc. - transport split
-+ *     Red Hat,Inc. - fix for bug 249133
-  *******************************************************************************/
- package org.eclipse.equinox.internal.p2.repository.helpers;
- 
-@@ -33,6 +34,7 @@
- import org.eclipse.osgi.util.NLS;
- import org.osgi.service.prefs.BackingStoreException;
- import org.osgi.service.prefs.Preferences;
-+import org.osgi.util.tracker.ServiceTracker;
- 
- /**
-  * Common code shared between artifact and metadata repository managers.
-@@ -981,6 +983,61 @@
- 		saveToPreferences();
- 	}
- 
-+   private void restoreFromMasterPreferences() {
-+       // restore the list of repositories from the preference store
-+       Preferences node = getPreferences();
-+       if (node == null)
-+           return;
-+
-+       {
-+           ServiceTracker<IMasterProfilePreferencesProvider, IMasterProfilePreferencesProvider> tracker = new ServiceTracker<IMasterProfilePreferencesProvider, IMasterProfilePreferencesProvider>(Activator.getContext(), IMasterProfilePreferencesProvider.class.getName(), null);
-+           tracker.open();
-+           IMasterProfilePreferencesProvider pprovider = tracker.getService();
-+	    if(pprovider == null) return;
-+           String profileName = node.parent().parent().name();
-+           String nodeName = node.parent().name();
-+
-+           Preferences rootNode = pprovider.getMasterPreferences(profileName, nodeName);
-+
-+           if (rootNode == null)
-+               return;
-+
-+           /*repositories*/
-+           node = rootNode.node(NODE_REPOSITORIES);
-+       }
-+
-+       String[] children;
-+       try {
-+           children = node.childrenNames();
-+       } catch (BackingStoreException e) {
-+           log("Error restoring repositories from preferences", e); //$NON-NLS-1$
-+           return;
-+       }
-+
-+       for (int i = 0; i < children.length; i++) {
-+           Preferences child = node.node(children[i]);
-+           URI location = getRepositoryLocation(child);
-+           if (location == null) {
-+               try {
-+                   child.removeNode();
-+                   continue;
-+               } catch (BackingStoreException e) {
-+                   log("Error removing invalid repository", e); //$NON-NLS-1$
-+               }
-+           }
-+           RepositoryInfo<T> info = new RepositoryInfo<T>();
-+           info.location = location;
-+           info.name = child.get(KEY_NAME, null);
-+           info.nickname = child.get(KEY_NICKNAME, null);
-+           info.description = child.get(KEY_DESCRIPTION, null);
-+           info.isSystem = child.getBoolean(KEY_SYSTEM, false);
-+           info.isEnabled = child.getBoolean(KEY_ENABLED, true);
-+           info.suffix = child.get(KEY_SUFFIX, null);
-+           repositories.put(getKey(info.location), info);
-+        }
-+    }
-+
-+
- 	private void restoreFromSystemProperty() {
- 		String locationString = Activator.getContext().getProperty(getRepositorySystemProperty());
- 		if (locationString != null) {
-@@ -1004,6 +1062,7 @@
- 			restoreSpecialRepositories();
- 			restoreFromSystemProperty();
- 			restoreFromPreferences();
-+			restoreFromMasterPreferences();
- 		}
- 	}
- 

eclipse-remove-jgit-provider.patch

@@ -1,22 +1,35 @@
---- eclipse-parent/pom.xml.bak	2012-08-09 16:08:45.000000000 +0200
-+++ eclipse-parent/pom.xml	2012-08-09 16:10:22.504134998 +0200
-@@ -165,19 +165,9 @@
-           <groupId>org.eclipse.tycho</groupId>
+--- 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>
+           <dependencies>
 -            <dependency>
--              <groupId>org.eclipse.tycho.extras</groupId>
--              <artifactId>tycho-buildtimestamp-jgit</artifactId>
--              <version>${tycho-extras.version}</version>
++            <!-- dependency>
+               <groupId>org.eclipse.tycho.extras</groupId>
+               <artifactId>tycho-buildtimestamp-jgit</artifactId>
+               <version>${tycho-extras.version}</version>
+@@ -492,19 +492,19 @@
+               <groupId>org.eclipse.tycho.extras</groupId>
+               <artifactId>tycho-sourceref-jgit</artifactId>
+               <version>${tycho-extras.version}</version>
 -            </dependency>
--          </dependencies>
++            </dependency-->
+           </dependencies>
            <configuration>
              <strictBinIncludes>false</strictBinIncludes>
-             <format>'v'yyyyMMdd-HHmm</format>
+             <format>${qualifier.format}</format>
 -            <timestampProvider>jgit</timestampProvider>
--            <jgit.ignore>
--            </jgit.ignore>
-           </configuration>
-         </plugin>
-         <plugin>
++            <!--timestampProvider>jgit</timestampProvider-->
+             <jgit.ignore>
+               pom.xml
+             </jgit.ignore>
+             <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree-platformDefault}</jgit.dirtyWorkingTree>
+-            <sourceReferences>
++            <!--sourceReferences>
+               <generate>true</generate>
+-            </sourceReferences>
++            </sourceReferences-->
+             <archive>
+               <addMavenDescriptor>false</addMavenDescriptor>
+             </archive>

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

@@ -1,29 +0,0 @@
---- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.orig	2012-02-24 09:22:22.000000000 +0100
-+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml	2012-02-24 14:23:21.289474792 +0100
-@@ -124,13 +124,6 @@
-          unpack="false"/>
- 
-    <plugin
--         id="org.w3c.dom.smil"
--         download-size="0"
--         install-size="0"
--         version="1.0.0.qualifier"
--         unpack="false"/>
--
--   <plugin
-          id="javax.inject"
-          download-size="0"
-          install-size="0"
-@@ -138,10 +131,10 @@
-          unpack="false"/>
- 
-    <plugin
--         id="javax.annotation"
-+         id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec"
-          download-size="0"
-          install-size="0"
--         version="1.0.0.qualifier"
-+         version="0.0.0"
-          unpack="false"/>
- 
-    <plugin

eclipse-remove-weaving.patch

@@ -1,52 +0,0 @@
---- rt.equinox.bundles/features/org.eclipse.equinox.sdk/feature.xml.bak	2012-07-25 17:41:27.000000000 +0200
-+++ rt.equinox.bundles/features/org.eclipse.equinox.sdk/feature.xml	2012-07-27 12:52:29.414656054 +0200
-@@ -40,10 +40,6 @@
-          version="0.0.0"/>
- 
-    <includes
--         id="org.eclipse.equinox.weaving.sdk"
--         version="0.0.0"/>
--
--   <includes
-          id="org.eclipse.equinox.core.feature"
-          version="0.0.0"/>
- 
---- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.bak	2012-07-25 17:26:52.000000000 +0200
-+++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml	2012-07-27 14:50:27.668209657 +0200
-@@ -351,12 +351,6 @@
-          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"
-          install-size="0"
-@@ -404,14 +398,14 @@
-          download-size="0"
-          install-size="0"
-          version="0.0.0"/>
--         
--    <plugin
-+
-+   <plugin
-          id="org.eclipse.equinox.bidi.tests"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"/>
--         
--    <plugin
-+
-+   <plugin
-          id="org.eclipse.update.core"
-          download-size="0"
-          install-size="0"
-@@ -419,4 +413,3 @@
-          unpack="false"/>
- 
- </feature>
--

eclipse-secondary-arches.patch

@@ -0,0 +1,197 @@
+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
+@@ -418,6 +418,36 @@
+          install-size="0"
+          version="0.0.0"
+          fragment="true"/>
++         
++   <plugin
++         id="org.eclipse.equinox.launcher.gtk.linux.arm"
++         os="linux"
++         ws="gtk"
++         arch="arm"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"/>
++
++   <plugin
++         id="org.eclipse.equinox.launcher.gtk.linux.aarch64"
++         os="linux"
++         ws="gtk"
++         arch="aarch64"
++         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"
+@@ -496,6 +526,39 @@
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.swt.gtk.linux.s390x"
++         os="linux"
++         ws="gtk"
++         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"
++         ws="gtk"
++         arch="arm"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++
++   <plugin
++         id="org.eclipse.swt.gtk.linux.aarch64"
++         os="linux"
++         ws="gtk"
++         arch="aarch64"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
+          fragment="true"
+          unpack="false"/>
+ 
+--- 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
++
++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>
++      </activation>
++      <modules>
++	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
++      </modules>
++    </profile>
++    <profile>
++      <id>build-native-launchers-gtk.linux.s390x</id>
++      <activation>
++	<property>
++	  <name>native</name>
++	  <value>gtk.linux.s390x</value>
++        </property>
++      </activation>
++      <modules>
++	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
++      </modules>
++    </profile>
+   </profiles>
+ 
+   <modules>

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

@@ -0,0 +1,320 @@
+--- 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>
+ 
+     <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" />
+-
++      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}" />
+-
+-
+     <delete
+-      verbose="false"
+-      dir="${platformLocation}/eclipse" />
++      removeNotFollowedSymlinks="true" failonerror="false" verbose="false">
++      <fileset dir="${platformLocation}/eclipse" followsymlinks="false" />
++    </delete>
+     <exec
+       dir="${platformLocation}"
+       executable="tar">
+@@ -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>
+ 
+@@ -1948,6 +1922,8 @@
+     <antcall target="jdttext" />
+     <antcall target="jdtuirefactoring" />
+   </target>
++  <target name="distroCustomTests" depends="init">
++  </target>
+   <target
+     name="quickTests"
+     depends="init">
+@@ -2057,6 +2033,20 @@
+ 
+   </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}/split-xml" includes="*.xml" />
++    </junitreport>
++    <!-- Generate top-level HTML report -->
++    <xslt style="${executionDir}/JUNIT.XSL" basedir="${results}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${results}/html" />
++  </target>
++
+   <!--
+     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" />
+-    <antcall target="equinoxp2discovery" />
+     <antcall target="bidi" />
+     <antcall target="ltkuirefactoringtests" />
+     <antcall target="ltkcorerefactoringtests" />
+@@ -2115,7 +2102,6 @@
+     <antcall target="osgi" />
+     <antcall target="coreresources" />
+     <antcall target="equinoxp2" />
+-    <antcall target="teamcvs" />
+     <antcall target="jface" />
+     <antcall target="ui" />
+     <antcall target="uiperformance" />
+--- 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() {
++    # 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/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
++    fi
++    export DISPLAY
++}
++
++function setupXvnc() {
++    # Pick a high display number.
++    port=`expr '(' $RANDOM '*' 9 / 32767 ')' + 58`
++    echo localhost > Xvnc.cfg
++    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 cleanupXvnc() {
++    # Clean up if we used Xvnc
++    if [ -e Xvnc.cfg ]
++    then
++        kill $Xvncpid
++        rm Xvnc.cfg
++    fi
++}
++
+ echo "command line as passed into $(basename ${0}): ${*}"
+ echo "command line (quoted) as passed into $(basename ${0}): ${@}"
+ 
+@@ -166,6 +205,8 @@
+ if [[ "true" == "${START_WINDOW_MGT}" ]]
+ then 
+  ./startWindowManager.sh
++else
++ findXvncAndSetDisplay
+ fi
+ 
+ # 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
+ 
+-
++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}" />

eclipse.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Eclipse
-Comment=Eclipse Integrated Development Environment
-Icon=eclipse
-Exec=eclipse
-Terminal=false
-Categories=Development;IDE;Java;

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,17 +0,0 @@
-#!/bin/bash
-
-rm -rf R4_platform-aggregator
-
-git clone -b Juno_RC4_R4 --recurse-submodules  git://git.eclipse.org/gitroot/cbi/platform-aggregator.git R4_platform-aggregator
-
-find . -type d -name ".git" -exec rm -rf {} \;
-
-find . -type f -name "*.class" -exec rm -rf {} \;
-
-find . -name *.jar -exec rm -rf {} \;
-
-find . -type f -name *.so -exec rm -rf {} \;
-find . -type f -name *.dll -exec rm -rf {} \;
-find . -type f -name *.jnilib -exec rm -rf {} \;
-
-tar cjf eclipse-source.tar.bz R4_platform-aggregator

macros.eclipse

@@ -1,16 +0,0 @@
-# RPM macros for eclipse packages.
-#
-
-# There is no guarantee that %%{_libdir} will resolve properly on
-# noarch so we use this macro.
-%_eclipse_bits %(rpm --eval %{__isa_bits} | sed 's/32//')
-%_eclipse_base %{_prefix}/lib%{_eclipse_bits}/eclipse
-
-
-#symlinking platform repos
-%_symlink \
-_pattern="%1" \
-_target="%2" \
-_f=`ls | grep -e "^${_pattern}"`; \
-rm -rf {_f} ; \
-ln -s %{_javadir}/${_target} ${_f}

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 @@
-cb058e425a067773e648a78d4e3ada27  eclipse-source.tar.bz2
-0caade338914415a37f767b7758148ea  org.eclipse.linuxtools.eclipse-build-701400b0ca475ea73bd828c66b00fb63c5ec2c8c.tar.bz2
+SHA512 (eclipse-platform-sources-I20180822-0800.tar.xz) = c1158fa81c21a1fe9d09fd814062e55623b4ceca34be9b44c50f917f14bab8643e29ec6d20879c01b107fb93e68de4af553edea0fb606add870230d0498a03ef
+SHA512 (org.eclipse.linuxtools.eclipse-build-23577466b35eaf62bee3b00090f4fbedc555b4e6.tar.xz) = d268ea945c33b997c79b390f9592c1139f52dc39ebdb7ea7155d41301459827f576389e20080462ad22f2aef833857626df983bbb2abe30845e79ca74a194bea