Fix BR/R on eclipse-ecf-core.

.gitignore

@@ -1,14 +1,16 @@
+eclipse-*-src.tar.bz2
 *.rpm
 eclipse-build-*.tar.gz
 eclipse-build-*.tar.xz
+eclipse-3.8.0-*-src.tar.bz2
+eclipse-4.2.0-I20120405-1114-src.tar.bz2
 /R4_platform-aggregator-*
+/eclipse-source.tar.bz2
 /eclipse-jdtpdeupdatesite.tar.bz2
 /x86_64
+/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
+/R4_platform-aggregator-2caa8794a57a9479ad642d7f6e3607a020aa36e0.tar.bz2
+/testbundle-to-eclipse-test-799cfaa9dea173f10b2ec8eecedfa60f33a26498.tar.xz

.project

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

eclipse-adjust-droplets.patch

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

eclipse-bug-386377.patch

@@ -0,0 +1,600 @@
+From 7aae376547c5f3306e311ce91c475c9a9667a0a0 Mon Sep 17 00:00:00 2001
+From: Krzysztof Daniel <kdaniel@redhat.com>
+Date: Tue, 30 Jul 2013 12:22:42 +0200
+Subject: [PATCH] Build executables in the first run.
+
+---
+ bundles/org.eclipse.equinox.executable/pom.xml     | 265 ---------------------
+ .../pom.xml                                        |  56 ++++-
+ .../pom.xml                                        |  55 +++++
+ .../pom.xml                                        |  55 +++++
+ .../pom.xml                                        |  56 +++++
+ .../pom.xml                                        |  56 +++++
+ 6 files changed, 277 insertions(+), 266 deletions(-)
+
+diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
+index 5a15c5b..d4fb54e 100644
+--- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
++++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/pom.xml
+@@ -28,5 +28,59 @@
+     <ws>cocoa</ws>
+     <arch>x86_64</arch>
+   </properties>
+-
++	<profiles>
++	 <profile>
++      <id>build-native-launchers-cocoa.macosx.x86_64</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>cocoa.macosx.x86_64</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <version> 1.7 </version>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/carbon/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/carbon/" target="build_eclipse"/>
++                  </target>
++                </configuration>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++              </execution>
++            </executions>
++            <dependencies>
++              <dependency>
++                <groupId>bsf</groupId>
++                <artifactId>bsf</artifactId>
++                <version>2.4.0</version>
++              </dependency>
++              <dependency>
++                <groupId>rhino</groupId>
++                <artifactId>js</artifactId>
++                <version>1.7R2</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-apache-bsf</artifactId>
++                <version>1.8.3</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-nodeps</artifactId>
++                <version>1.8.1</version>
++              </dependency>
++            </dependencies>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++	</profiles>
+ </project>
+diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
+index 59f46ae..e7616ed 100644
+--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/pom.xml
+@@ -28,4 +28,59 @@
+     <ws>gtk</ws>
+     <arch>x86</arch>
+   </properties>
++  <profiles>
++  <profile>
++      <id>build-native-launchers-gtk.linux.x86</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>gtk.linux.x86</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <version> 1.7 </version>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++                  </target>
++                </configuration>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++              </execution>
++            </executions>
++            <dependencies>
++              <dependency>
++                <groupId>bsf</groupId>
++                <artifactId>bsf</artifactId>
++                <version>2.4.0</version>
++              </dependency>
++              <dependency>
++                <groupId>rhino</groupId>
++                <artifactId>js</artifactId>
++                <version>1.7R2</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-apache-bsf</artifactId>
++                <version>1.8.3</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-nodeps</artifactId>
++                <version>1.8.1</version>
++              </dependency>
++            </dependencies>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++  </profiles>
+ </project>
+diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
+index d639b6e..8bf7d74 100644
+--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
+@@ -28,4 +28,59 @@
+     <ws>gtk</ws>
+     <arch>x86_64</arch>
+   </properties>
++  <profiles>
++  <profile>
++      <id>build-native-launchers-gtk.linux.x86_64</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>gtk.linux.x86_64</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <version> 1.7 </version>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++                  </target>
++                </configuration>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++              </execution>
++            </executions>
++            <dependencies>
++              <dependency>
++                <groupId>bsf</groupId>
++                <artifactId>bsf</artifactId>
++                <version>2.4.0</version>
++              </dependency>
++              <dependency>
++                <groupId>rhino</groupId>
++                <artifactId>js</artifactId>
++                <version>1.7R2</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-apache-bsf</artifactId>
++                <version>1.8.3</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-nodeps</artifactId>
++                <version>1.8.1</version>
++              </dependency>
++            </dependencies>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++  </profiles>
+ </project>
+diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
+index e0b59be..f82005c 100644
+--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
++++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/pom.xml
+@@ -29,4 +29,60 @@
+     <ws>win32</ws>
+     <arch>x86</arch>
+   </properties>
++  
++  <profiles>
++  <profile>
++      <id>build-native-launchers-win32.win32.x86</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>win32.win32.x86</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <version> 1.7 </version>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
++                  </target>
++                </configuration>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++              </execution>
++            </executions>
++            <dependencies>
++              <dependency>
++                <groupId>bsf</groupId>
++                <artifactId>bsf</artifactId>
++                <version>2.4.0</version>
++              </dependency>
++              <dependency>
++                <groupId>rhino</groupId>
++                <artifactId>js</artifactId>
++                <version>1.7R2</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-apache-bsf</artifactId>
++                <version>1.8.3</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-nodeps</artifactId>
++                <version>1.8.1</version>
++              </dependency>
++            </dependencies>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++  </profiles>
+ </project>
+diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
+index ce4252c..4b72b1f 100644
+--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
++++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/pom.xml
+@@ -29,4 +29,60 @@
+     <ws>win32</ws>
+     <arch>x86_64</arch>
+   </properties>
++  
++  <profiles>
++  <profile>
++      <id>build-native-launchers-win32.win32.x86_64</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>win32.win32.x86_64</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <version> 1.7 </version>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/win32/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/win32/" target="build_eclipse"/>
++                  </target>
++                </configuration>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++              </execution>
++            </executions>
++            <dependencies>
++              <dependency>
++                <groupId>bsf</groupId>
++                <artifactId>bsf</artifactId>
++                <version>2.4.0</version>
++              </dependency>
++              <dependency>
++                <groupId>rhino</groupId>
++                <artifactId>js</artifactId>
++                <version>1.7R2</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-apache-bsf</artifactId>
++                <version>1.8.3</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-nodeps</artifactId>
++                <version>1.8.1</version>
++              </dependency>
++            </dependencies>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++  </profiles>
+ </project>
+diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
+index ce4252c..4b72b1f 100644
+--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/pom.xml
+@@ -27,4 +27,60 @@
+     <ws>gtk</ws>
+     <arch>s390</arch>
+   </properties>
++  
++  <profiles>
++  <profile>
++      <id>build-native-launchers-gtk.linux.s390</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>gtk.linux.s390</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <version> 1.7 </version>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++                  </target>
++                </configuration>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++              </execution>
++            </executions>
++            <dependencies>
++              <dependency>
++                <groupId>bsf</groupId>
++                <artifactId>bsf</artifactId>
++                <version>2.4.0</version>
++              </dependency>
++              <dependency>
++                <groupId>rhino</groupId>
++                <artifactId>js</artifactId>
++                <version>1.7R2</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-apache-bsf</artifactId>
++                <version>1.8.3</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-nodeps</artifactId>
++                <version>1.8.1</version>
++              </dependency>
++            </dependencies>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++  </profiles>
+ </project>
+diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
+index ce4252c..4b72b1f 100644
+--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/pom.xml
+@@ -27,4 +27,60 @@
+     <ws>gtk</ws>
+     <arch>s390x</arch>
+   </properties>
++  
++  <profiles>
++  <profile>
++      <id>build-native-launchers-gtk.linux.s390x</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>gtk.linux.s390x</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <version> 1.7 </version>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++                  </target>
++                </configuration>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++              </execution>
++            </executions>
++            <dependencies>
++              <dependency>
++                <groupId>bsf</groupId>
++                <artifactId>bsf</artifactId>
++                <version>2.4.0</version>
++              </dependency>
++              <dependency>
++                <groupId>rhino</groupId>
++                <artifactId>js</artifactId>
++                <version>1.7R2</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-apache-bsf</artifactId>
++                <version>1.8.3</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-nodeps</artifactId>
++                <version>1.8.1</version>
++              </dependency>
++            </dependencies>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++  </profiles>
+ </project>
+diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
+index ce4252c..4b72b1f 100644
+--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/pom.xml
+@@ -29,4 +29,60 @@
+     <ws>gtk</ws>
+     <arch>ppc</arch>
+   </properties>
++  
++  <profiles>
++  <profile>
++      <id>build-native-launchers-gtk.linux.ppc</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>gtk.linux.ppc</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <version> 1.7 </version>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++                  </target>
++                </configuration>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++              </execution>
++            </executions>
++            <dependencies>
++              <dependency>
++                <groupId>bsf</groupId>
++                <artifactId>bsf</artifactId>
++                <version>2.4.0</version>
++              </dependency>
++              <dependency>
++                <groupId>rhino</groupId>
++                <artifactId>js</artifactId>
++                <version>1.7R2</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-apache-bsf</artifactId>
++                <version>1.8.3</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-nodeps</artifactId>
++                <version>1.8.1</version>
++              </dependency>
++            </dependencies>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++  </profiles>
+ </project>
+diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
+index ce4252c..4b72b1f 100644
+--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
++++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/pom.xml
+@@ -28,4 +28,60 @@
+     <ws>gtk</ws>
+     <arch>ppc64</arch>
+   </properties>
++  
++  <profiles>
++  <profile>
++      <id>build-native-launchers-gtk.linux.ppc64</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>gtk.linux.ppc64</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <version> 1.7 </version>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="../../../../features/org.eclipse.equinox.executable.feature/library/gtk/build.xml" dir="../../features/org.eclipse.equinox.executable.feature/library/gtk/" target="build_eclipse"/>
++                  </target>
++                </configuration>
++                <goals>
++                  <goal>run</goal>
++                </goals>
++              </execution>
++            </executions>
++            <dependencies>
++              <dependency>
++                <groupId>bsf</groupId>
++                <artifactId>bsf</artifactId>
++                <version>2.4.0</version>
++              </dependency>
++              <dependency>
++                <groupId>rhino</groupId>
++                <artifactId>js</artifactId>
++                <version>1.7R2</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-apache-bsf</artifactId>
++                <version>1.8.3</version>
++              </dependency>
++              <dependency>
++                <groupId>org.apache.ant</groupId>
++                <artifactId>ant-nodeps</artifactId>
++                <version>1.8.1</version>
++              </dependency>
++            </dependencies>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++  </profiles>
+ </project>
+-- 
+1.8.3.1
+

