From d55be1f00310e2c9c4aa8b960df4fd848a415f55 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Dec 19 2019 06:56:37 +0000 Subject: Update to latest upstream release --- diff --git a/ebz550606.patch b/ebz550606.patch deleted file mode 100644 index 5e68ac8..0000000 --- a/ebz550606.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 890b5826e457d87824a6c61a9fdda45bd407811a Mon Sep 17 00:00:00 2001 -From: Eric Williams -Date: Mon, 9 Sep 2019 15:20:17 -0400 -Subject: Bug 550606: [GTK] Right-click > Rename from Project Explorer - non-functional when starting with only hidden projects - -Adjust the conditions for gdk_window_ensure_native() to ensure it only -gets applied to the right cases. - -Change-Id: I3a57d8674d79bbdc123f11352ab7c7d6b0e807f5 -Signed-off-by: Eric Williams ---- - .../org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java -index 95776fc898..411b8e0540 100644 ---- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java -+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java -@@ -2419,7 +2419,8 @@ long gtk_draw (long widget, long cairo) { - * if the Tree has no items. In such cases, the fix is to ensure that the Tree's GdkWindow - * is a native one. Only X11 is affected by this issue, see bug 541427 for more info. - */ -- if (firstDraw && OS.isX11() && getItemCount() == 0 && GTK.GTK_VERSION >= OS.VERSION(3, 20, 0)) { -+ if (firstDraw && OS.isX11() && getItemCount() == 0 && GTK.GTK_VERSION >= OS.VERSION(3, 20, 0) -+ && !hasChildren && headerVisible) { - long binWindow = GTK.gtk_tree_view_get_bin_window(handle); - GDK.gdk_window_ensure_native(binWindow); - } --- -cgit v1.2.1 - diff --git a/eclipse-disable-droplets-in-dropins.patch b/eclipse-disable-droplets-in-dropins.patch index b45995e..9c78052 100644 --- a/eclipse-disable-droplets-in-dropins.patch +++ b/eclipse-disable-droplets-in-dropins.patch @@ -17,7 +17,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/o 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 -@@ -171,11 +171,24 @@ public class PlatformXmlListener extends DirectoryChangeListener { +@@ -172,11 +172,24 @@ public class PlatformXmlListener extends DirectoryChangeListener { * Ensure that we have a repository for each site in the given configuration. */ protected void synchronizeConfiguration(Configuration config) { diff --git a/eclipse-feature-plugins-to-category-ius.patch b/eclipse-feature-plugins-to-category-ius.patch index b255cc7..78ee4b7 100644 --- a/eclipse-feature-plugins-to-category-ius.patch +++ b/eclipse-feature-plugins-to-category-ius.patch @@ -763,7 +763,7 @@ index ba217da7b..464451193 100644 @@ -791,7 +791,7 @@ index ba217da7b..464451193 100644 diff --git a/eclipse-fix-dropins.patch b/eclipse-fix-dropins.patch index ad260ea..69fd3aa 100644 --- a/eclipse-fix-dropins.patch +++ b/eclipse-fix-dropins.patch @@ -8,7 +8,7 @@ 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$ -@@ -279,6 +280,14 @@ +@@ -274,6 +275,14 @@ //fragments support - remeber the property internalSetProfileStateProperty(profile, profile.getTimestamp(), SIMPLE_PROFILE_REGISTRY_INTERNAL + getExtTimeStamp(), getExtTimeStamp()); agent.registerService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP, Long.toString(profile.getTimestamp())); @@ -23,7 +23,7 @@ } 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); -@@ -312,6 +321,13 @@ +@@ -307,6 +316,13 @@ if (agent.getService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP) != null) return false; diff --git a/eclipse-fix-tests.patch b/eclipse-fix-tests.patch index 39bf472..8712cd5 100644 --- a/eclipse-fix-tests.patch +++ b/eclipse-fix-tests.patch @@ -52,16 +52,16 @@ diff --git 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 @@ +@@ -28,3 +28,6 @@ src.includes = about.html compilerArg=-proc:none - jars.extra.classpath = lib/java10api.jar + jars.extra.classpath = lib/java13api.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 @@ +@@ -28,6 +28,8 @@ Ant Tests/ source.lib/antUITestsSupport.jar = test support/ @@ -73,7 +73,7 @@ index bc8963d..fbe4da3 100644 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 @@ +@@ -25,3 +25,5 @@ leaks/,\ performance/ javacWarnings..=-raw,-unchecked @@ -188,7 +188,7 @@ index bc8963d..fbe4da3 100644 +SearchResultView.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 @@ +@@ -26,6 +26,8 @@ source.anttestscore.jar = test plugin/,\ tests/ source.lib/antTestsSupport.jar = test support/ @@ -226,7 +226,7 @@ index bc8963d..fbe4da3 100644 + --- 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 @@ +@@ -159,13 +159,6 @@ id="org.eclipse.jdt.source.feature.group" version="" /> +--- eclipse.jdt.debug/org.eclipse.jdt.debug.ui/build.properties.orig 2019-12-19 05:19:24.194321737 +0000 ++++ eclipse.jdt.debug/org.eclipse.jdt.debug.ui/build.properties 2019-12-19 05:20:03.702264652 +0000 +@@ -21,6 +21,9 @@ + + src.includes = about.html,\ + schema/ ++source.snippetsupport.jar=Snippet Support/ + source.. = ui/ + output.. = bin/ ++output.snippetsupport.jar = snippet_bin/ + javacWarnings..=-unavoidableGenericProblems ++javacWarnings.snippersupport.jar=-unavoidableGenericProblems diff --git a/eclipse-ignore-version-when-calculating-home.patch b/eclipse-ignore-version-when-calculating-home.patch index b5e77b2..6e95c61 100644 --- a/eclipse-ignore-version-when-calculating-home.patch +++ b/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 -@@ -1351,7 +1351,7 @@ +@@ -1348,7 +1348,7 @@ String appVersion = props.getProperty(PRODUCT_SITE_VERSION); if (appVersion == null || appVersion.trim().length() == 0) appVersion = ""; //$NON-NLS-1$ diff --git a/eclipse-make-droplets-runnable.patch b/eclipse-make-droplets-runnable.patch index e1d1abc..155d7b8 100644 --- a/eclipse-make-droplets-runnable.patch +++ b/eclipse-make-droplets-runnable.patch @@ -19,7 +19,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.extensionlocation/src/or 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 -@@ -283,6 +283,22 @@ public class ExtensionLocationArtifactRepository extends AbstractRepository props = new Hashtable(); +- Dictionary props = new Hashtable<>(); - props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "S16"); - props.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/Servlet16/*"); - registrations.add(getBundleContext().registerService(Servlet.class, servlet, props)); - -- Map> map = new HashMap>(); +- Map> map = new HashMap<>(); - - map.put("file", Arrays.asList(getClass().getResource("blue.png"))); - @@ -110,6 +109,8 @@ - Assert.assertEquals("200", result.get("responseCode").get(0)); - Assert.assertEquals("blue.png|image/png|292", result.get("responseBody").get(0)); - } - - @Test +- +- @Test public void test_PathEncodings_Bug540970() throws Exception { + Servlet servlet = new HttpServlet() { + private static final long serialVersionUID = 1L; diff --git a/eclipse-pde-tp-support-droplets.patch b/eclipse-pde-tp-support-droplets.patch index eed248a..d8ddc39 100644 --- a/eclipse-pde-tp-support-droplets.patch +++ b/eclipse-pde-tp-support-droplets.patch @@ -75,7 +75,7 @@ index fbd4b81..55cd40e 100644 if (bundles == null || bundles.length == 0) { return null; } -@@ -171,11 +184,38 @@ +@@ -168,11 +181,38 @@ try { File home = basePath.toFile(); URL srcBundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), configurationArea.getFile().concat(SimpleConfiguratorManipulator.SOURCE_INFO_PATH)); diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch index caa42a8..931eb5d 100644 --- a/eclipse-secondary-arches.patch +++ b/eclipse-secondary-arches.patch @@ -112,15 +112,15 @@ index 7e1f520..734dd10 100644 +requires.7.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 -@@ -109,7 +109,7 @@ +@@ -100,7 +100,7 @@ "s390x") defaultOSArch="s390x" defaultJava=DEFAULT_JAVA_EXEC - OUTPUT_DIR="$EXEC_DIR/contributed/$defaultWS/$defaultOS/$defaultOSArch" + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ;; - arm*) - defaultOSArch="arm" + "aarch64") + defaultOSArch="aarch64" --- 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 @@ -77,6 +77,18 @@ diff --git a/eclipse-swt-avoid-javascript-at-build.patch b/eclipse-swt-avoid-javascript-at-build.patch index 8864089..e3d873b 100644 --- a/eclipse-swt-avoid-javascript-at-build.patch +++ b/eclipse-swt-avoid-javascript-at-build.patch @@ -1,6 +1,6 @@ --- eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml.orig 2019-05-01 16:18:20.026476746 +0100 +++ eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml 2019-05-01 16:18:30.068453716 +0100 -@@ -75,18 +75,6 @@ +@@ -75,23 +75,6 @@ @@ -8,12 +8,17 @@ - - org.mozilla - rhino -- 1.7.10 +- 1.7.11 +- +- +- org.apache.ant +- ant +- 1.10.7 - - - org.apache.ant - ant-apache-bsf -- 1.10.6 +- 1.10.7 - - diff --git a/eclipse.spec b/eclipse.spec index a0e1606..8a46a44 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -1,7 +1,7 @@ # Set to build Eclipse without circular dependency to eclipse-pde, API # generation and docs will not be built and a second run will be required, but # this is a way to bootstrap Eclipse on secondary archs. -%bcond_with bootstrap +%bcond_without bootstrap # Set this to avoid building contributor tools and tests %bcond_with contrib_tools @@ -9,8 +9,8 @@ Epoch: 1 %global eb_commit c985e357223668b4bc1fb76ea6b9e0c12829b7e8 -%global eclipse_rel %{version}RC2 -%global eclipse_tag S-%{eclipse_rel}-201909071130 +%global eclipse_rel %{version} +%global eclipse_tag R-%{eclipse_rel}-201912100610 %global _jetty_version 9.4.24 %global _lucene_version 8.1.1 @@ -41,8 +41,8 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse -Version: 4.13 -Release: 7%{?dist} +Version: 4.14 +Release: 1%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -122,8 +122,8 @@ Patch25: eclipse-patch-out-fileupload-dep.patch # Fix regression in ant support Patch26: fix-ant-execution.patch -# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=550606 -Patch27: ebz550606.patch +# Force a clean on the restart after p2 operations +Patch27: force-clean-after-p2-operations.patch # Upstream no longer supports non-64bit arches ExcludeArch: s390 %{arm} %{ix86} @@ -378,7 +378,7 @@ tar --strip-components=1 -xf %{SOURCE0} tar --strip-components=1 -xf %{SOURCE1} # Delete pre-built binary artifacts except some test data that cannot be generated -find . ! -path "*/JCL/*" ! -name "rtstubs*.jar" ! -name "java10api.jar" ! -name "j9stubs.jar" \ +find . ! -path "*/JCL/*" ! -name "rtstubs*.jar" ! -name "java10api.jar" ! -name "java13api.jar" ! -name "j9stubs.jar" ! -name "annotations.jar" \ -type f -name *.jar -delete find . -type f -name *.class -delete find . -type f -name *.so -delete @@ -421,6 +421,9 @@ rm rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/e # Remove python-based test rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/accessibility/Bug543949_ComponentExtentsTest.py +# No strict bin includes +sed -i -e '/jgit.dirtyWorkingTree>/afalsefalse' eclipse-platform-parent/pom.xml + # Remove jgit deps because building from source tarball, not a git repo %pom_remove_dep :tycho-buildtimestamp-jgit eclipse-platform-parent %pom_remove_dep :tycho-sourceref-jgit eclipse-platform-parent @@ -447,7 +450,6 @@ rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/ %pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.console.ssh.tests rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.console.tests rt.equinox.bundles -%pom_disable_module bundles/org.eclipse.equinox.ip rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.transforms.xslt rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.transforms.hook rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.weaving.caching.j9 rt.equinox.bundles @@ -539,8 +541,8 @@ for b in `(cd rt.equinox.bundles/bundles && ls -d *{macosx,win32,linux}*) | grep %pom_xpath_remove -f "plugin[@id='$b']" rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml fi done -for b in `ls eclipse.platform.team/bundles/org.eclipse.core.net/fragments/ | grep -P -e 'org.eclipse.core.net\.(?!linux.%{eclipse_arch}$)'` ; do - %pom_disable_module bundles/org.eclipse.core.net/fragments/$b eclipse.platform.team +for b in `ls eclipse.platform.team/bundles/ | grep -P -e 'org.eclipse.core.net\.(?!linux.%{eclipse_arch}$)'` ; do + %pom_disable_module bundles/$b eclipse.platform.team done for b in `ls eclipse.platform.resources/bundles/ | grep -P -e 'org.eclipse.core.filesystem\.(?!linux\.%{eclipse_arch}$)'` ; do module=$(grep ">bundles/$b<" eclipse.platform.resources/pom.xml || :) @@ -701,7 +703,8 @@ export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/o export JAVA_HOME=%{_jvmdir}/java # Pre-build agent jar needed for AdvancedSourceLookupSupport -sed -i -e '/createSourcesJar/d' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml +sed -i -e '/createSourcesJar/d' -e 's/7\.2/7.0/' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml +sed -i -e 's/V14/V11/' eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java (cd eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent && xmvn -e -o -B clean verify) mv eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/target/javaagent-shaded.jar \ eclipse.jdt.debug/org.eclipse.jdt.launching/lib @@ -1023,7 +1026,6 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.equinox.security* %{_eclipsedir}/plugins/org.eclipse.equinox.simpleconfigurator_* %{_eclipsedir}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_* -%{_eclipsedir}/plugins/org.eclipse.equinox.util_* %{_eclipsedir}/plugins/org.eclipse.help_* %{_eclipsedir}/plugins/org.eclipse.help.base_* %{_eclipsedir}/plugins/org.eclipse.help.ui_* @@ -1108,6 +1110,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Thu Dec 19 2019 Mat Booth - 1:4.14-1 +- Update to latest upstream release + * Thu Dec 19 2019 Mat Booth - 1:4.13-7 - Bump requirements on EMF/ECF diff --git a/explicit-hamcrest.patch b/explicit-hamcrest.patch index cc0042c..7d10d4a 100644 --- a/explicit-hamcrest.patch +++ b/explicit-hamcrest.patch @@ -30,13 +30,13 @@ --- eclipse.platform.text/org.eclipse.text.tests/META-INF/MANIFEST.MF.orig 2019-09-21 16:37:52.645515694 +0100 +++ eclipse.platform.text/org.eclipse.text.tests/META-INF/MANIFEST.MF 2019-09-21 16:38:25.034443980 +0100 @@ -13,6 +13,7 @@ - org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", - org.eclipse.text;bundle-version="[3.6.3,4.0.0)", -+ org.hamcrest.core;bundle-version="1.3.0", - org.junit;bundle-version="4.12.0" - Bundle-RequiredExecutionEnvironment: JavaSE-1.8 - Eclipse-BundleShape: dir + org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", + org.eclipse.text;bundle-version="[3.6.3,4.0.0)", ++ org.hamcrest.core;bundle-version="1.3.0", + org.junit;bundle-version="4.12.0" + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + Eclipse-BundleShape: dir --- eclipse.pde.ui/ui/org.eclipse.pde.junit.runtime.tests/META-INF/MANIFEST.MF.orig 2019-09-21 17:06:17.944749329 +0100 +++ eclipse.pde.ui/ui/org.eclipse.pde.junit.runtime.tests/META-INF/MANIFEST.MF 2019-09-21 17:06:43.846692344 +0100 @@ -9,6 +9,7 @@ diff --git a/force-clean-after-p2-operations.patch b/force-clean-after-p2-operations.patch new file mode 100644 index 0000000..f83d5bd --- /dev/null +++ b/force-clean-after-p2-operations.patch @@ -0,0 +1,80 @@ +From d964680827a248e8a312c000c4c2443f96c8c459 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Fri, 27 Sep 2019 14:52:54 +0100 +Subject: [PATCH] Force a clean on the restart after p2 operations + +--- + .../META-INF/MANIFEST.MF | 2 +- + .../bundles/org.eclipse.equinox.launcher/pom.xml | 2 +- + .../src/org/eclipse/equinox/launcher/Main.java | 13 +++++++++++++ + .../internal/p2/ui/ProvisioningOperationRunner.java | 6 ++++++ + 4 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF +index 497e5d6fa..a118a0e4c 100644 +--- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF ++++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/META-INF/MANIFEST.MF +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: %pluginName + Bundle-SymbolicName: org.eclipse.equinox.launcher;singleton:=true +-Bundle-Version: 1.5.600.qualifier ++Bundle-Version: 1.5.601.qualifier + Main-Class: org.eclipse.equinox.launcher.Main + Bundle-ClassPath: . + Bundle-Vendor: %providerName +diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml +index 43849b5b8..c5d2cdfea 100644 +--- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml ++++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/pom.xml +@@ -19,6 +19,6 @@ + + org.eclipse.equinox + org.eclipse.equinox.launcher +- 1.5.600-SNAPSHOT ++ 1.5.601-SNAPSHOT + eclipse-plugin + +diff --git a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java +index d013ff7c2..65f4cfd8a 100644 +--- a/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java ++++ b/rt.equinox.framework/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java +@@ -560,6 +560,18 @@ + setupVMProperties(); + processConfiguration(); + ++ File oca = new File(getConfigurationLocation().toURI()); ++ File ocaFile = new File(oca, "clean_on_restart"); ++ if (ocaFile.exists()) { ++ System.err.println("Clean triggered."); //$NON-NLS-1$ ++ ocaFile.delete(); ++ commands = Arrays.copyOf(args, args.length + 1); ++ commands[commands.length-1] = CLEAN; ++ passThruArgs = Arrays.copyOf(passThruArgs, passThruArgs.length + 1); ++ passThruArgs[passThruArgs.length-1] = CLEAN; ++ setupVMProperties(); ++ } ++ + if (protectBase && (System.getProperty(PROP_SHARED_CONFIG_AREA) == null)) { + System.err.println("This application is configured to run in a cascaded mode only."); //$NON-NLS-1$ + System.setProperty(PROP_EXITCODE, Integer.toString(14)); +diff --git a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningOperationRunner.java b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningOperationRunner.java +index a70b640ba..8a002ebc2 100644 +--- a/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningOperationRunner.java ++++ b/rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvisioningOperationRunner.java +@@ -72,6 +72,12 @@ public class ProvisioningOperationRunner { + * @param restartPolicy + */ + void requestRestart(final int restartPolicy) { ++ String oca = System.getProperty("osgi.configuration.area"); ++ try { ++ java.io.File ocaCleanFile = new java.io.File(new java.net.URL(oca).toURI()); ++ new java.io.File(ocaCleanFile, "clean_on_restart").createNewFile(); ++ } catch (Exception e) { /* Eh, we tried... */ } ++ + // Global override of restart (used in test cases). + if (suppressRestart) + return; +-- +2.20.1 + diff --git a/sources b/sources index 03815ef..aabebde 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz) = 79780efe9eed0082ea6de6978c5b65ccf5c65a242bff24f34cd763c0ca19a695e7735442aba20f5d2fca4153f7b59c5804fdcb67fa050480dcad137d664d3ce3 -SHA512 (eclipse-platform-sources-4.13RC2.tar.xz) = 4e3430cae6249a5d1552dbdd8071743dd6b5a2f92b7b9ee1534064f0e1f959fa4f9528c6267af5d610c9d45583135d24fd6c8d86bb8c90ece19944a35482e34b +SHA512 (eclipse-platform-sources-4.14.tar.xz) = 211e80eceebff9e6fdce04bbbb7d088e6c68358ba16395aed51a653187e2066f3c44e8fd2987e9f2a315479b465dc5046de81e6c839ca05bb8351554fc4aae51