eclipse-bug-404448.patch

@@ -0,0 +1,222 @@
+--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c"
++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c"
+@@ -11321,6 +11321,24 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(_1gtk_1image_1new_1from_1pixbuf)
+ }
+ #endif
+ 
++#ifndef NO__1gtk_1image_1set_1from_1gicon
++JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1gicon)
++	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2)
++{
++	OS_NATIVE_ENTER(env, that, _1gtk_1image_1set_1from_1gicon_FUNC);
++/*
++	gtk_image_set_from_gicon((GtkImage *)arg0, (GIcon *)arg1, (GtkIconSize)arg2);
++*/
++	{
++		OS_LOAD_FUNCTION(fp, gtk_image_set_from_gicon)
++		if (fp) {
++			((void (CALLING_CONVENTION*)(GtkImage *, GIcon *, GtkIconSize))fp)((GtkImage *)arg0, (GIcon *)arg1, (GtkIconSize)arg2);
++		}
++	}
++	OS_NATIVE_EXIT(env, that, _1gtk_1image_1set_1from_1gicon_FUNC);
++}
++#endif
++
+ #ifndef NO__1gtk_1image_1set_1from_1pixbuf
+ JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1image_1set_1from_1pixbuf)
+ 	(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1)
+--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h"
++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h"
+@@ -175,6 +175,7 @@
+ #define gtk_icon_info_free_LIB LIB_GTK
+ #define gtk_icon_set_render_icon_LIB LIB_GTK
+ #define gtk_icon_theme_lookup_by_gicon_LIB LIB_GTK
++#define gtk_image_set_from_gicon_LIB LIB_GTK
+ #define gdk_keyboard_ungrab_LIB LIB_GDK
+ #define gtk_icon_theme_get_default_LIB LIB_GTK
+ #define gtk_menu_item_remove_submenu_LIB LIB_GTK
+--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c"
++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c"
+@@ -818,6 +818,7 @@ char * OS_nativeFunctionNames[] = {
+ 	"_1gtk_1image_1menu_1item_1set_1image",
+ 	"_1gtk_1image_1new",
+ 	"_1gtk_1image_1new_1from_1pixbuf",
++	"_1gtk_1image_1set_1from_1gicon",
+ 	"_1gtk_1image_1set_1from_1pixbuf",
+ 	"_1gtk_1init_1check",
+ 	"_1gtk_1label_1get_1layout",
+--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h"
++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h"
+@@ -828,6 +828,7 @@ typedef enum {
+ 	_1gtk_1image_1menu_1item_1set_1image_FUNC,
+ 	_1gtk_1image_1new_FUNC,
+ 	_1gtk_1image_1new_1from_1pixbuf_FUNC,
++	_1gtk_1image_1set_1from_1gicon_FUNC,
+ 	_1gtk_1image_1set_1from_1pixbuf_FUNC,
+ 	_1gtk_1init_1check_FUNC,
+ 	_1gtk_1label_1get_1layout_FUNC,
+--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java"
++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java"
+@@ -8266,6 +8266,21 @@ public static final void gtk_image_set_from_pixbuf(long /*int*/ image, long /*in
+ 	}
+ }
+ /**
++ * @method flags=dynamic
++ * @param image cast=(GtkImage *)
++ * @param gicon cast=(GIcon *)
++ * @param size cast=(GtkIconSize)
++ */
++public static final native void _gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon, int size);
++public static final void gtk_image_set_from_gicon(long /*int*/ image, long /*int*/ gicon, int size) {
++	lock.lock();
++	try {
++		_gtk_image_set_from_gicon(image, gicon, size);
++	} finally {
++		lock.unlock();
++	}
++}
++/**
+  * @param argc cast=(int *)
+  * @param argv cast=(char ***)
+  */
+--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java"
++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java"
+@@ -875,11 +875,11 @@ public void setImage (Image image) {
+ 		imageList = new ImageList ();
+ 		int imageIndex = imageList.add (image);
+ 		long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
+-		OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
++		gtk_image_set_from_pixbuf(imageHandle, pixbuf);
+ 		if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
+ 		OS.gtk_widget_show (imageHandle);
+ 	} else {
+-		OS.gtk_image_set_from_pixbuf (imageHandle, 0);
++		gtk_image_set_from_pixbuf (imageHandle, 0);
+ 		OS.gtk_widget_show (labelHandle);
+ 		OS.gtk_widget_hide (imageHandle);
+ 	}
+--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java"
++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandItem.java"
+@@ -535,11 +535,11 @@ public void setImage (Image image) {
+ 		imageList = new ImageList ();
+ 		int imageIndex = imageList.add (image);
+ 		long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
+-		OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
++		gtk_image_set_from_pixbuf (imageHandle, pixbuf);
+ 		if (text.length () == 0) OS.gtk_widget_hide (labelHandle);
+ 		OS.gtk_widget_show (imageHandle);
+ 	} else {
+-		OS.gtk_image_set_from_pixbuf (imageHandle, 0);
++		gtk_image_set_from_pixbuf (imageHandle, 0);
+ 		OS.gtk_widget_show (labelHandle);
+ 		OS.gtk_widget_hide (imageHandle);
+ 	}
+--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java"
++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Label.java"
+@@ -535,11 +535,11 @@ public void setImage (Image image) {
+ 		imageList = new ImageList ();
+ 		int imageIndex = imageList.add (image);
+ 		long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
+-		OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
++		gtk_image_set_from_pixbuf (imageHandle, pixbuf);
+ 		OS.gtk_widget_hide (labelHandle);
+ 		OS.gtk_widget_show (imageHandle);
+ 	} else {
+-		OS.gtk_image_set_from_pixbuf (imageHandle, 0);
++		gtk_image_set_from_pixbuf (imageHandle, 0);
+ 		OS.gtk_widget_show (labelHandle);
+ 		OS.gtk_widget_hide (imageHandle);
+ 	}
+--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java"
++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabItem.java"
+@@ -307,10 +307,10 @@ public void setImage (Image image) {
+ 			imageList.put (imageIndex, image);
+ 		}
+ 		long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
+-		OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
++		gtk_image_set_from_pixbuf (imageHandle, pixbuf);
+ 		OS.gtk_widget_show (imageHandle);
+ 	} else {
+-		OS.gtk_image_set_from_pixbuf (imageHandle, 0);
++		gtk_image_set_from_pixbuf (imageHandle, 0);
+ 		OS.gtk_widget_hide (imageHandle);
+ 	}
+ }
+--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java"
++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java"
+@@ -553,10 +553,10 @@ public void setImage (Image image) {
+ 		int imageIndex = headerImageList.indexOf (image);
+ 		if (imageIndex == -1) imageIndex = headerImageList.add (image);
+ 		long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex);
+-		OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
++		gtk_image_set_from_pixbuf (imageHandle, pixbuf);
+ 		OS.gtk_widget_show (imageHandle);
+ 	} else {
+-		OS.gtk_image_set_from_pixbuf (imageHandle, 0);
++		gtk_image_set_from_pixbuf (imageHandle, 0);
+ 		OS.gtk_widget_hide (imageHandle);
+ 	}
+ }
+--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java"
++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java"
+@@ -608,7 +608,7 @@ long /*int*/ gtk_enter_notify_event (long /*int*/ widget, long /*int*/ event) {
+ 			int index = imageList.indexOf (hotImage);
+ 			if (index != -1 && imageHandle != 0) {
+ 				long /*int*/ pixbuf = imageList.getPixbuf (index);
+-				OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
++				gtk_image_set_from_pixbuf(imageHandle, pixbuf);
+ 			}
+ 		}
+ 	}
+@@ -652,7 +652,7 @@ long /*int*/ gtk_leave_notify_event (long /*int*/ widget, long /*int*/ event) {
+ 				int index = imageList.indexOf (image);
+ 				if (index != -1 && imageHandle != 0) {
+ 					long /*int*/ pixbuf = imageList.getPixbuf (index);
+-					OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
++					gtk_image_set_from_pixbuf(imageHandle, pixbuf);
+ 				}
+ 			}
+ 		}	
+@@ -998,9 +998,9 @@ public void setImage (Image image) {
+ 			imageList.put (imageIndex, image);
+ 		}
+ 		long /*int*/ pixbuf = imageList.getPixbuf (imageIndex);
+-		OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
++		gtk_image_set_from_pixbuf(imageHandle, pixbuf);
+ 	} else {
+-		OS.gtk_image_set_from_pixbuf(imageHandle, 0);
++		gtk_image_set_from_pixbuf(imageHandle, 0);
+ 	}
+ 	/*
+ 	* If Text/Image of a tool-item changes, then it is 
+--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java"
++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java"
+@@ -550,10 +550,10 @@ public void setImage (Image image) {
+ 		int imageIndex = headerImageList.indexOf (image);
+ 		if (imageIndex == -1) imageIndex = headerImageList.add (image);
+ 		long /*int*/ pixbuf = headerImageList.getPixbuf (imageIndex);
+-		OS.gtk_image_set_from_pixbuf (imageHandle, pixbuf);
++		gtk_image_set_from_pixbuf (imageHandle, pixbuf);
+ 		OS.gtk_widget_show (imageHandle);
+ 	} else {
+-		OS.gtk_image_set_from_pixbuf (imageHandle, 0);
++		gtk_image_set_from_pixbuf (imageHandle, 0);
+ 		OS.gtk_widget_hide (imageHandle);
+ 	}
+ }
+--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java"
++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java"
+@@ -2171,4 +2171,13 @@ void gtk_widget_get_preferred_size (long /*int*/ widget, GtkRequisition requisit
+ 		OS.gtk_widget_size_request (widget, requisition);
+ 	}
+ }
++
++void gtk_image_set_from_pixbuf (long /*int*/ imageHandle, long /*int*/ pixbuf){
++	if (OS.GTK3) {
++		OS.gtk_image_set_from_gicon(imageHandle, pixbuf, OS.GTK_ICON_SIZE_SMALL_TOOLBAR);
++	} else {
++		OS.gtk_image_set_from_pixbuf(imageHandle, pixbuf);
++	}
++}
++
+ }

eclipse-bug-408505.patch

@@ -0,0 +1,21 @@
+--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java.bak	2013-01-28 12:16:08.000000000 +0100
++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java	2013-02-19 13:22:29.529926456 +0100
+@@ -987,7 +987,17 @@ int setBounds (int x, int y, int width, int height, boolean move, boolean resize
+ 			allocation.width = width;
+ 			allocation.height = height;
+ 		}
+-		OS.gtk_widget_size_allocate (topHandle, allocation);
++		/*
++		 * The widget needs to be shown before its size is allocated
++		 * in GTK 3.8 otherwise its allocation return 0
++		 */
++		if (OS.GTK_VERSION >= OS.VERSION (3, 8, 0) && !OS.gtk_widget_get_visible(handle))  {
++			OS.gtk_widget_show(handle);
++			OS.gtk_widget_size_allocate (topHandle, allocation);
++			OS.gtk_widget_hide(handle);
++		} else {
++			OS.gtk_widget_size_allocate (topHandle, allocation);
++		}
+ 	}
+ 	/*
+ 	* Bug in GTK.  Widgets cannot be sized smaller than 1x1.

eclipse-bug-903537.patch

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

eclipse-change-build-packagings.patch

@@ -0,0 +1,52 @@
+--- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml.orig	2014-03-12 10:25:46.000000000 +0000
++++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml	2014-03-12 12:17:01.623708316 +0000
+@@ -46,7 +46,7 @@
+                             <profile>SDKProfile</profile>
+                             <products>
+                                 <product>
+-                                    <id>org.eclipse.platform.ide</id>
++                                    <id>org.fedoraproject.eclipse.platform</id>
+                                     <rootFolder>eclipse</rootFolder>
+                                 </product>
+                             </products>
+--- eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product.orig	2014-03-12 12:17:01.624708315 +0000
++++ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product	2014-03-12 12:54:18.543754231 +0000
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <?pde version="3.5"?>
+ 
+-<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.2.qualifier" useFeatures="true" includeLaunchers="true">
++<product name="Eclipse Platform" uid="org.fedoraproject.eclipse.platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.3.2.qualifier" useFeatures="true" includeLaunchers="true">
+ 
+    <configIni use="default">
+    </configIni>
+@@ -161,6 +161,7 @@
+       <feature id="org.eclipse.rcp.configuration"/>
+       <feature id="org.eclipse.platform"/>
+       <feature id="org.eclipse.equinox.p2.user.ui"/>
++      <feature id="org.eclipse.cvs"/>
+    </features>
+ 
+    <configurations>
+--- eclipse.platform.releng.tychoeclipsebuilder/pom.xml.orig	2014-03-12 10:25:46.000000000 +0000
++++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml	2014-03-12 12:17:01.625708314 +0000
+@@ -34,5 +34,6 @@
+         <module>osgistarter.config.launcher</module>
+         <module>equinox.starterkit.product</module>
+         <module>eclipse-junit-tests</module>
++        <module>jdtpde</module>
+     </modules>
+ </project>
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml.orig	2014-03-12 12:17:01.625708314 +0000
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml	2014-03-12 12:58:21.458878371 +0000
+@@ -566,4 +566,10 @@
+          version="0.0.0"
+          unpack="false"/>
+ 
++   <plugin
++         id="org.eclipse.jdt.core"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
+ </feature>

eclipse-debug-symbols.patch

@@ -1,23 +1,35 @@
---- 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 @@
+--- "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak.orig"	2014-03-12 10:43:26.000000000 +0000
++++ "eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak"	2014-03-12 14:36:44.130938292 +0000
+@@ -115,7 +115,7 @@
+ WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
  
- MAKE_TYPE=make
+-CFLAGS = -O -Wall \
++CFLAGS = -g -O -Wall \
+ 		-DSWT_VERSION=$(SWT_VERSION) \
+ 		$(NATIVE_STATS) \
+ 		-DLINUX -DGTK \
+@@ -125,12 +125,6 @@
+ 		${SWT_PTR_CFLAGS}
+ LFLAGS = -shared -fPIC ${SWT_LFLAGS}
  
--export CFLAGS='-O -Wall -fPIC'
-+export CFLAGS='-O -g -Wall -fPIC'
-+export NO_STRIP=1
+-ifndef NO_STRIP
+-	AWT_LFLAGS := $(AWT_LFLAGS) -s
+-	MOZILLALFLAGS := $(MOZILLALFLAGS) -s
+-	LFLAGS := $(LFLAGS) -s
+-endif
+-
+ all: make_swt make_atk make_glx make_webkit
  
- # 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\""
+@@ -48,7 +48,7 @@
+  -DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
+  -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
  LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic 
--CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\
-+CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -Wall\
+-CFLAGS = ${M_ARCH} -g -s -Wall\
++CFLAGS = ${M_ARCH} -g -Wall\
  	-fpic \
  	-DLINUX \
- 	-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
+ 	-DMOZILLA_FIX \

eclipse-disable-droplets-in-dropins.patch

@@ -1,47 +0,0 @@
-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

@@ -1,28 +0,0 @@
-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

@@ -0,0 +1,36 @@
+--- 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
+@@ -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-feature-plugins-to-category-ius.patch

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

eclipse-fix-comaptibility-class.patch

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

eclipse-fix-dropins.patch

@@ -1,6 +1,14 @@
---- 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 @@
+--- 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
+@@ -7,6 +7,7 @@
+  * Contributors: 
+  *     IBM Corporation - initial API and implementation
+  *     Ericsson AB - ongoing development
++ *     Red Hat, Inc. - Bug 408138
+  ******************************************************************************/
+ package org.eclipse.equinox.internal.p2.engine;
+ 
+@@ -38,6 +39,7 @@ import org.xml.sax.SAXException;
  
  public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
  
@@ -8,9 +16,9 @@
  	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());
+@@ -263,6 +265,14 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
+ 					internalSetProfileStateProperty(profile, profile.getTimestamp(), IProfile.STATE_PROP_SHARED_INSTALL, IProfile.STATE_SHARED_INSTALL_VALUE_NEW);
+ 					internalSetProfileStateProperty(profile, profile.getTimestamp(), SIMPLE_PROFILE_REGISTRY_INTERNAL + getBaseTimestamp(profile.getProfileId()), getBaseTimestamp(id));
  					agent.registerService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP, Long.toString(profile.getTimestamp()));
 +
 +					// this looks like a hack, but:
@@ -23,20 +31,19 @@
  				} 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 @@
+@@ -279,6 +289,12 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
  		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$
++		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;
-+		}
++			return true;}
  		String baseTimestamp = getBaseTimestamp(profile.getProfileId());
- 		String extTimestamp = getExtTimeStamp();
- 		if (baseTimestamp == null) {
+ 		if (baseTimestamp == null)
+ 			return false;
 --- 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 @@
@@ -75,11 +82,11 @@
  		}
  		return engine.perform(plan, phaseSet, monitor);
  	}
---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java.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 @@
+--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java	2013-06-10 09:33:20.000000000 +0200
++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java	2013-06-11 15:44:28.654682088 +0200
+@@ -151,7 +151,7 @@
+ 	}
  
- 	@Override
  	public boolean performCancel() {
 -		String[] buttons = new String[] {IDialogConstants.YES_LABEL, ProvUIMessages.MigrationPage_LATER_BUTTON, IDialogConstants.NO_LABEL};
 +		String[] buttons = new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL};

eclipse-fix-startup-class-refresh.patch

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

eclipse-fix-swt-build-in-rawhide.patch

@@ -0,0 +1,11 @@
+--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h.bak	2013-01-28 12:16:08.000000000 +0100
++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h	2013-02-07 12:03:27.234528249 +0100
+@@ -18,7 +18,7 @@
+ 
+ #define NDEBUG
+ 
+-#define G_DISABLE_DEPRECATED
++/*#define G_DISABLE_DEPRECATED*/
+ #define GTK_DISABLE_SINGLE_INCLUDES
+ /*
+ #define GTK_DISABLE_DEPRECATED

eclipse-fix-tests.patch

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

eclipse-help-doc-adjust-dependencies.patch

@@ -0,0 +1,79 @@
+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,7 +50,7 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.apache.jasper.glassfish"
++         id="org.glassfish.web.javax.servlet.jsp"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+--- eclipse.platform.ua/org.eclipse.ua.tests/pom.xml.bak	2013-01-28 12:30:27.000000000 +0100
++++ eclipse.platform.ua/org.eclipse.ua.tests/pom.xml	2013-01-28 19:23:02.071410170 +0100
+@@ -22,4 +22,29 @@
+   <artifactId>org.eclipse.ua.tests</artifactId>
+   <version>3.3.600-SNAPSHOT</version>
+   <packaging>eclipse-test-plugin</packaging>
++  
++    <build>
++    <plugins>
++      <plugin> 
++        <groupId>org.eclipse.tycho</groupId> 
++        <artifactId>target-platform-configuration</artifactId> 
++        <configuration> 
++          <dependency-resolution> 
++            <extraRequirements> 
++              <requirement> 
++                <type>eclipse-plugin</type> 
++                <id>org.apache.lucene.core</id> 
++                <versionRange>[3.0,4.0)</versionRange> 
++              </requirement>
++              <requirement>
++                <type>eclipse-plugin</type>
++                <id>org.apache.lucene.analysis</id>
++                <versionRange>[3.0,4.0)</versionRange>
++              </requirement>
++            </extraRequirements>
++          </dependency-resolution>
++        </configuration>
++      </plugin>
++    </plugins>
++   </build>
+ </project>
+          --- eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF.orig	2013-02-20 17:00:07.000000000 +0100
++++ eclipse.platform.ua/org.eclipse.ua.tests/META-INF/MANIFEST.MF	2013-02-21 16:29:42.318407536 +0100
+@@ -25,9 +25,9 @@
+ Bundle-ClassPath: ua-tests.jar
+ Import-Package: javax.servlet;version="2.4.0",
+  javax.servlet.http;version="2.4.0",
+- org.apache.lucene.index;core=split;version="[3.5.0,4.0.0)",
+- org.apache.lucene.search;core=split;version="[3.5.0,4.0.0)",
+- org.apache.lucene.store;core=split;version="[3.5.0,4.0.0)"
++ org.apache.lucene.index;version="[3.5.0,4.0.0)",
++ org.apache.lucene.search;version="[3.5.0,4.0.0)",
++ org.apache.lucene.store;version="[3.5.0,4.0.0)"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Export-Package: org.eclipse.ua.tests,
+  org.eclipse.ua.tests.browser,
+--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak	2013-03-14 11:18:11.000000000 +0100
++++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml	2013-03-14 12:29:48.067564008 +0100
+@@ -31,7 +31,7 @@
+             <extraRequirements>
+               <requirement>
+                 <type>eclipse-plugin</type>
+-                <id>org.apache.lucene</id>
++                <id>org.apache.lucene.core</id>
+                 <versionRange>[3.5,4.0)</versionRange>
+               </requirement>
+               <requirement>

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

@@ -1,64 +0,0 @@
-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,6 @@
---- 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 @@
+--- 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 @@
  				String appVersion = props.getProperty(PRODUCT_SITE_VERSION);
  				if (appVersion == null || appVersion.trim().length() == 0)
  					appVersion = ""; //$NON-NLS-1$
@@ -9,9 +9,9 @@
  			} 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 @@
+--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java.bak	2013-05-29 08:55:02.000000000 +0200
++++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java	2013-05-29 12:54:07.106821218 +0200
+@@ -1359,7 +1359,7 @@
  				String appVersion = props.getProperty(PRODUCT_SITE_VERSION);
  				if (appVersion == null || appVersion.trim().length() == 0)
  					appVersion = ""; //$NON-NLS-1$

eclipse-jetty-9.patch

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

eclipse-make-droplets-runnable.patch

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

eclipse-mockito.patch

@@ -1,70 +0,0 @@
---- 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,6 +1,6 @@
 --- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml.bak	2012-07-25 17:45:43.000000000 +0200
 +++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml	2012-07-31 07:41:13.103636303 +0200
-@@ -40,6 +40,25 @@
+@@ -39,6 +39,21 @@
                <excludes>
                  <plugin id="org.sat4j.core"/>
                  <plugin id="org.sat4j.pb"/>
@@ -19,22 +19,18 @@
 +		 <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
-@@ -34,6 +34,17 @@
+@@ -53,6 +53,17 @@
              <goals>
                <goal>source-feature</goal>
              </goals>
 +            <configuration>
 +              <excludes>
-+                <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" /><plugin id="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" />
@@ -46,20 +42,19 @@
            </execution>
          </executions>
        </plugin>
---- 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 @@
+--- eclipse.pde/org.eclipse.pde-feature/pom.xml.bak	2013-01-29 11:22:47.065953870 +0100
++++ eclipse.pde/org.eclipse.pde-feature/pom.xml	2013-01-29 11:23:18.630196529 +0100
+@@ -36,6 +36,7 @@
              <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 @@
+@@ -59,6 +59,8 @@
                <excludes>
                  <plugin id="org.eclipse.jdt"/>
                  <plugin id="org.eclipse.jdt.doc.user"/>
@@ -68,58 +63,106 @@
                </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"/>
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties.bak	2013-03-14 11:18:11.000000000 +0100
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties	2013-03-14 12:45:12.956174290 +0100
+@@ -15,10 +15,7 @@
+ license.html
+ 
+ 
+-generate.feature@org.eclipse.rcp.source=org.eclipse.rcp,feature@org.eclipse.e4.rcp.source,plugin@com.ibm.icu.source;version=50.1.0.qualifier;unpack="false",\
+-plugin@org.apache.felix.gogo.command.source;version=0.10.0.qualifier;unpack="false",\
+-plugin@org.apache.felix.gogo.runtime.source;version=0.10.0.qualifier;unpack="false",\
+-plugin@org.apache.felix.gogo.shell.source;version=0.10.0.qualifier;unpack="false"
++generate.feature@org.eclipse.rcp.source=org.eclipse.rcp,feature@org.eclipse.e4.rcp.source,plugin@com.ibm.icu.source;version=50.1.0.qualifier;unpack="false"
+ 
+ generate.feature@org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.user.ui,\
+            feature@org.eclipse.equinox.p2.core.feature.source,\
+@@ -31,16 +28,6 @@
+            plugin@org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\
+            plugin@org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
+            plugin@org.eclipse.ecf.provider.filetransfer.httpclient4.source;version=1.0.200.qualifier;unpack="false",\
+-           plugin@org.eclipse.ecf.provider.filetransfer.httpclient4.ssl.source;version=1.0.0.qualifier;unpack="false",\
+-           plugin@org.apache.commons.codec.source;version=1.4.0.qualifier;unpack="false,\
+-           plugin@org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"
++           plugin@org.eclipse.ecf.provider.filetransfer.httpclient4.ssl.source;version=1.0.0.qualifier;unpack="false"
+            
+-generate.feature@org.eclipse.e4.rcp.source=org.eclipse.e4.rcp,\
+- plugin@javax.annotation.source;version=1.1.0.qualifier;unpack="false",\
+- plugin@javax.inject.source;version=1.0.0.qualifier;unpack="false",\
+- plugin@org.apache.batik.css.source;version=1.6.0.qualifier;unpack="false",\
+- plugin@org.apache.batik.util.gui.source;version=1.6.0.qualifier;unpack="false",\
+- plugin@org.apache.batik.util.source;version=1.6.0.qualifier;unpack="false",\
+- plugin@org.w3c.dom.smil.source;version=1.0.0.qualifier;unpack="false",\
+- plugin@org.w3c.dom.svg.source;version=1.1.0.qualifier;unpack="false",\
+- plugin@org.w3c.css.sac.source;version=1.3.1.qualifier;unpack="false"
++generate.feature@org.eclipse.e4.rcp.source=org.eclipse.e4.rcp
+\ No newline at end of file
+--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.bak	2013-03-14 11:35:02.000000000 +0100
++++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml	2013-03-14 12:53:51.015502076 +0100
+@@ -72,6 +72,14 @@
+                 <plugin id="org.w3c.css.sac"/>
+                 <plugin id="org.w3c.dom.smil"/>
+                 <plugin id="org.w3c.dom.svg"/>
++                
++                <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" />
++				<plugin id="org.apache.felix.gogo.command" />
++				<plugin id="javax.inject" />
++				<plugin id="com.ibm.icu"/>
++				<plugin id="org.apache.felix.gogo.runtime" />
++				<plugin id="org.eclipse.equinox.launcher.gtk.linux.arm" />
++				<plugin id="org.apache.felix.gogo.shell" />
+               </excludes>
+             </configuration>
+           </execution>
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.bak	2013-03-14 11:18:11.000000000 +0100
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml	2013-03-14 12:57:12.344569351 +0100
+@@ -76,6 +76,12 @@
+                 <plugin id="org.eclipse.update.core.linux"/>
+                 <plugin id="org.eclipse.update.core.win32"/>
+                 <plugin id="org.eclipse.equinox.security.macosx"/>
++
 +                <plugin id="com.jcraft.jsch"/>
 +                <plugin id="org.apache.ant"/>
++                <plugin id="org.eclipse.core.filesystem.linux.arm"/>
++                <plugin id="org.eclipse.core.filesystem.linux.s390"/>
++                <plugin id="org.eclipse.core.filesystem.linux.s390x"/>
                </excludes>
              </configuration>
            </execution>
---- 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"/>
+--- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.bak	2013-03-14 11:18:11.000000000 +0100
++++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties	2013-03-14 13:00:08.498377327 +0100
+@@ -11,31 +11,12 @@
+ bin.includes=feature.xml,feature.properties
  
--   <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"
+ generate.feature@org.eclipse.platform.source=org.eclipse.platform,feature@org.eclipse.rcp.source,feature@org.eclipse.equinox.p2.user.ui.source;optional="true",plugin@org.eclipse.platform.doc.isv;unpack="false",\
+-  plugin@org.apache.ant.source;version=1.8.4.qualifier;unpack="false",\
+-  plugin@com.jcraft.jsch.source;version=0.1.46.qualifier;unpack="false",\
+   exclude@org.eclipse.platform.doc.user
+    
+ generate.feature@org.eclipse.jdt.source=org.eclipse.jdt, plugin@org.eclipse.jdt.doc.isv;unpack="false",\
+-plugin@org.junit.source;version=4.10.0.qualifier;unpack="false",\
+-plugin@org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
+ exclude@org.eclipse.jdt.doc.user
+-generate.feature@org.eclipse.pde.source=org.eclipse.pde,plugin@org.objectweb.asm.source;version=3.3.1.qualifier;unpack="false",\exclude@org.eclipse.pde.doc.user
++generate.feature@org.eclipse.pde.source=org.eclipse.pde,\exclude@org.eclipse.pde.doc.user
+ generate.feature@org.eclipse.cvs.source=org.eclipse.cvs
+-generate.feature@org.eclipse.help.source=org.eclipse.help,\
+-  plugin@javax.servlet.source;version=3.0.0.qualifier;unpack="false",\
+-  plugin@javax.servlet.jsp.source;version=2.2.0.qualifier;unpack="false",\
+-  plugin@org.apache.jasper.glassfish.source;version=2.2.2.qualifier;unpack="false",\
+-  plugin@com.sun.el.source;version=2.2.0.qualifier;unpack="false",\
+-  plugin@org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\
+-  plugin@org.apache.lucene.analysis.source;version=3.5.0.qualifier;unpack="false",\
+-  plugin@org.apache.lucene.core.source;version=3.5.0.qualifier;unpack="false",\
+-  plugin@org.eclipse.jetty.continuation.source;version=8.1.9.qualifier;unpack="false",\
+-  plugin@org.eclipse.jetty.http.source;version=8.1.9.qualifier;unpack="false",\
+-  plugin@org.eclipse.jetty.io.source;version=8.1.9.qualifier;unpack="false",\
+-  plugin@org.eclipse.jetty.security.source;version=8.1.9.qualifier;unpack="false",\
+-  plugin@org.eclipse.jetty.server.source;version=8.1.9.qualifier;unpack="false",\
+-  plugin@org.eclipse.jetty.servlet.source;version=8.1.9.qualifier;unpack="false",\
+-  plugin@org.eclipse.jetty.util.source;version=8.1.9.qualifier;unpack="false",\
+-  plugin@javax.el.source;version=2.2.0.qualifier;unpack="false"
+-
++generate.feature@org.eclipse.help.source=org.eclipse.help
++  
+ generatedVersionLength=45

eclipse-no-target-platform.patch

@@ -0,0 +1,16 @@
+--- eclipse-platform-parent/pom.xml.orig	2014-03-13 11:09:45.344247777 +0000
++++ eclipse-platform-parent/pom.xml	2014-03-13 11:09:57.979242733 +0000
+@@ -146,13 +146,6 @@
+         <groupId>org.eclipse.tycho</groupId>
+         <artifactId>target-platform-configuration</artifactId>
+         <configuration>
+-          <target>
+-            <artifact>
+-              <groupId>org.eclipse</groupId>
+-              <artifactId>eclipse-sdk-prereqs</artifactId>
+-              <version>4.3.0-SNAPSHOT</version>
+-            </artifact>
+-          </target>
+           <environments>
+             <environment>
+               <os>linux</os>

eclipse-osgi-unpack-sources.patch

@@ -0,0 +1,106 @@
+--- rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties.bak	2013-05-10 10:19:28.000000000 +0200
++++ rt.equinox.framework/bundles/org.eclipse.osgi.services/build.properties	2013-05-10 11:29:48.359120855 +0200
+@@ -16,8 +16,11 @@
+ 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/
+\ No newline at end of file
+--- rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml.bak	2013-05-10 10:19:28.000000000 +0200
++++ rt.equinox.framework/bundles/org.eclipse.osgi.services/pom.xml	2013-05-10 11:28:11.292306529 +0200
+@@ -27,18 +27,79 @@
+       <plugin>
+         <groupId>org.eclipse.tycho</groupId>
+         <artifactId>target-platform-configuration</artifactId>
+-        <!-- 
+-        When building monolith, optional import-package javax.microedition.io causes circular dependency
+-        between this org.eclipse.osgi.services bundle and org.eclipse.equinox.io. 
+-        Since this bundle does not need to compile anything, we just disable optional dependencies during
+-        the build. 
+-         -->
+         <configuration>
+           <dependency-resolution>
+-            <optionalDependencies>ignore</optionalDependencies>
++            <optionalDependencies>ignore</optionalDependencies>
++			<extraRequirements>
++              <requirement>
++                <type>eclipse-plugin</type>
++                <id>javax.servlet</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>
++                  </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>
+ 

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	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);
+--- 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);

eclipse-pde-tp-support-droplets.patch

@@ -1,114 +0,0 @@
-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

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

eclipse-remove-jgit-provider.patch

@@ -1,6 +1,6 @@
---- 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 @@
+--- eclipse-platform-parent/pom.xml.orig	2014-03-12 10:25:46.000000000 +0000
++++ eclipse-platform-parent/pom.xml	2014-03-12 12:12:56.387914854 +0000
+@@ -308,7 +308,7 @@
            <artifactId>tycho-packaging-plugin</artifactId>
            <version>${tycho.version}</version>
            <dependencies>
@@ -9,27 +9,27 @@
                <groupId>org.eclipse.tycho.extras</groupId>
                <artifactId>tycho-buildtimestamp-jgit</artifactId>
                <version>${tycho-extras.version}</version>
-@@ -492,19 +492,19 @@
+@@ -317,19 +317,19 @@
                <groupId>org.eclipse.tycho.extras</groupId>
                <artifactId>tycho-sourceref-jgit</artifactId>
                <version>${tycho-extras.version}</version>
 -            </dependency>
-+            </dependency-->
++            </dependency -->
            </dependencies>
            <configuration>
              <strictBinIncludes>false</strictBinIncludes>
-             <format>${qualifier.format}</format>
+             <format>'v'yyyyMMdd-HHmm</format>
 -            <timestampProvider>jgit</timestampProvider>
 +            <!--timestampProvider>jgit</timestampProvider-->
              <jgit.ignore>
-               pom.xml
+ 		pom.xml
              </jgit.ignore>
-             <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree-platformDefault}</jgit.dirtyWorkingTree>
+             <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree>
 -            <sourceReferences>
 +            <!--sourceReferences>
                <generate>true</generate>
 -            </sourceReferences>
 +            </sourceReferences-->
              <archive>
-               <addMavenDescriptor>false</addMavenDescriptor>
+                <addMavenDescriptor>false</addMavenDescriptor>
              </archive>

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

@@ -0,0 +1,45 @@
+--- 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,7 +131,7 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="javax.annotation"
++         id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml.orig	2013-02-20 16:43:17.000000000 +0100
++++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml	2013-02-21 09:51:19.981788507 +0100
+@@ -61,7 +61,7 @@
+                   </requirement>
+                   <requirement>
+                     <type>eclipse-plugin</type>
+-                    <id>javax.annotation</id>
++                    <id>org.apache.geronimo.specs.geronimo-annotation_1.1_spec</id>
+                     <versionRange>0.0.0</versionRange>
+                   </requirement>
+                   <requirement>
+@@ -96,7 +96,7 @@
+                   </requirement>
+                   <requirement>
+                     <type>eclipse-plugin</type>
+-                    <id>org.apache.jasper.glassfish</id>
++                    <id>org.glassfish.web.javax.servlet.jsp</id>
+                     <versionRange>0.0.0</versionRange>
+                   </requirement>
+                   <requirement>

eclipse-remove-weaving.patch

@@ -0,0 +1,41 @@
+--- eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml.orig	2013-04-04 12:20:00.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml	2013-04-08 11:01:33.236100147 +0200
+@@ -349,12 +349,6 @@
+          version="0.0.0"/>
+ 
+    <plugin
+-         id="org.eclipse.releng.tests"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"/>
+-
+-   <plugin
+          id="org.eclipse.team.tests.cvs.core"
+          download-size="0"
+          install-size="0"
+@@ -392,12 +386,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"
+@@ -416,12 +404,6 @@
+          version="0.0.0"/>
+ 
+    <plugin
+-         id="org.eclipse.equinox.p2.tests.discovery"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"/>
+-
+-   <plugin
+          id="org.eclipse.equinox.p2.tests.ui"
+          download-size="0"
+          install-size="0"

eclipse-secondary-arches.patch

@@ -1,13 +1,284 @@
+diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
+index 6c567f8..969eafb 100644
+--- a/eclipse-platform-parent/pom.xml
++++ b/eclipse-platform-parent/pom.xml
+@@ -205,29 +205,9 @@
+               <arch>x86_64</arch>
+             </environment>
+             <environment>
+-              <os>solaris</os>
++              <os>linux</os>
+               <ws>gtk</ws>
+-              <arch>sparc</arch>
+-            </environment>
+-            <environment>
+-              <os>solaris</os>
+-              <ws>gtk</ws>
+-              <arch>x86</arch>
+-            </environment>
+-            <environment>
+-              <os>hpux</os>
+-              <ws>gtk</ws>
+-              <arch>ia64</arch>
+-            </environment>
+-            <environment>
+-              <os>aix</os>
+-              <ws>gtk</ws>
+-              <arch>ppc</arch>
+-            </environment>
+-            <environment>
+-              <os>aix</os>
+-              <ws>gtk</ws>
+-              <arch>ppc64</arch>
++              <arch>arm</arch>
+             </environment>
+           </environments>
+         </configuration>
+diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+index 80a32e4..85de879 100644
+--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
++++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+@@ -27,6 +27,8 @@ root.solaris.gtk.sparc.permissions.755=eclipse
+ root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
+ root.solaris.gtk.x86.permissions.755=eclipse
+ 
++root.linux.gtk.arm=target/resources/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm
++root.linux.gtk.arm.permissions.755=eclipse 
+ root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
+ root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
+ root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
+diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
+index bb03da8..257d417 100644
+--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
++++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
+@@ -19,6 +19,25 @@
+                 <artifactId>maven-resources-plugin</artifactId>
+                 <version>2.6</version>
+                 <executions>
++        <execution>
++            <id>copy-resources-gtk.linux.arm</id>
++            <phase>validate</phase>
++            <goals>
++              <goal>copy-resources</goal>
++            </goals>
++            <configuration>
++              <outputDirectory>${basedir}/target/resources/linux.gtk.arm</outputDirectory>
++              <resources>
++                <resource>
++                  <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.arm</directory>
++                  <includes>
++                    <include>about_files/*</include>
++                    <include>about.html</include>
++                  </includes>
++                </resource>
++              </resources>
++            </configuration>
++          </execution>
+                     <execution>
+                         <id>copy-resources-gtk.linux.x86</id>
+                         <phase>validate</phase>
+diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
+index 03bf359..3acacc2 100644
+--- a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
++++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
+@@ -134,8 +134,56 @@
+          version="0.0.0"
+          fragment="true"
+          unpack="false"/>
++         
++   <plugin
++         id="org.eclipse.core.net.linux.ppc"
++         os="linux"
++         arch="ppc"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
+ 
+    <plugin
++         id="org.eclipse.core.net.linux.ppc64"
++         os="linux"
++         arch="ppc64"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++         
++   <plugin
++         id="org.eclipse.core.net.linux.arm"
++         os="linux"
++         arch="arm"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++   <plugin
++         id="org.eclipse.core.net.linux.s390"
++         os="linux"
++         arch="s390"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++   <plugin
++         id="org.eclipse.core.net.linux.s390x"
++         os="linux"
++         arch="s390x"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++         
++   <plugin
+          id="org.eclipse.core.resources"
+          download-size="0"
+          install-size="0"
+@@ -405,6 +462,53 @@
+          version="0.0.0"
+          fragment="true"
+          unpack="false"/>
++         
++   <plugin
++         id="org.eclipse.core.filesystem.linux.ppc"
++         os="linux"
++         arch="ppc"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++<plugin
++         id="org.eclipse.core.filesystem.linux.ppc64"
++         os="linux"
++         arch="ppc64"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++   <plugin
++         id="org.eclipse.core.filesystem.linux.s390"
++         os="linux"
++         arch="s390"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++<plugin
++         id="org.eclipse.core.filesystem.linux.s390x"
++         os="linux"
++         arch="s390x"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
++         
++<plugin
++         id="org.eclipse.core.filesystem.linux.arm"
++         os="linux"
++         arch="arm"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"
++         unpack="false"/>
+ 
+    <plugin
+          id="org.eclipse.core.filesystem.linux.x86_64"
+diff --git a/eclipse.platform.resources/pom.xml b/eclipse.platform.resources/pom.xml
+index 4b33285..f522167 100644
+--- a/eclipse.platform.resources/pom.xml
++++ b/eclipse.platform.resources/pom.xml
+@@ -43,6 +43,9 @@
+ 
+   <modules>
+     <module>bundles/org.eclipse.core.filesystem</module>
++    <module>bundles/org.eclipse.core.filesystem.linux.arm</module>
++    <module>bundles/org.eclipse.core.filesystem.linux.s390</module>
++    <module>bundles/org.eclipse.core.filesystem.linux.s390x</module>
+     <module>bundles/org.eclipse.core.filesystem.hpux.ia64</module>
+     <module>bundles/org.eclipse.core.filesystem.hpux.PA_RISC</module>
+     <module>bundles/org.eclipse.core.filesystem.linux.ppc</module>
+diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
+index 7dd0536..66d79ee 100644
+--- a/eclipse.platform.swt.binaries/pom.xml
++++ b/eclipse.platform.swt.binaries/pom.xml
+@@ -53,6 +53,7 @@
+     <module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.s390</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
++    <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
+     <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
+     <module>bundles/org.eclipse.swt.gtk.solaris.sparc</module>
+diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+index 689616e..4caf0a9 100644
+--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	
++++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh	
+@@ -411,7 +411,7 @@ esac
+ 
+ 
+ # For 64-bit CPUs, we have a switch
+-if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64'  -o ${MODEL} = 's390x' ]; then
++if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64' -o ${MODEL} = 'ia64' -o ${MODEL} = 'sparc64'  -o ${MODEL} = 's390x' -o ${MODEL} = 'aarch64' ]; then
+ 	SWT_PTR_CFLAGS=-DJNI64
+ 	if [ -d /lib64 ]; then
+ 		XLIB64=-L/usr/X11R6/lib64
+diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
+index f5fb504..1187e84 100644
+--- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
++++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
+@@ -429,6 +429,7 @@
+ 				<equals arg1="${swt.arch}" arg2="ia64"/>
+ 				<equals arg1="${swt.arch}" arg2="ppc64"/>
+ 				<equals arg1="${swt.arch}" arg2="s390x"/>
++				<equals arg1="${swt.arch}" arg2="aarch64"/>
+ 			</or>
+ 		</condition>
+ 		<echo>Is64=${is64}</echo>
+diff --git a/eclipse.platform.team/pom.xml b/eclipse.platform.team/pom.xml
+index 8637ed3..e36538a 100644
+--- a/eclipse.platform.team/pom.xml
++++ b/eclipse.platform.team/pom.xml
+@@ -63,6 +63,11 @@
+     <module>features/org.eclipse.cvs-feature</module>
+ 
+     <!-- creatively located fragments -->
++    <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.arm</module>
++    <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.ppc</module>
++    <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.ppc64</module>
++    <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.s390</module>
++    <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.s390x</module>
+     <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86</module>
+     <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64</module>
+     <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86</module>
 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 @@
+@@ -420,6 +420,26 @@
           install-size="0"
           version="0.0.0"
           fragment="true"/>
 +         
 +   <plugin
++         id="org.eclipse.equinox.launcher.gtk.linux.ppc"
++         os="linux"
++         ws="gtk"
++         arch="ppc"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         fragment="true"/>
++         
++   <plugin
 +         id="org.eclipse.equinox.launcher.gtk.linux.arm"
 +         os="linux"
 +         ws="gtk"
@@ -15,48 +286,27 @@ index 7e1f520..734dd10 100644
 +         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"
+@@ -584,6 +614,29 @@
           version="0.0.0"
-+         fragment="true"
-+         unpack="false"/>
-+
+          fragment="true"
+          unpack="false"/>
++         
 +   <plugin
-+         id="org.eclipse.swt.gtk.linux.s390x"
++         id="org.eclipse.swt.gtk.linux.ppc"
 +         os="linux"
 +         ws="gtk"
-+         arch="s390x"
++         arch="ppc"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
 +         fragment="true"
 +         unpack="false"/>
-+
++         
++         
 +   <plugin
 +         id="org.eclipse.swt.gtk.linux.arm"
 +         os="linux"
@@ -67,131 +317,265 @@ index 7e1f520..734dd10 100644
 +         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"
+    <plugin
+          id="org.eclipse.swt.gtk.linux.ppc"
+diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
+index 29d3871..45526c8 100644
+--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
+@@ -119,6 +119,16 @@
  				defaultJava=DEFAULT_JAVA_EXEC
--				OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch"
-+				OUTPUT_DIR="$EXEC_DIR/bin/$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>
++			arm*)
++				defaultOSArch="arm"
++				defaultJava=DEFAULT_JAVA_EXEC
++				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
++				;;
++			"aarch64")
++				defaultOSArch="aarch64"
++				defaultJava=DEFAULT_JAVA_EXEC
++				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
++				;;
+ 			*)
+ 				echo "*** Unknown MODEL <${MODEL}>"
+ 				;;
+diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
+index fac13bf..e487001 100644
+--- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
++++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml
+@@ -207,6 +207,221 @@
+         </plugins>
+       </build>
      </profile>
++
++    <profile>
++      <id>build-native-launchers-gtk.linux.ppc</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>gtk.linux.ppc</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <version> 1.7 </version>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="build.xml" dir="library/gtk/" />
++                  </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>
 +    <profile>
 +      <id>build-native-launchers-gtk.linux.ppc64</id>
 +      <activation>
-+	<property>
-+	  <name>native</name>
-+	  <value>gtk.linux.ppc64</value>
++        <property>
++          <name>native</name>
++          <value>gtk.linux.ppc64</value>
 +        </property>
 +      </activation>
-+      <modules>
-+	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
-+      </modules>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <version> 1.7 </version>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="build.xml" dir="library/gtk/" />
++                  </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>
++
++    <profile>
++      <id>build-native-launchers-gtk.linux.arm</id>
++      <activation>
++        <property>
++          <name>native</name>
++          <value>gtk.linux.arm</value>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <version> 1.7 </version>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="build.xml" dir="library/gtk/" />
++                  </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>
 +    <profile>
-+      <id>build-native-launchers-gtk.linux.s390x</id>
++      <id>build-native-launchers-gtk.linux.aarch64</id>
 +      <activation>
-+	<property>
-+	  <name>native</name>
-+	  <value>gtk.linux.s390x</value>
++        <property>
++          <name>native</name>
++          <value>gtk.linux.aarch64</value>
 +        </property>
 +      </activation>
-+      <modules>
-+	<module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390x</module>
-+      </modules>
++      <build>
++        <plugins>
++          <plugin>
++            <artifactId>maven-antrun-plugin</artifactId>
++            <version> 1.7 </version>
++            <executions>
++              <execution>
++                <id>compile-executable-natives</id>
++                <phase>generate-resources</phase>
++                <configuration>
++                  <target>
++                    <ant antfile="build.xml" dir="library/gtk/" />
++                  </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>
- 
-   <modules>
++
+     <profile>
+       <id>build-native-launchers-win32.win32.x86_64</id>
+       <activation>
+diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
+index b46cdc6..0fb36a5 100644
+--- a/rt.equinox.framework/pom.xml
++++ b/rt.equinox.framework/pom.xml
+@@ -53,6 +53,7 @@
+     <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
+     <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
+     <module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module>
++    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
+     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc</module>
+     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
+     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390</module>

eclipse-support-symlink-bundles.patch

@@ -1,159 +0,0 @@
-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

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

eclipse-test-support.patch

@@ -1,222 +1,28 @@
---- 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
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.bak	2013-03-14 11:05:42.000000000 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh	2013-03-14 13:31:19.161559741 +0100
+@@ -1,5 +1,72 @@
+ #!/usr/bin/env bash
  
 +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 ]
++#   if [ ${headless} == 1 ]; then
++        # Try to find Xvnc
++        xvnc=
++        if [ -a /usr/bin/Xvnc ]
 +        then
-+            xvnc=/usr/X11/bin/Xvnc
++            xvnc=/usr/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
++            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
-+    fi
-+    export DISPLAY
++        export DISPLAY
++#   fi
 +}
 +
 +function setupXvnc() {
@@ -226,7 +32,33 @@
 +    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
++    DISPLAY=`$HOST`:$port
++}
++
++function setArch() {
++    if [ "x$buildArch" = "x" ]
++    then
++        if uname -m > /dev/null 2>&1; then
++            arch=`uname -m`
++        else
++            arch=`uname -p`
++        fi
++        # Massage arch for Eclipse-uname differences
++        case $arch in
++            i[0-9]*86)
++                arch=x86 ;;
++            ia64)
++                arch=ia64 ;;
++            ppc)
++                arch=ppc ;;
++            x86_64)
++                arch=x86_64 ;;
++            *)
++                echo "Unrecognized architecture:  $arch" 1>&2
++                exit 1 ;;
++        esac
++        echo >&2 "Architecture not specified.  Assuming host architecture: $arch"
++    fi
 +}
 +
 +function cleanupXvnc() {
@@ -238,83 +70,270 @@
 +    fi
 +}
 +
- echo "command line as passed into $(basename ${0}): ${*}"
- echo "command line (quoted) as passed into $(basename ${0}): ${@}"
+ # This file should never exist or be needed for production machine,
+ # but allows an easy way for a "local user" to provide this file
+ # somewhere on the search path ($HOME/bin is common),
+@@ -92,59 +159,30 @@
+ #necessary when invoking this script through rsh
+ cd $dir
  
-@@ -166,6 +205,8 @@
- if [[ "true" == "${START_WINDOW_MGT}" ]]
- then 
-  ./startWindowManager.sh
-+else
-+ findXvncAndSetDisplay
- fi
++	mkdir -p /tmp/eclipse-tests-directory
++	pushd /tmp/eclipse-tests-directory
++	rm -rf *
++   cp ${testslocation}/*.properties .
++   cp ${testslocation}/library.xml .
+     if [ ! -r eclipse ]
+     then
+-        tar -xzf eclipse-SDK-*.tar.gz
+-        # note, the file pattern to match, must not start with */plugins because there is no leading '/' in the zip file, since they are repos.
+-        unzip -qq -o -C eclipse-junit-tests-*.zip plugins/org.eclipse.test* -d eclipse/dropins/
++        pushd @libdir@
++            tar czf /tmp/eclipse-tests-directory/eclipse-SDK-temp-linux-gtk-x86_64.tar.gz eclipse
++        popd
++        cp -rf @libdir@/eclipse eclipse
+     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
+     # run tests
+     launcher=`ls eclipse/plugins/org.eclipse.equinox.launcher_*.jar`
++findXvncAndSetDisplay
++setArch
++export ANT_HOME=@USR@/share/ant
++@USR@/bin/./ant \
++-file "${testslocation}/test.xml" $tests \
++-Dws=$ws -Dos=$os -Darch=$arch -Dos.arch=$arch \
++-DbuildId=v20120903-1347 -Dbasedir="/tmp/eclipse-tests-directory" \
++-DruntimeArchive="eclipse-SDK-temp-linux-gtk-x86_64.tar.gz" \
++-DrepoLocation="${testslocation}" \
++-Dorg.eclipse.test="3.3.100" \
++-D$installmode=true $properties
  
+-    echo " = = = Start list environment variables in effect = = = ="
+-    env
+-    echo " = = = End list environment variables in effect = = = ="
 -
-+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="" />
+-    # make sure there is a window manager running. See bug 379026
+-    # we should not have to, but may be a quirk/bug of hudson setup
+-    # assuming metacity attaches to "current" display by default (which should have
+-    # already been set by Hudson). We echo its value here just for extra reference/cross-checks.
+-
+-    echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz):"
+-    wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep)
+-    echo "Window Manager processes: $wmpss"
+-    echo
+-
+-    if [[ -z $wmpss ]]
+-    then
+-             echo "No window managers processes found running, so will start metacity"
+-             metacity --replace --sm-disable  &
+-             METACITYPID=$!
+-             echo $METACITYPID > epmetacity.pid
+-     else
+-             echo "Existing window manager found running, so did not force start of metacity"
+-    fi
+-
+-    echo
+-
+-    # list out metacity processes so overtime we can see if they accumulate, or if killed automatically
+-    # when our process exits. If not automatic, should use epmetacity.pid to kill it when we are done.
+-    echo "Current metacity processes running (check for accumulation):"
+-    ps -ef | grep "metacity" | grep -v grep
+-    echo
+-
+-    echo "Triple check if any window managers are running (at least metacity should be!):"
+-    wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep)
+-    echo "Window Manager processes: $wmpss"
+-    echo
+-    echo "extdirprop in runtest: ${extdirprop}"
+-    echo "extdirproperty in runtest: ${extdirproperty}"
+-
+-    # -Dtimeout=300000 "${ANT_OPTS}"
+- if [[ ! -z "${extdirproperty}" ]]
+- then
+-	$vmcmd "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
+- else
+-	$vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch  -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
+- fi
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig	2013-05-01 13:30:04.000000000 +0200
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml	2013-05-03 14:44:17.278068172 +0200
+@@ -175,99 +175,15 @@
  
-         <tstamp prefix="NOW" />
-         <property
-@@ -196,6 +205,17 @@
+     <!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
+     <target name="setupPlatform">
+-        <echo message="os.arch ${os.arch}" />
+-        <loadproperties srcfile="equinoxp2tests.properties" />
+-        <condition
+-            property="platformArchive"
+-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}">
+-            <and>
+-                <os family="unix" />
+-                <not>
+-                    <or>
+-                        <or>
+-                            <os arch="x86_64" />
+-                            <os arch="amd64" />
+-                        </or>
+-                        <os family="mac" />
+-                    </or>
+-                </not>
+-            </and>
+-        </condition>
+-        <condition
+-            property="platformArchive"
+-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64}">
+-            <and>
+-                <os family="mac" />
+-                <os family="unix" />
+-                <or>
+-                    <os arch="x86_64" />
+-                    <os arch="amd64" />
+-                </or>
+-            </and>
+-        </condition>
+-        <condition
+-            property="platformArchive"
+-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx}">
+-            <and>
+-                <os family="mac" />
+-                <os family="unix" />
+-                <!-- should not need, as long as x86_64 rules (above) comes first
+-                <os arch="i386" />
+-                -->
+-            </and>
+-        </condition>
+-        <condition
+-            property="platformArchive"
+-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}">
+-            <and>
+-                <os family="windows" />
+-                <os arch="x86" />
+-            </and>
+-        </condition>
+-        <condition
+-            property="platformArchive"
+-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64}">
+-            <and>
+-                <os family="windows" />
+-                <or>
+-                    <os arch="x86_64" />
+-                    <os arch="amd64" />
+-                </or>
+-            </and>
+-        </condition>
+-        <condition
+-            property="platformArchive"
+-            value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64}">
+-            <and>
+-                <os family="unix" />
+-                <or>
+-                    <os arch="x86_64" />
+-                    <os arch="amd64" />
+-                </or>
+-            </and>
+-        </condition>
+-
+-        <fail
+-            unless="platformArchive"
+-            message="platformArchive is not defined. Check that condidtions cover os arch ${os.arch}. May be VM dependent.)" />
+-
+-        <condition
+-            property="platformTarget"
+-            value="platform-zip">
+-            <contains
+-                string="${platformArchive}"
+-                substring=".zip" />
+-        </condition>
+-        <condition
+-            property="platformTarget"
+-            value="platform-tar.gz">
+-            <contains
+-                string="${platformArchive}"
+-                substring=".tar.gz" />
+-        </condition>
+-        <fail
+-            unless="platformTarget"
+-            message="platformTarget is not defined. Check that platformArchive variable and value is defined correctly, such as in equinoxp2tests.properties in the appropriate testConfig" />
++ 	        <loadproperties srcfile="equinoxp2tests.properties" />
++    	    	    	<property name="platformArchive" value="${runtimeArchive}" />
++    	    	    	        
++    	    	    	<condition property="platformTarget" value="platform-zip">
++    	    	    	      <contains string="${platformArchive}" substring=".zip" />
++    	    	    	</condition>
++    	   	    	<condition property="platformTarget" value="platform-tar.gz">
++    	    	    	       <contains string="${platformArchive}" substring=".tar.gz" />
++    	    	    	</condition>
+         <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
+         <antcall target="${platformTarget}" />
+     </target>
+@@ -295,7 +211,7 @@
+         <exec
+             dir="${platformLocation}"
+             executable="tar">
+-            <arg line="-xzf ${platformArchive}" />
++            <arg line="-xzf ../${platformArchive}" />
+         </exec>
      </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>
+@@ -842,6 +758,18 @@
+                     arg2="" />
+             </not>
+         </condition>
++    	        
++    	        <!-- swt needs this property to run tests -->
++    	        <dirset id="test.plugin.folder" dir="${eclipse-home}/plugins/">
++    	            <include name="${testPlugin}_*" />
++    	        </dirset>
++    	        <property name="testPluginFolder" refid="test.plugin.folder" />
++    	        <echo>trying to find ${testPluginFolder}</echo>
++    	        <condition property="org.eclipse.swt.tests" value="${testPluginFolder}">
++    	                <equals arg1="${testPlugin}" arg2="org.eclipse.swt.tests"/>
++    	        </condition>
++    	  
++    	
+         <antcall target="runSuite" />
+         <antcall target="genResults" />
+     </target>
+@@ -1420,7 +1348,17 @@
+                 name="message"
+                 value="end longRunningTests" />
+         </antcall>
+-
++    	<!-- Copy over the XML to generate a top-level report for all of the tests -->
++    	    	<mkdir dir="${results}/origXml" />
++    			<xslt style="${repoLocation}/splitter.xsl" basedir="${results}/xml" includes="*.xml" destdir="${results}/origXml"/>
 +
-+    <target
-         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}" />
++    	    	<!-- Aggregate XML report files -->
++    	    	<junitreport todir="${results}/xml" tofile="org.eclipse.sdk.tests.xml">
++    	    		<fileset dir="${results}/origXml" includes="*.xml" />
++    	    	</junitreport>
++    	    	
++    	    	<!-- Generate top-level HTML report -->
++    	    	<xslt style="${repoLocation}/JUNIT.XSL" basedir="${results}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${results}/html" />
+     </target>
+ 
+     <!-- 
+@@ -1461,7 +1399,7 @@
+         <antcall target="e4CssSwt" />
+         <antcall target="e4UI" />
+         <antcall target="equinoxds" />
+-        <antcall target="equinoxp2discovery" />
++        <!--antcall target="equinoxp2discovery" /-->
+         <antcall target="bidi" />
+         <antcall target="ltkuirefactoringtests" />
+         <antcall target="ltkcorerefactoringtests" />
+@@ -1475,7 +1413,6 @@
+         <antcall target="osgi" />
+         <antcall target="coreresources" />
+         <antcall target="equinoxp2" />
+-        <antcall target="teamcvs" />
+         <antcall target="jface" />
+         <antcall target="ui" />
+         <antcall target="uiperformance" />
+@@ -1558,7 +1495,7 @@
+         <property
+             name="message"
+             value="no message given by caller" />
+-        <markTime msg="${message}" />
++        <!--markTime msg="${message}" /-->
+     </target>
+ 
+ </project>

fix_ant_build.patch

@@ -1,161 +0,0 @@
---- 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

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -e
+AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
+TAG=R4_3_2
+
+rm -rf R4_platform-aggregator-$TAG
+rm -rf R4_platform-aggregator-$TAG.tar.xz
+
+# adding --depth 1 here may result in a quicker clone, but did not work for me
+git clone --branch $TAG  $AGGREGATOR_PATH R4_platform-aggregator-$TAG
+
+
+pushd R4_platform-aggregator-$TAG
+
+git submodule init
+git submodule update
+
+
+#comment this line to get a shallow clone.
+find . -type d -name ".git" | xargs rm rm -rf 
+
+find . -type f -name *.class -exec rm -rf {} \;
+
+find . -name *.jar -type f -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 {} \;
+
+popd 
+
+tar cJf R4_platform-aggregator-$TAG.tar.xz R4_platform-aggregator-$TAG

prefer_x11_backend.patch

@@ -1,14 +0,0 @@
---- 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 @@
-SHA512 (eclipse-platform-sources-I20180822-0800.tar.xz) = c1158fa81c21a1fe9d09fd814062e55623b4ceca34be9b44c50f917f14bab8643e29ec6d20879c01b107fb93e68de4af553edea0fb606add870230d0498a03ef
-SHA512 (org.eclipse.linuxtools.eclipse-build-23577466b35eaf62bee3b00090f4fbedc555b4e6.tar.xz) = d268ea945c33b997c79b390f9592c1139f52dc39ebdb7ea7155d41301459827f576389e20080462ad22f2aef833857626df983bbb2abe30845e79ca74a194bea
+9b35715f617b17c994d4a279b905daf0  eclipse-build-79dfa1abc0ba06375b42d0015c7f0ceb3759eb5b.tar.xz
+fcab76495cc652ff07986cba7e4af867  R4_platform-aggregator-R4_3_2.tar.xz