From c90b3ba0169bd7a0a7ac0553836d1fc7726c258b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 21 2020 15:03:12 +0000 Subject: import eclipse-4.15-5.module+el8.2.1+6727+059d025f --- diff --git a/.eclipse.metadata b/.eclipse.metadata index bb28e9d..887b59a 100644 --- a/.eclipse.metadata +++ b/.eclipse.metadata @@ -1,2 +1,2 @@ -2325a8753ec3e388d5f062a4e7ba3031cace4cfd SOURCES/eclipse-platform-sources-4.12RC2.tar.xz +18fbcd1b7ea997edd0199d1ac54a68ad0ab71739 SOURCES/eclipse-platform-sources-4.15.tar.xz cc4f1b206f1a5744884558b663b6064987a52a9c SOURCES/org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz diff --git a/.gitignore b/.gitignore index 403b1dc..79d4f8a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/eclipse-platform-sources-4.12RC2.tar.xz +SOURCES/eclipse-platform-sources-4.15.tar.xz SOURCES/org.eclipse.linuxtools.eclipse-build-c985e357223668b4bc1fb76ea6b9e0c12829b7e8.tar.xz diff --git a/SOURCES/0001-Avoid-limitation-with-older-shade-plug-in-versions-w.patch b/SOURCES/0001-Avoid-limitation-with-older-shade-plug-in-versions-w.patch new file mode 100644 index 0000000..9ae9983 --- /dev/null +++ b/SOURCES/0001-Avoid-limitation-with-older-shade-plug-in-versions-w.patch @@ -0,0 +1,32 @@ +From d39c125a6030c88920f188345fee1d624ac4afe1 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Tue, 12 Mar 2019 12:58:38 +0000 +Subject: [PATCH 1/4] Avoid limitation with older shade plug-in versions where + it cannot deal with Java 9-style module-info files + +--- + .../org.eclipse.jdt.launching.javaagent/pom.xml | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml b/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml +index 8d32e4fa5..dd76e096a 100644 +--- a/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml ++++ b/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/pom.xml +@@ -77,6 +77,14 @@ + + + javaagent-shaded ++ ++ ++ *:* ++ ++ **/module-info.class ++ ++ ++ + + + +-- +2.26.2 + diff --git a/SOURCES/0002-Allow-bootstrapping-against-OSGi-Core-R6.patch b/SOURCES/0002-Allow-bootstrapping-against-OSGi-Core-R6.patch new file mode 100644 index 0000000..7a4041d --- /dev/null +++ b/SOURCES/0002-Allow-bootstrapping-against-OSGi-Core-R6.patch @@ -0,0 +1,31 @@ +From 006d5e833eae44aab2514918acfe20f8ab3992d2 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Tue, 12 Mar 2019 15:12:37 +0000 +Subject: [PATCH 2/4] Allow bootstrapping against OSGi Core R6 + +--- + .../http/servlet/internal/HttpServiceRuntimeImpl.java | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java b/rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java +index 8d07030b8..530f5bb11 100644 +--- a/rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java ++++ b/rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/HttpServiceRuntimeImpl.java +@@ -1341,8 +1341,12 @@ public class HttpServiceRuntimeImpl + @Override + public Void call() { + try { +- Dictionary properties = getHsrRegistration().getReference().getProperties(); +- properties.put(Constants.SERVICE_CHANGECOUNT, getServiceChangecount()); ++ Dictionary properties = new Hashtable(); ++ String[] keys = getHsrRegistration().getReference().getPropertyKeys(); ++ for (String key : keys) { ++ properties.put(key, getHsrRegistration().getReference().getProperty(key)); ++ } ++ properties.put("service.changecount", getServiceChangecount()); + getHsrRegistration().setProperties(properties); + return null; + } +-- +2.26.2 + diff --git a/SOURCES/0004-Add-parent-pom-for-old-tycho-pomless.patch b/SOURCES/0004-Add-parent-pom-for-old-tycho-pomless.patch new file mode 100644 index 0000000..6d88f68 --- /dev/null +++ b/SOURCES/0004-Add-parent-pom-for-old-tycho-pomless.patch @@ -0,0 +1,31 @@ +From 1373863303582bd46daea47db219506c0fbebcee Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Wed, 13 May 2020 15:24:34 +0100 +Subject: [PATCH 4/4] Add parent pom for old tycho-pomless + +--- + eclipse.platform.resources/bundles/pom.xml | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + create mode 100644 eclipse.platform.resources/bundles/pom.xml + +diff --git a/eclipse.platform.resources/bundles/pom.xml b/eclipse.platform.resources/bundles/pom.xml +new file mode 100644 +index 000000000..44a2f411b +--- /dev/null ++++ b/eclipse.platform.resources/bundles/pom.xml +@@ -0,0 +1,12 @@ ++ ++ 4.0.0 ++ ++ eclipse.platform.resources ++ eclipse.platform.resources ++ 4.15.0-SNAPSHOT ++ .. ++ ++ eclipse.platform.resources ++ eclipse.platform.resources-bundles ++ pom ++ +-- +2.26.2 + diff --git a/SOURCES/compiler-release.patch b/SOURCES/compiler-release.patch new file mode 100644 index 0000000..0d0828d --- /dev/null +++ b/SOURCES/compiler-release.patch @@ -0,0 +1,10 @@ +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml.orig 2020-03-23 00:19:02.052686148 +0000 ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/pom.xml 2020-03-23 00:19:10.187688146 +0000 +@@ -11,4 +11,7 @@ + org.eclipse.equinox.p2.artifact.repository + 1.3.400-SNAPSHOT + eclipse-plugin ++ ++ 8 ++ + diff --git a/SOURCES/eclipse-adjust-droplets.patch b/SOURCES/eclipse-adjust-droplets.patch deleted file mode 100644 index c751924..0000000 --- a/SOURCES/eclipse-adjust-droplets.patch +++ /dev/null @@ -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 -@@ -150,7 +150,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 -@@ -160,7 +160,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 diff --git a/SOURCES/eclipse-debug-symbols.patch b/SOURCES/eclipse-debug-symbols.patch index 60016c2..9d9d63d 100644 --- a/SOURCES/eclipse-debug-symbols.patch +++ b/SOURCES/eclipse-debug-symbols.patch @@ -12,7 +12,7 @@ if [ "${OS}" = "" ]; then --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak.orig 2019-03-20 10:22:21.420240101 +0000 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 2019-03-20 10:53:53.375471427 +0000 -@@ -92,7 +92,7 @@ +@@ -82,7 +82,7 @@ -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" \ -DGIO_LIB="\"libgio-2.0.so.0\"" -DGLIB_LIB="\"libglib-2.0.so.0\"" LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic @@ -21,31 +21,6 @@ -fpic \ -DLINUX \ -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ ---- rt.equinox.bundles/bundles/org.eclipse.equinox.security.linux.x86_64/keystorelinuxnative/makefile.orig 2019-03-19 22:40:23.145082352 +0000 -+++ rt.equinox.bundles/bundles/org.eclipse.equinox.security.linux.x86_64/keystorelinuxnative/makefile 2019-03-20 09:29:20.370457348 +0000 -@@ -1,7 +1,8 @@ - LIBSECRET_CFLAGS = `pkg-config --cflags libsecret-1` - LIBSECRET_LIBS = `pkg-config --libs libsecret-1` - --CFLAGS = -shared -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" -+CFLAGS := $(CFLAGS) -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" $(LIBSECRET_CFLAGS) -+LDFLAGS := $(LDFLAGS) -shared $(LIBSECRET_LIBS) - - all: ../libkeystorelinuxnative.so - -@@ -9,10 +10,10 @@ - rm ../libkeystorelinuxnative.so ../target/keystoreLinuxNative.o - - ../libkeystorelinuxnative.so: ../target/keystoreLinuxNative.o -- $(CC) $(CFLAGS) -o $@ $< $(LIBSECRET_LIBS) -+ $(CC) $(LDFLAGS) -o $@ $< - - ../target/keystoreLinuxNative.o: ../target keystoreLinuxNative.c -- $(CC) -c -fPIC -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" -o $@ $(TESTFLAGS) $(LIBSECRET_CFLAGS) keystoreLinuxNative.c -+ $(CC) -c $(CFLAGS) -o $@ $(TESTFLAGS) keystoreLinuxNative.c - - ../target: - mkdir -p ../target --- eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/makefile.orig 2019-03-20 09:49:40.694899138 +0000 +++ eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/makefile 2019-03-20 10:20:21.704664294 +0000 @@ -25,10 +25,10 @@ diff --git a/SOURCES/eclipse-disable-droplets-in-dropins.patch b/SOURCES/eclipse-disable-droplets-in-dropins.patch index b45995e..9c78052 100644 --- a/SOURCES/eclipse-disable-droplets-in-dropins.patch +++ b/SOURCES/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/SOURCES/eclipse-disable-uses-constraints.patch b/SOURCES/eclipse-disable-uses-constraints.patch index 5a56e61..43278ee 100644 --- a/SOURCES/eclipse-disable-uses-constraints.patch +++ b/SOURCES/eclipse-disable-uses-constraints.patch @@ -12,7 +12,7 @@ diff --git rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/org/apache/fe 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 -@@ -1231,7 +1231,9 @@ public class ResolverImpl implements Resolver +@@ -1234,7 +1234,9 @@ public class ResolverImpl implements Resolver { public void run() { diff --git a/SOURCES/eclipse-ebz542708.patch b/SOURCES/eclipse-ebz542708.patch deleted file mode 100644 index d1696ae..0000000 --- a/SOURCES/eclipse-ebz542708.patch +++ /dev/null @@ -1,28 +0,0 @@ -From ceaa5685fe7f51dae0ce444407d2aea7a49b8896 Mon Sep 17 00:00:00 2001 -From: Lakshminarayana Nekkanti -Date: Mon, 3 Jun 2019 15:12:13 +0530 -Subject: Bug 542708 - stale JRE shown in Package Explorer after changing it - from 9 or above to 11 - -Change-Id: Ia9ef62a7e90fb12c9107bfaaf2f47af97fca75fb -Signed-off-by: Lakshminarayana Nekkanti ---- - .../jdt/internal/ui/packageview/PackageExplorerContentProvider.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerContentProvider.java b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerContentProvider.java -index ff62fa9eda..143364142a 100644 ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerContentProvider.java -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerContentProvider.java -@@ -657,7 +657,7 @@ public class PackageExplorerContentProvider extends StandardJavaElementContentPr - return false; - } - // if the class path has changed we refresh the entire project -- if ((flags & IJavaElementDelta.F_RESOLVED_CLASSPATH_CHANGED) != 0) { -+ if ((flags & (IJavaElementDelta.F_CLASSPATH_CHANGED | IJavaElementDelta.F_RESOLVED_CLASSPATH_CHANGED)) != 0) { - postRefresh(element, ORIGINAL, element, runnables); - return false; - } --- -cgit v1.2.1 - diff --git a/SOURCES/eclipse-ebz548211-2.patch b/SOURCES/eclipse-ebz548211-2.patch deleted file mode 100644 index fff6f28..0000000 --- a/SOURCES/eclipse-ebz548211-2.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 9ecc34bf838eae50a356b20c76d35fb62a423563 Mon Sep 17 00:00:00 2001 -From: Stephan Herrmann -Date: Tue, 18 Jun 2019 16:28:49 +0200 -Subject: Bug 548211 - "Remove" in the Module dependencies tab does not remove - system modules - -- more fixes, concerning update on Apply and re-open with only java.base - -Change-Id: I39a7a1da6c8ae733010009372fd36a88814e4faf ---- - .../ui/wizards/buildpaths/BuildPathsBlock.java | 3 +++ - .../ui/wizards/buildpaths/CPListElement.java | 24 +++++++++++++++------- - .../wizards/buildpaths/ModuleDependenciesPage.java | 13 ++++++++++++ - 3 files changed, 33 insertions(+), 7 deletions(-) - -diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java -index 3fec77d579..37229a834b 100644 ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java -@@ -395,6 +395,9 @@ public class BuildPathsBlock { - } - - protected void doUpdateUI() { -+ if (fModulesPage.needReInit()) { -+ init(fCurrJProject, null, null); // extent of system modules was changed, re-init fClassPathList -+ } - fBuildPathDialogField.refresh(); - fClassPathList.refresh(); - boolean is9OrHigherAfter= JavaModelUtil.is9OrHigher(fCurrJProject); -diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListElement.java b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListElement.java -index a3c475e7ea..c670c0770f 100644 ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListElement.java -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/CPListElement.java -@@ -42,6 +42,7 @@ import org.eclipse.jdt.core.IModuleDescription; - import org.eclipse.jdt.core.IPackageFragmentRoot; - import org.eclipse.jdt.core.JavaCore; - import org.eclipse.jdt.core.JavaModelException; -+import org.eclipse.jdt.core.provisional.JavaModelAccess; - - - import org.eclipse.jdt.internal.corext.util.JavaModelUtil; -@@ -207,13 +208,22 @@ public class CPListElement { - boolean modulesAdded= false; - if (containerEntry != null) { - IPackageFragmentRoot[] fragmentRoots= fProject.findPackageFragmentRoots(containerEntry); -- if (fragmentRoots != null && fragmentRoots.length > 1) { -- for (IPackageFragmentRoot fragmentRoot : fragmentRoots) { -- IModuleDescription currModule= fragmentRoot.getModuleDescription(); -- if (currModule != null) { -- CPListElement curr= create(this, pseudoEntry, currModule, true, fProject); -- fChildren.add(curr); -- modulesAdded= true; -+ if (fragmentRoots != null) { -+ // detect if system library: -+ boolean addChildren= false; -+ if (fragmentRoots.length > 0) { -+ IModuleDescription module= fragmentRoots[0].getModuleDescription(); -+ if (module != null && JavaModelAccess.isSystemModule(module)) -+ addChildren= true; -+ } -+ if (addChildren) { -+ for (IPackageFragmentRoot fragmentRoot : fragmentRoots) { -+ IModuleDescription currModule= fragmentRoot.getModuleDescription(); -+ if (currModule != null) { -+ CPListElement curr= create(this, pseudoEntry, currModule, true, fProject); -+ fChildren.add(curr); -+ modulesAdded= true; -+ } - } - } - } -diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java -index b813d22956..e9f1c9feff 100644 ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java -@@ -164,6 +164,7 @@ public class ModuleDependenciesPage extends BuildPathBasePage { - private Collection fAllDefaultSystemModules; // if current is unnamed module: transitive closure of default root modules (names) - - public final Map fPatchMap= new HashMap<>(); -+ private boolean needReInit= false; - - public ModuleDependenciesPage(IStatusChangeListener context, CheckedListDialogField classPathList) { - fClassPathList= classPathList; -@@ -530,6 +531,7 @@ public class ModuleDependenciesPage extends BuildPathBasePage { - } - updateLimitModules(cpListElement.findAttributeElement(CPListElement.MODULE)); - fModuleList.refresh(); -+ this.needReInit= true; - } - - public void addToSystemModules(List modulesToAdd) throws JavaModelException { -@@ -655,8 +657,19 @@ public class ModuleDependenciesPage extends BuildPathBasePage { - } - } - } -+ this.needReInit= true; - } - -+ /** Destructively reed the needReInit flag. -+ * @return {@code true} if the classpath needs to be reinitialized due to change of extent of the system library -+ */ -+ public boolean needReInit() { -+ try { -+ return this.needReInit; -+ } finally { -+ this.needReInit= false; -+ } -+ } - private Set computeForwardClosure(List seeds) { - Set closure= new HashSet<>(); - collectForwardClosure(seeds, closure); --- -cgit v1.2.1 - diff --git a/SOURCES/eclipse-ebz548211.patch b/SOURCES/eclipse-ebz548211.patch deleted file mode 100644 index f390e6d..0000000 --- a/SOURCES/eclipse-ebz548211.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 5ca45e97b527b5a4d4ed4ce92e32720859911968 Mon Sep 17 00:00:00 2001 -From: Stephan Herrmann -Date: Sat, 15 Jun 2019 20:47:45 +0200 -Subject: Bug 548211 - "Remove" in the Module dependencies tab does not remove - system modules - -Change-Id: I633fa86e5911c50b17a1c7ef188805902942e1db ---- - .../jdt/internal/ui/wizards/NewWizardMessages.java | 1 + - .../ui/wizards/NewWizardMessages.properties | 1 + - .../wizards/buildpaths/ModuleDependenciesPage.java | 22 ++++++++++++++++++---- - 3 files changed, 20 insertions(+), 4 deletions(-) - -diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.java b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.java -index 3a66ae56ed..961aa63bba 100644 ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.java -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.java -@@ -564,6 +564,7 @@ public final class NewWizardMessages extends NLS { - public static String ModuleDependenciesPage_removeCurrentModule_error; - public static String ModuleDependenciesPage_removeModule_error_with_hint; - public static String ModuleDependenciesPage_removeSystemModule_error_hint; -+ public static String ModuleDependenciesPage_moduleIsRequired_error_hint; - - public static String ModuleDependenciesAdapter_patchConflict_title; - public static String ModuleDependenciesAdapter_patchConflict_message; -diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties -index feb30bc627..a3d8a04624 100644 ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties -@@ -605,6 +605,7 @@ ModuleDependenciesPage_removeCurrentModule_error=Cannot remove the current modul - ModuleDependenciesPage_removeModule_error_with_hint=Cannot remove module ''{0}''{1} - ModuleDependenciesPage_removeSystemModule_error_hint=\nOnly system modules can be removed here.\n\ - To remove other modules please remove them from the Modulepath (Projects or Libraries tab). -+ModuleDependenciesPage_moduleIsRequired_error_hint=\nIt is required along the path {0} - - ModuleDependenciesAdapter_patchConflict_title=Patch module conflict - ModuleDependenciesAdapter_patchConflict_message=The {0} {1} was declared to patch module ''{2}''.\n\ -diff --git a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java -index ccc5c3317a..b813d22956 100644 ---- a/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java -+++ b/eclipse.jdt.ui/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ModuleDependenciesPage.java -@@ -614,7 +614,16 @@ public class ModuleDependenciesPage extends BuildPathBasePage { - return; - } - selectedModuleNames.add(moduleName); -- collectModulesToRemove(moduleName, allModulesToRemove); -+ String problemModule= collectModulesToRemove(moduleName, allModulesToRemove); -+ if (problemModule != null) { -+ int lastArrow= problemModule.lastIndexOf("->"); //$NON-NLS-1$ -+ String leafMod= lastArrow == -1 ? problemModule : problemModule.substring(lastArrow+2); -+ MessageDialog.openError(getShell(), NewWizardMessages.ModuleDependenciesPage_removeModule_dialog_title, -+ MessageFormat.format(NewWizardMessages.ModuleDependenciesPage_removeModule_error_with_hint, -+ leafMod, -+ MessageFormat.format(NewWizardMessages.ModuleDependenciesPage_moduleIsRequired_error_hint, problemModule))); -+ return; -+ } - } - String seedModules= String.join(", ", selectedModuleNames); //$NON-NLS-1$ - if (allModulesToRemove.size() == selectedModuleNames.size()) { -@@ -664,15 +673,20 @@ public class ModuleDependenciesPage extends BuildPathBasePage { - } - } - -- private void collectModulesToRemove(String mod, Set modulesToRemove) { -+ private String collectModulesToRemove(String mod, Set modulesToRemove) { - if (fModuleList.fNames.contains(mod) && modulesToRemove.add(mod)) { - List requireds= fModuleRequiredByModules.get(mod); - if (requireds != null) { - for (String required : requireds) { -- collectModulesToRemove(required, modulesToRemove); -+ if (fModuleList.getModuleKind(required) == ModuleKind.Focus) -+ return required + "->" + mod; //$NON-NLS-1$ -+ String problemModule= collectModulesToRemove(required, modulesToRemove); -+ if (problemModule != null) -+ return problemModule + "->" + mod; //$NON-NLS-1$ - } - } - } -+ return null; - } - - private boolean confirmRemoveModule(String message) { -@@ -741,7 +755,7 @@ public class ModuleDependenciesPage extends BuildPathBasePage { - List dominators= fModuleRequiredByModules.get(name); - if (dominators != null) { - for (String dominator : dominators) { -- if (names.contains(dominator)) { -+ if (names.contains(dominator) && fModuleList.getModuleKind(dominator) == ModuleKind.System) { - continue outer; - } - } --- -cgit v1.2.1 - diff --git a/SOURCES/eclipse-feature-plugins-to-category-ius.patch b/SOURCES/eclipse-feature-plugins-to-category-ius.patch index b255cc7..1b1e5ff 100644 --- a/SOURCES/eclipse-feature-plugins-to-category-ius.patch +++ b/SOURCES/eclipse-feature-plugins-to-category-ius.patch @@ -1,23 +1,26 @@ -From 42b1d14319f47d477f057a14aa1e2481729c6b13 Mon Sep 17 00:00:00 2001 +From 6dd34f0b0365e0529f3852c688bfd99519f035d1 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 6 Dec 2018 11:38:58 +0000 -Subject: [PATCH 1/2] Change features bundling third-party modules to feature - requirements +Subject: [PATCH] IU inclusion changes: +* Change features bundling third-party modules to feature requirements +* Make some IU name changes to accommodate for distro-specific packaging --- .../org.eclipse.jdt-feature/feature.xml | 114 ++----------- .../org.eclipse.pde-feature/feature.xml | 16 +- - .../org.eclipse.platform.doc.isv/pom.xml | 11 +- + .../bundles/org.eclipse.jdt.doc.isv/pom.xml | 2 +- + .../bundles/org.eclipse.pde.doc.user/pom.xml | 2 +- + .../org.eclipse.platform.doc.isv/pom.xml | 10 +- .../org.eclipse.help-feature/feature.xml | 130 +++------------ .../org.eclipse.platform-feature/feature.xml | 18 +-- .../org.eclipse.sdk.tests/feature.xml | 58 ++----- .../org.eclipse.test-feature/feature.xml | 56 +------ .../org.eclipse.tips.feature/feature.xml | 11 +- .../features/org.eclipse.e4.rcp/feature.xml | 150 ++---------------- - 9 files changed, 83 insertions(+), 481 deletions(-) + 11 files changed, 87 insertions(+), 480 deletions(-) diff --git a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml -index 06887d901..364cae9d8 100644 +index e12ef6a13..6deae2a13 100644 --- a/eclipse.jdt/org.eclipse.jdt-feature/feature.xml +++ b/eclipse.jdt/org.eclipse.jdt-feature/feature.xml @@ -19,6 +19,23 @@ @@ -44,7 +47,7 @@ index 06887d901..364cae9d8 100644 @@ -149,7 +152,7 @@ index 06887d901..364cae9d8 100644 id="org.eclipse.jdt.doc.user" download-size="0" diff --git a/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml b/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml -index 4197cffde..85ab44540 100644 +index 57a58c6d5..a9c3e2c9b 100644 --- a/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml +++ b/eclipse.pde.ui/features/org.eclipse.pde-feature/feature.xml @@ -21,6 +21,8 @@ @@ -182,25 +185,52 @@ index 4197cffde..85ab44540 100644 eclipse-plugin + + +- javax.annotation ++ javax.annotation-api + eclipse-plugin + + +diff --git a/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml b/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml +index 16a7a02dc..23ffa475a 100644 +--- a/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml ++++ b/eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml +@@ -119,7 +119,7 @@ + eclipse-plugin + + +- javax.annotation ++ javax.annotation-api + eclipse-plugin + + diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml -index f3432dba5..c70631e90 100644 +index 5b9e03021..1702d4dc6 100644 --- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml +++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml -@@ -78,12 +78,7 @@ +@@ -78,12 +78,12 @@ eclipse-plugin - javax.annotation -- 0.0.0 -- -- -- eclipse-plugin ++ javax.annotation-api + 0.0.0 + + + eclipse-plugin - javax.el + javax.el-api 0.0.0 -@@ -75,7 +70,7 @@ +@@ -93,7 +93,7 @@ eclipse-plugin @@ -209,7 +239,7 @@ index f3432dba5..c70631e90 100644 0.0.0 -@@ -95,7 +90,7 @@ +@@ -118,7 +118,7 @@ eclipse-plugin @@ -218,8 +248,17 @@ index f3432dba5..c70631e90 100644 0.0.0 +@@ -287,7 +287,7 @@ + eclipse-plugin + + +- javax.annotation ++ javax.annotation-api + eclipse-plugin + + diff --git a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml -index 853db711d..5195b6d59 100644 +index 79fa77d7e..5f3d6f6d0 100644 --- a/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.help-feature/feature.xml @@ -21,69 +21,6 @@ @@ -372,7 +411,7 @@ index 853db711d..5195b6d59 100644 + 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 f825d4539..a9b974ca5 100644 +index 94f21e6f8..694d49dc1 100644 --- a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml @@ -19,6 +19,11 @@ @@ -415,7 +454,7 @@ index f825d4539..a9b974ca5 100644 id="org.eclipse.compare.core" download-size="0" diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml -index a3a7d14a0..f0dab84a3 100644 +index 6d7659ab9..23f4e6524 100644 --- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml @@ -19,6 +19,15 @@ @@ -434,7 +473,7 @@ index a3a7d14a0..f0dab84a3 100644 -@@ -421,20 +430,6 @@ +@@ -427,20 +436,6 @@ install-size="0" version="0.0.0"/> @@ -455,7 +494,7 @@ index a3a7d14a0..f0dab84a3 100644 @@ -498,7 +537,7 @@ index a3a7d14a0..f0dab84a3 100644 id="org.eclipse.ui.tests.pluginchecks" download-size="0" diff --git a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml -index 1dcc94c1c..2a4871027 100644 +index 1f422b76e..9e26326c3 100644 --- a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml +++ b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml @@ -19,6 +19,14 @@ @@ -576,7 +615,7 @@ index 1dcc94c1c..2a4871027 100644 - diff --git a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml -index 88d843b0f..d5b8195bc 100644 +index b8f52fe1a..a1d866a52 100644 --- a/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml +++ b/eclipse.platform.ua/org.eclipse.tips.feature/feature.xml @@ -32,6 +32,10 @@ @@ -603,7 +642,7 @@ index 88d843b0f..d5b8195bc 100644 - 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 ba217da7b..464451193 100644 +index 0ce4361be..ac28b73c2 100644 --- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml +++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml @@ -22,6 +22,23 @@ @@ -763,7 +802,7 @@ index ba217da7b..464451193 100644 @@ -791,7 +830,7 @@ index ba217da7b..464451193 100644 @@ -806,5 +845,5 @@ index ba217da7b..464451193 100644 id="org.eclipse.e4.emf.xpath" download-size="0" -- -2.19.1 +2.21.1 diff --git a/SOURCES/eclipse-fix-dropins.patch b/SOURCES/eclipse-fix-dropins.patch index c35b86d..e3efe03 100644 --- a/SOURCES/eclipse-fix-dropins.patch +++ b/SOURCES/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; @@ -37,17 +37,17 @@ String baseTimestamp = getBaseTimestamp(profile.getProfileId()); String extTimestamp = getExtTimeStamp(); if (baseTimestamp == null) { ---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java -+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java -@@ -563,6 +563,7 @@ +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java.orig 2019-09-13 14:45:20.806922186 +0100 ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java 2019-09-13 14:46:41.124689025 +0100 +@@ -560,6 +560,7 @@ - // get all IUs from all our repos + // get all IUs from all our repos IQueryResult allIUs = getAllIUsFromRepos(); + HashSet removedFromAllIUs = new HashSet(); for (Iterator iter = allIUs.iterator(); iter.hasNext();) { final IInstallableUnit iu = iter.next(); IInstallableUnit existing = profileIUs.get(iu); -@@ -576,6 +577,7 @@ +@@ -573,6 +574,7 @@ // (and more expensive) way to find this out is to do an IU profile property query. if (two == null) { // the IU is already installed so don't mark it as a dropin now - see bug 404619. @@ -55,7 +55,7 @@ iter.remove(); continue; } -@@ -618,7 +620,7 @@ +@@ -614,7 +616,7 @@ } // if the IU from the profile is in the "all available" list, then it is already added // otherwise if it isn't in the repo then we have to remove it from the profile. @@ -64,25 +64,25 @@ toRemove.add(iu); } -@@ -792,8 +794,8 @@ - IStatus installerPlanStatus = engine.perform(plan.getInstallerPlan(), phaseSet, monitor); +@@ -787,7 +789,8 @@ if (!installerPlanStatus.isOK()) return installerPlanStatus; -- + - applyConfiguration(true); + if (isReconciliationApplicationRunning()) + applyConfiguration(true); } return engine.perform(plan, phaseSet, monitor); } ---- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java.orig 2018-04-25 20:31:57.931223008 +0100 -+++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2018-04-25 20:32:11.069144336 +0100 -@@ -151,7 +151,7 @@ +--- rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java.orig 2019-09-13 14:42:54.512346840 +0100 ++++ rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui.sdk.scheduler/src/org/eclipse/equinox/internal/p2/ui/sdk/scheduler/migration/MigrationWizard.java 2019-09-13 14:43:12.003296065 +0100 +@@ -158,8 +158,7 @@ @Override public boolean performCancel() { -- String[] buttons = new String[] {IDialogConstants.YES_LABEL, ProvUIMessages.MigrationPage_LATER_BUTTON, IDialogConstants.NO_LABEL}; -+ String[] buttons = new String[] {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}; - MessageDialog dialog = new MessageDialog(getShell(), ProvUIMessages.MigrationPage_CONFIRMATION_TITLE, null, ProvUIMessages.MigrationPage_CONFIRMATION_DIALOG, MessageDialog.QUESTION, buttons, 2); +- String[] buttons = new String[] { IDialogConstants.YES_LABEL, ProvUIMessages.MigrationPage_LATER_BUTTON, +- IDialogConstants.NO_LABEL }; ++ String[] buttons = new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL }; + MessageDialog dialog = new MessageDialog(getShell(), ProvUIMessages.MigrationPage_CONFIRMATION_TITLE, null, + ProvUIMessages.MigrationPage_CONFIRMATION_DIALOG, MessageDialog.QUESTION, buttons, 2); - return rememberCancellationDecision(dialog.open()); diff --git a/SOURCES/eclipse-fix-tests.patch b/SOURCES/eclipse-fix-tests.patch index 39bf472..2bfb1d0 100644 --- a/SOURCES/eclipse-fix-tests.patch +++ b/SOURCES/eclipse-fix-tests.patch @@ -1,6 +1,6 @@ --- 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 -@@ -76,7 +76,7 @@ +@@ -80,7 +80,7 @@ */ protected IPath getJdtFeatureLocation() { IPath path = new Path(TargetPlatform.getDefaultLocation()); @@ -13,7 +13,7 @@ diff --git rt.equinox.p2/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/eq 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 -@@ -217,7 +217,7 @@ +@@ -246,7 +246,7 @@ if (parent != null) { File[] children = parent.listFiles((FileFilter) pathname -> { String name = pathname.getName(); @@ -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/SOURCES/eclipse-hide-droplets-from-install-wizard.patch b/SOURCES/eclipse-hide-droplets-from-install-wizard.patch index c261fef..729b2ae 100644 --- a/SOURCES/eclipse-hide-droplets-from-install-wizard.patch +++ b/SOURCES/eclipse-hide-droplets-from-install-wizard.patch @@ -1,17 +1,19 @@ -commit 4bfc5a7c6d8c2aaf954c113d805419472de2bcaf -Author: Mat Booth -Date: Thu May 3 15:58:49 2018 +0100 +From a23545ef5b4cbb94ff048fda2839ba08c3593d50 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Thu, 3 May 2018 15:58:49 +0100 +Subject: [PATCH] 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 + - 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 +--- + .../p2/ui/dialogs/RepositorySelectionGroup.java | 13 +++++++++++++ + .../equinox/p2/ui/RepositoryManipulationPage.java | 15 ++++++++++++++- + 2 files changed, 27 insertions(+), 1 deletion(-) 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 +index d07be5d43..c666f8fdc 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 @@ -303,6 +303,19 @@ public class RepositorySelectionGroup { @@ -35,7 +37,7 @@ index e6eef8c39..fe5970e79 100644 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 +index 78fb5398e..b8e724b66 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 @@ -133,9 +133,22 @@ public class RepositoryManipulationPage extends PreferencePage implements IWorkb @@ -43,22 +45,25 @@ index d796aefd0..c03924f90 100644 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]); + for (Object element : children) { + if (element instanceof MetadataRepositoryElement) { +- put((MetadataRepositoryElement) element); + // 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(); ++ URI childLoc = ((MetadataRepositoryElement) element).getLocation(); + if (childLoc.getPath() != null && childLoc.getPath().startsWith(root)) { + isDroplet = true; + } + } + if (!isDroplet) { -+ put((MetadataRepositoryElement) children[i]); ++ put((MetadataRepositoryElement) element); + } + } } } } +-- +2.21.1 + diff --git a/SOURCES/eclipse-ignore-version-when-calculating-home.patch b/SOURCES/eclipse-ignore-version-when-calculating-home.patch index b5e77b2..d2b50d2 100644 --- a/SOURCES/eclipse-ignore-version-when-calculating-home.patch +++ b/SOURCES/eclipse-ignore-version-when-calculating-home.patch @@ -1,22 +1,26 @@ ---- 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 @@ +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 144571914..7e99bc880 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 +@@ -1330,7 +1330,7 @@ public class Main { String appVersion = props.getProperty(PRODUCT_SITE_VERSION); if (appVersion == null || appVersion.trim().length() == 0) appVersion = ""; //$NON-NLS-1$ - appName += File.separator + appId + "_" + appVersion + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$ -+ appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$ ++ appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ } catch (IOException e) { - // Do nothing if we get an exception. We will default to a standard location + // 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 -@@ -308,7 +308,7 @@ +diff --git a/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java b/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java +index 0c13ace6f..d92d4fc45 100755 +--- a/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java ++++ b/rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/EquinoxLocations.java +@@ -308,7 +308,7 @@ public class EquinoxLocations { String appVersion = props.getProperty(PRODUCT_SITE_VERSION); if (appVersion == null || appVersion.trim().length() == 0) appVersion = ""; //$NON-NLS-1$ - appName += File.separator + appId + "_" + appVersion + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$ -+ appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ //$NON-NLS-2$ ++ appName += File.separator + appId + "_" + installDirHash; //$NON-NLS-1$ } catch (IOException e) { - // Do nothing if we get an exception. We will default to a standard location + // Do nothing if we get an exception. We will default to a standard location // in the user's home dir. diff --git a/SOURCES/eclipse-make-droplets-runnable.patch b/SOURCES/eclipse-make-droplets-runnable.patch index e1d1abc..155d7b8 100644 --- a/SOURCES/eclipse-make-droplets-runnable.patch +++ b/SOURCES/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 references; - - public ClassFileSignatureVisitor() { -- super(Opcodes.ASM7); -+ super(Opcodes.ASM6); - this.references = new ArrayList<>(); - } - -@@ -250,7 +250,7 @@ public class ReferenceExtractor extends ClassVisitor { - * @param mv - */ - public ClassFileMethodVisitor(MethodVisitor mv, String name, int argumentcount) { -- super(Opcodes.ASM7, mv); -+ super(Opcodes.ASM6, mv); - this.argumentcount = argumentcount; - this.linePositionTracker = new LinePositionTracker(); - this.lastLineNumber = -1; -@@ -635,7 +635,7 @@ public class ReferenceExtractor extends ClassVisitor { - class ClassFileFieldVisitor extends FieldVisitor { - - ClassFileFieldVisitor() { -- super(Opcodes.ASM7); -+ super(Opcodes.ASM6); - } - - @Override -@@ -991,7 +991,7 @@ public class ReferenceExtractor extends ClassVisitor { - * {@link ReferenceModifiers} - */ - public ReferenceExtractor(IApiType type, Set collector, int referenceKinds) { -- super(Opcodes.ASM7, new ClassNode()); -+ super(Opcodes.ASM6, new ClassNode()); - fType = type; - this.collector = collector; - fReferenceKinds = referenceKinds; -@@ -1008,7 +1008,7 @@ public class ReferenceExtractor extends ClassVisitor { - * @param tracker - */ - protected ReferenceExtractor(IApiType type, Set collector, int referenceKinds, FieldTracker tracker) { -- super(Opcodes.ASM7, new ClassNode()); -+ super(Opcodes.ASM6, new ClassNode()); - fType = type; - this.collector = collector; - fReferenceKinds = referenceKinds; -diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java -index e6e38604eb..490598b7b9 100644 ---- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java -+++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java -@@ -32,7 +32,7 @@ final class SignatureDecoder extends SignatureVisitor { - SignatureDescriptor signatureDescriptor; - - public SignatureDecoder(SignatureDescriptor signatureDescriptor) { -- super(Opcodes.ASM7); -+ super(Opcodes.ASM6); - this.signatureDescriptor = signatureDescriptor; - } - -diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java -index 4ff1492e86..7dc03b6aa4 100644 ---- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java -+++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java -@@ -57,7 +57,7 @@ public class TypeStructureBuilder extends ClassVisitor { - * unknown - */ - TypeStructureBuilder(ClassVisitor cv, IApiComponent component, IApiTypeRoot file) { -- super(Opcodes.ASM7, cv); -+ super(Opcodes.ASM6, cv); - fComponent = component; - fFile = file; - } -@@ -154,7 +154,7 @@ public class TypeStructureBuilder extends ClassVisitor { - } - } - final ApiMethod method = fType.addMethod(name, desc, signature, laccess, names); -- return new MethodVisitor(Opcodes.ASM7, -+ return new MethodVisitor(Opcodes.ASM6, - super.visitMethod(laccess, name, desc, signature, exceptions)) { - @Override - public AnnotationVisitor visitAnnotation(String sig, boolean visible) { -@@ -190,7 +190,7 @@ public class TypeStructureBuilder extends ClassVisitor { - int traceCount = 0; - - public AnnotationDefaultVisitor(ApiMethod method) { -- super(Opcodes.ASM7); -+ super(Opcodes.ASM6); - this.method = method; - } - -@@ -308,7 +308,7 @@ public class TypeStructureBuilder extends ClassVisitor { - String typeName; - - public EnclosingMethodSetter(ClassVisitor cv, String typeName) { -- super(Opcodes.ASM7, cv); -+ super(Opcodes.ASM6, cv); - this.typeName = typeName.replace('.', '/'); - } - -@@ -341,7 +341,7 @@ public class TypeStructureBuilder extends ClassVisitor { - protected EnclosingMethodSetter setter; - - public TypeNameFinder(MethodVisitor mv, EnclosingMethodSetter enclosingMethodSetter) { -- super(Opcodes.ASM7, mv); -+ super(Opcodes.ASM6, mv); - this.setter = enclosingMethodSetter; - } - -Submodule eclipse.platform.ui contains modified content -diff --git a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF -index eb08f62a5d..c11656359b 100644 ---- a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF -+++ b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF -@@ -10,8 +10,9 @@ Require-Bundle: org.junit, - 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.core;bundle-version="1.3.0", - org.hamcrest.library;bundle-version="1.3.0", -- org.mockito;bundle-version="2.13.0", -+ org.mockito.mockito-core, - org.eclipse.equinox.preferences;bundle-version="3.5.200", - org.eclipse.ui.forms, - org.eclipse.ui.views.properties.tabbed -diff --git a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF -index 19458ab029..986226a097 100644 ---- a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF -+++ b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF -@@ -31,8 +31,9 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.4.0", - 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.core;bundle-version="1.3.0", - org.hamcrest.library;bundle-version="1.3.0", -- org.mockito;bundle-version="2.13.0", -+ 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 -diff --git a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java -index 6d98e184d3..7def31d02c 100644 ---- a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java -+++ b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java -@@ -16,7 +16,7 @@ package org.eclipse.e4.ui.workbench.renderers.swt; - - import static org.junit.Assert.assertEquals; - import static org.junit.Assert.assertTrue; --import static org.mockito.ArgumentMatchers.any; -+import static org.mockito.Matchers.any; - import static org.mockito.Mockito.doReturn; - import static org.mockito.Mockito.mock; - import static org.mockito.Mockito.never; -diff --git a/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java b/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java -index 99654e3845..07facbb824 100644 ---- a/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java -+++ b/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java -@@ -13,8 +13,8 @@ - *******************************************************************************/ - package org.eclipse.ui.tests.themes; - --import static org.mockito.ArgumentMatchers.anyBoolean; --import static org.mockito.ArgumentMatchers.anyObject; -+import static org.mockito.Matchers.anyBoolean; -+import static org.mockito.Matchers.anyObject; - import static org.mockito.Mockito.doReturn; - import static org.mockito.Mockito.mock; - import static org.mockito.Mockito.spy; -diff --git a/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java b/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java -index 5c6d765a76..fa59d14187 100644 ---- a/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java -+++ b/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java -@@ -15,10 +15,10 @@ - package org.eclipse.ui.tests.themes; - - import static org.eclipse.ui.internal.themes.WorkbenchThemeManager.EMPTY_COLOR_VALUE; --import static org.mockito.ArgumentMatchers.any; --import static org.mockito.ArgumentMatchers.anyObject; --import static org.mockito.ArgumentMatchers.eq; --import static org.mockito.ArgumentMatchers.isNull; -+import static org.mockito.Matchers.any; -+import static org.mockito.Matchers.anyObject; -+import static org.mockito.Matchers.eq; -+import static org.mockito.Matchers.isNull; - import static org.mockito.Mockito.doReturn; - import static org.mockito.Mockito.mock; - import static org.mockito.Mockito.never; -@@ -102,11 +102,11 @@ public class WorkbenchThemeChangedHandlerTest extends TestCase { - verify(colorRegistry, times(1)).put(eq("colorDefinition"), any(RGB.class)); - verify(colorRegistry, times(1)).put(eq("colorDefinition"), eq(EMPTY_COLOR_VALUE)); - -- verify(handler, times(1)).populateDefinition(isNull(), isNull(), -+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), - eq(fontRegistry), eq(fontDefinition1), any(IPreferenceStore.class)); - verify(handler, never()).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), - eq(fontRegistry), eq(fontDefinition2), any(IPreferenceStore.class)); -- verify(handler, times(1)).populateDefinition(isNull(), isNull(), -+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), - eq(colorRegistry), eq(colorDefinition), any(IPreferenceStore.class)); - - verify(stylingEngine, times(1)).style(fontDefinition2); -@@ -165,22 +165,22 @@ public class WorkbenchThemeChangedHandlerTest extends TestCase { - //then - verify(stylingEngine, times(1)).style(fontDefinition1); - verify(fontRegistry, times(1)).put("fontDefinition1", null); -- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition1), -+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition1), - any(IPreferenceStore.class)); - - verify(stylingEngine, times(1)).style(fontDefinition2); - verify(fontRegistry, never()).put(eq("fontDefinition2"), any(FontData[].class)); -- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition2), -+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition2), - any(IPreferenceStore.class)); - - verify(stylingEngine, times(1)).style(colorDefinition1); - verify(colorRegistry, never()).put(eq("colorDefinition1"), any(RGB.class)); -- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition1), -+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition1), - any(IPreferenceStore.class)); - - verify(stylingEngine, times(1)).style(colorDefinition2); - verify(colorRegistry, times(1)).put("colorDefinition2", null); -- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition2), -+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition2), - any(IPreferenceStore.class)); - } - -@@ -227,9 +227,9 @@ public class WorkbenchThemeChangedHandlerTest extends TestCase { - verify(colorRegistry, times(1)).put("colorDefinition", null); - assertEquals(1, themeRegistry.getColors().length); - -- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition), -+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition), - any(IPreferenceStore.class)); -- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition), -+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition), - any(IPreferenceStore.class)); - - verify(handler, times(1)).resetThemeRegistries(themeRegistry, fontRegistry, colorRegistry); -@@ -297,13 +297,13 @@ public class WorkbenchThemeChangedHandlerTest extends TestCase { - verify(colorRegistry, times(1)).put(eq("colorDefinition2"), any(RGB.class)); - verify(colorRegistry, times(1)).put(eq("colorDefinition2"), eq(EMPTY_COLOR_VALUE)); - -- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition1), -+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition1), - any(IPreferenceStore.class)); -- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition2), -+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition2), - any(IPreferenceStore.class)); -- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition1), -+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition1), - any(IPreferenceStore.class)); -- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition2), -+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition2), - any(IPreferenceStore.class)); - - verify(handler, times(1)).resetThemeRegistries(themeRegistry, fontRegistry, colorRegistry); -diff --git a/eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF b/eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF -index 45c025610f..484f3a0092 100644 ---- a/eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF -+++ b/eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF -@@ -44,7 +44,7 @@ Require-Bundle: org.eclipse.core.resources, - org.eclipse.osgi.services;bundle-version="3.3.100", - org.hamcrest.core;bundle-version="1.3.0", - org.hamcrest.library;bundle-version="1.3.0", -- org.mockito;bundle-version="2.13.0" -+ org.mockito.mockito-core - Import-Package: javax.annotation - Eclipse-AutoStart: true - Export-Package: org.eclipse.ui.tests.api, -diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml -index 5514138f..ac5c0ee4 100644 ---- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml -+++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml -@@ -23,7 +23,7 @@ - - - -- -+ - - - -diff --git a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml -index d4728693..297e1031 100644 ---- a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml -+++ b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml -@@ -24,7 +24,7 @@ - - - -- -+ - - - 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/SOURCES/eclipse-pde-tp-support-droplets.patch b/SOURCES/eclipse-pde-tp-support-droplets.patch index dd23623..59ae65d 100644 --- a/SOURCES/eclipse-pde-tp-support-droplets.patch +++ b/SOURCES/eclipse-pde-tp-support-droplets.patch @@ -1,4 +1,4 @@ -From 72e58be8c9c5fbc6f6527318b4381a58cebfc120 Mon Sep 17 00:00:00 2001 +From 7843458db4b359cbee040c17ddda21d5fa6ddd35 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Thu, 7 Apr 2016 10:23:49 -0400 Subject: [PATCH] Support reading BundleInfo from p2 Droplets enabled @@ -6,28 +6,26 @@ Subject: [PATCH] Support reading BundleInfo from p2 Droplets enabled - 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(-) + .../org.eclipse.pde.core/META-INF/MANIFEST.MF | 1 + + .../eclipse/pde/internal/core/P2Utils.java | 50 +++++++++++++++++-- + 2 files changed, 46 insertions(+), 5 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 -@@ -104,6 +104,7 @@ Require-Bundle: +diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF b/eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF +index f045abd5b..864665785 100644 +--- a/eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF ++++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/META-INF/MANIFEST.MF +@@ -102,5 +102,6 @@ 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 ++Import-Package: 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 -@@ -17,8 +17,9 @@ +diff --git a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java +index 696d2318f..7ab4596d5 100644 +--- a/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java ++++ b/eclipse.pde.ui/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/P2Utils.java +@@ -17,8 +17,9 @@ package org.eclipse.pde.internal.core; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -39,7 +37,7 @@ index fbd4b81..55cd40e 100644 import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -@@ -31,7 +32,9 @@ +@@ -31,7 +32,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; @@ -49,7 +47,7 @@ index fbd4b81..55cd40e 100644 import org.eclipse.equinox.p2.core.IProvisioningAgent; import org.eclipse.equinox.p2.core.IProvisioningAgentProvider; import org.eclipse.equinox.p2.engine.IEngine; -@@ -60,6 +63,7 @@ +@@ -60,6 +63,7 @@ import org.eclipse.pde.core.plugin.IPluginModelBase; import org.eclipse.pde.core.plugin.TargetPlatform; import org.eclipse.pde.internal.build.BundleHelper; import org.eclipse.pde.internal.core.plugin.PluginBase; @@ -57,7 +55,7 @@ index fbd4b81..55cd40e 100644 import org.osgi.framework.Constants; /** -@@ -139,7 +143,16 @@ +@@ -139,7 +143,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(); @@ -75,7 +73,7 @@ index fbd4b81..55cd40e 100644 if (bundles == null || bundles.length == 0) { return null; } -@@ -171,11 +184,38 @@ +@@ -168,11 +181,38 @@ public class P2Utils { try { File home = basePath.toFile(); URL srcBundlesTxt = new URL(configurationArea.getProtocol(), configurationArea.getHost(), configurationArea.getFile().concat(SimpleConfiguratorManipulator.SOURCE_INFO_PATH)); @@ -113,8 +111,9 @@ index fbd4b81..55cd40e 100644 } - return srcBundles; + return allSrcBundles.toArray(new BundleInfo[0]); - } catch (MalformedURLException e) { + } catch (IOException e) { PDECore.log(e); return null; -- -2.7.4 +2.21.1 + diff --git a/SOURCES/eclipse-secondary-arches.patch b/SOURCES/eclipse-secondary-arches.patch index caa42a8..931eb5d 100644 --- a/SOURCES/eclipse-secondary-arches.patch +++ b/SOURCES/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/SOURCES/eclipse-support-symlink-bundles.patch b/SOURCES/eclipse-support-symlink-bundles.patch index 17f2e56..26de5cf 100644 --- a/SOURCES/eclipse-support-symlink-bundles.patch +++ b/SOURCES/eclipse-support-symlink-bundles.patch @@ -24,7 +24,7 @@ index d88d0a6..07fe087 100644 + 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", + org.osgi.framework.startlevel;version="1.0.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 diff --git a/SOURCES/eclipse-swt-avoid-javascript-at-build.patch b/SOURCES/eclipse-swt-avoid-javascript-at-build.patch index 8864089..8de5935 100644 --- a/SOURCES/eclipse-swt-avoid-javascript-at-build.patch +++ b/SOURCES/eclipse-swt-avoid-javascript-at-build.patch @@ -1,27 +1,47 @@ ---- 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 @@ +From dd7d5dd0a820b3efd1a7955a7b80c881a40ddafc Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Sat, 21 Mar 2020 15:29:00 +0000 +Subject: [PATCH] Avoid the need to have javascript interpreter in the build + root + +--- + .../bundles/binaries-parent/pom.xml | 17 ------ + .../bundles/org.eclipse.swt/buildSWT.xml | 53 ++++--------------- + 2 files changed, 11 insertions(+), 59 deletions(-) + +diff --git a/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml b/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml +index 4d209cfdc..eab439ae5 100644 +--- a/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml ++++ b/eclipse.platform.swt.binaries/bundles/binaries-parent/pom.xml +@@ -75,23 +75,6 @@ - - - org.mozilla -- rhino -- 1.7.10 +- rhino-runtime +- 1.7.12 +- +- +- org.apache.ant +- ant +- 1.10.7 - - - org.apache.ant - ant-apache-bsf -- 1.10.6 +- 1.10.7 - - ---- eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml.orig 2019-05-01 15:19:21.784965731 +0100 -+++ eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml 2019-05-01 16:40:48.623849151 +0100 -@@ -399,27 +399,8 @@ +diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml +index 9d4bb1b6f..6c1cdf690 100644 +--- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml ++++ b/eclipse.platform.swt/bundles/org.eclipse.swt/buildSWT.xml +@@ -374,27 +374,8 @@ @@ -50,7 +70,7 @@ -@@ -548,11 +529,7 @@ +@@ -523,11 +504,7 @@ @@ -63,7 +83,7 @@ -@@ -686,23 +663,15 @@ +@@ -661,23 +638,15 @@ @@ -96,3 +116,6 @@ +-- +2.21.1 + diff --git a/SOURCES/explicit-hamcrest.patch b/SOURCES/explicit-hamcrest.patch index a3b3bb3..7d10d4a 100644 --- a/SOURCES/explicit-hamcrest.patch +++ b/SOURCES/explicit-hamcrest.patch @@ -27,3 +27,33 @@ org.eclipse.core.runtime;bundle-version="3.13.0", org.eclipse.core.resources;bundle-version="3.12.0", org.eclipse.ui.ide;bundle-version="3.13.0", +--- 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 +--- 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 @@ + Bundle-ActivationPolicy: lazy + Eclipse-BundleShape: dir + Require-Bundle: org.junit, ++ org.hamcrest.core;bundle-version="1.3.0", + org.hamcrest.library;bundle-version="1.3.0", + org.eclipse.core.runtime;bundle-version="3.15.400", + org.eclipse.pde.launching;bundle-version="3.7.700", +--- eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF.orig 2019-09-23 09:46:23.507897561 +0100 ++++ eclipse.pde.ui/ui/org.eclipse.pde.ui.tests/META-INF/MANIFEST.MF 2019-09-23 09:46:45.658839342 +0100 +@@ -7,6 +7,7 @@ + Bundle-Activator: org.eclipse.pde.ui.tests.PDETestsPlugin + Bundle-Vendor: Eclipse.org + Require-Bundle: org.junit, ++ org.hamcrest.core, + org.eclipse.pde.ui, + org.eclipse.ui, + org.eclipse.core.resources, diff --git a/SOURCES/fix-ant-execution.patch b/SOURCES/fix-ant-execution.patch deleted file mode 100644 index 5ba0ebb..0000000 --- a/SOURCES/fix-ant-execution.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/eclipse.platform/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/AntSecurityManager.java b/eclipse.platform/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/AntSecurityManager.java -index b6c0d1e68..a35e683d7 100644 ---- a/eclipse.platform/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/AntSecurityManager.java -+++ b/eclipse.platform/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/AntSecurityManager.java -@@ -19,12 +19,6 @@ import java.net.SocketPermission; - import java.security.Permission; - import java.util.PropertyPermission; - --import org.eclipse.ant.core.AntCorePlugin; --import org.eclipse.ant.core.AntSecurityException; --import org.eclipse.core.runtime.IStatus; --import org.eclipse.core.runtime.Platform; --import org.eclipse.core.runtime.Status; -- - /** - * A security manager that always throws an AntSecurityException if the calling thread attempts to cause the Java Virtual Machine to - * exit/halt or if the restricted thread attempts to set a System property. Otherwise this manager just delegates to the pre-existing manager passed -@@ -453,8 +447,6 @@ public class AntSecurityManager extends SecurityManager { - return super.getInCheck(); - } - catch (NoSuchMethodException | SecurityException e) { -- Platform.getLog(AntCorePlugin.getPlugin().getBundle()).log(new Status(IStatus.WARNING, "org.eclipse.ant.launching", //$NON-NLS-1$ -- RemoteAntMessages.getString("AntSecurityManager.getInCheck"))); //$NON-NLS-1$ - return false; - } - } diff --git a/SOURCES/force-clean-after-p2-operations.patch b/SOURCES/force-clean-after-p2-operations.patch new file mode 100644 index 0000000..c1e0d3c --- /dev/null +++ b/SOURCES/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.700.qualifier ++Bundle-Version: 1.5.701.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.700-SNAPSHOT ++ 1.5.701-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/SPECS/eclipse.spec b/SPECS/eclipse.spec index 49527ae..4d0bd27 100644 --- a/SPECS/eclipse.spec +++ b/SPECS/eclipse.spec @@ -3,17 +3,17 @@ # this is a way to bootstrap Eclipse on secondary archs. %bcond_with bootstrap -# Set this to avoid building contributor tools and tests +# Set this to avoid building contributor tools %bcond_without contrib_tools Epoch: 1 %global eb_commit c985e357223668b4bc1fb76ea6b9e0c12829b7e8 -%global eclipse_rel %{version}RC2 -%global eclipse_tag S-%{eclipse_rel}-201906051800 +%global eclipse_rel %{version} +%global eclipse_tag R-%{eclipse_rel}-202003050155 -%global _jetty_version 9.4.19 -%global _lucene_version 8.0.0 +%global _jetty_version 9.4.27 +%global _lucene_version 8.4.1 %global _batik_version 1.11 %ifarch %{ix86} @@ -41,8 +41,8 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse -Version: 4.12 -Release: 6%{?dist} +Version: 4.15 +Release: 5%{?dist} License: EPL-2.0 URL: http://www.eclipse.org/ @@ -71,8 +71,6 @@ Patch4: eclipse-secondary-arches.patch Patch5: eclipse-debug-symbols.patch -#Patch6: eclipse-test-support.patch - # https://bugs.eclipse.org/bugs/show_bug.cgi?id=408138 Patch12: eclipse-fix-dropins.patch @@ -94,7 +92,6 @@ Patch14: eclipse-support-symlink-bundles.patch Patch15: eclipse-fix-tests.patch # Droplet fixes -Patch16: eclipse-adjust-droplets.patch Patch17: eclipse-pde-tp-support-droplets.patch # Disable uses by default @@ -119,20 +116,21 @@ Patch24: eclipse-swt-avoid-javascript-at-build.patch # Avoid optional dep used only for tests Patch25: eclipse-patch-out-fileupload-dep.patch -# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=548211 -Patch26: eclipse-ebz548211.patch -Patch27: eclipse-ebz548211-2.patch +# Force a clean on the restart after p2 operations +Patch26: force-clean-after-p2-operations.patch -# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=542708 -Patch28: eclipse-ebz542708.patch +Patch27: compiler-release.patch -# Fix regression in ant support -Patch29: fix-ant-execution.patch +# SCL-specific patches +Patch100: 0001-Avoid-limitation-with-older-shade-plug-in-versions-w.patch +Patch101: 0002-Allow-bootstrapping-against-OSGi-Core-R6.patch +Patch102: 0004-Add-parent-pom-for-old-tycho-pomless.patch -# Use ASM 6 instead of 7 -Patch30: eclipse-mockito.patch +# Upstream no longer supports non-64bit arches +ExclusiveArch: x86_64 -ExclusiveArch: x86_64 +# Build with Java 11 +BuildRequires: java-11-openjdk-devel BuildRequires: maven-local BuildRequires: tycho @@ -162,19 +160,16 @@ BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(webkit2gtk-4.0) -BuildRequires: icu4j >= 1:64.2 +BuildRequires: icu4j >= 1:65.1 BuildRequires: ant >= 1.10.5 -BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf -BuildRequires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf ant-xz BuildRequires: jsch >= 0:0.1.46-2 -BuildRequires: apache-commons-el >= 1.0-22 BuildRequires: apache-commons-logging BuildRequires: apache-commons-codec BuildRequires: apache-commons-jxpath BuildRequires: osgi(org.apache.felix.gogo.shell) >= 1.1.0 BuildRequires: osgi(org.apache.felix.gogo.command) >= 1.0.2 BuildRequires: osgi(org.apache.felix.gogo.runtime) >= 1.1.0 -BuildRequires: osgi(org.apache.felix.scr) >= 2.1.16 +BuildRequires: felix-scr >= 2.1.16-4 BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version} BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version} BuildRequires: osgi(org.eclipse.jetty.http) >= %{_jetty_version} @@ -191,7 +186,7 @@ BuildRequires: junit5 >= 5.4.0 BuildRequires: apiguardian BuildRequires: hamcrest BuildRequires: sat4j -BuildRequires: objectweb-asm >= 6.1.1 +BuildRequires: objectweb-asm >= 7.0 BuildRequires: sac BuildRequires: batik-css >= %{_batik_version} BuildRequires: batik-util >= %{_batik_version} @@ -199,8 +194,8 @@ BuildRequires: google-gson BuildRequires: xmlgraphics-commons >= 2.3 BuildRequires: xml-commons-apis BuildRequires: atinject -BuildRequires: eclipse-ecf-core >= 3.14.5 -BuildRequires: eclipse-emf-core >= 1:2.18.0 +BuildRequires: eclipse-ecf-core >= 3.14.7 +BuildRequires: eclipse-emf-core >= 1:2.21.0 BuildRequires: eclipse-license2 BuildRequires: glassfish-annotation-api BuildRequires: glassfish-el-api >= 3.0.1 @@ -218,10 +213,9 @@ BuildRequires: osgi(osgi.annotation) # For building docs and apitooling BuildRequires: eclipse-pde %if %{with contrib_tools} -# For contributor tools and tests +# For contributor tools BuildRequires: eclipse-egit BuildRequires: eclipse-emf-runtime -BuildRequires: mockito >= 2.23.9 %endif %endif @@ -251,21 +245,17 @@ Eclipse OSGi - Equinox %package platform Summary: Eclipse platform common files -Recommends: eclipse-abrt -Recommends: eclipse-usage + Requires: ant >= 1.10.5 -Requires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf -Requires: ant-commons-net ant-javamail ant-jdepend ant-junit ant-swing ant-jsch ant-testutil ant-apache-xalan2 ant-jmf ant-xz Requires: jsch >= 0.1.46-2 -Requires: apache-commons-el >= 1.0-23 Requires: apache-commons-logging Requires: apache-commons-codec Requires: apache-commons-jxpath Requires: osgi(org.apache.felix.gogo.shell) >= 1.1.0 Requires: osgi(org.apache.felix.gogo.command) >= 1.0.2 Requires: osgi(org.apache.felix.gogo.runtime) >= 1.1.0 -Requires: osgi(org.apache.felix.scr) >= 2.1.16 +Requires: felix-scr >= 2.1.16-4 Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version} Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version} Requires: osgi(org.eclipse.jetty.http) >= %{_jetty_version} @@ -284,27 +274,24 @@ Requires: batik-util >= %{_batik_version} Requires: xmlgraphics-commons >= 2.3 Requires: xml-commons-apis Requires: atinject -Requires: eclipse-ecf-core >= 3.14.5 -Requires: eclipse-emf-core >= 1:2.18.0 +Requires: eclipse-ecf-core >= 3.14.7 +Requires: eclipse-emf-core >= 1:2.21.0 Requires: glassfish-annotation-api Requires: glassfish-el-api >= 3.0.1 Requires: glassfish-el >= 3.0.1 Requires: glassfish-jsp-api >= 2.2.1-4 Requires: glassfish-jsp >= 2.2.5 Requires: glassfish-servlet-api >= 3.1.0 -Requires: icu4j >= 1:64.2 +Requires: icu4j >= 1:65.1 Requires: %{name}-swt = %{epoch}:%{version}-%{release} Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release} Requires: httpcomponents-core Requires: httpcomponents-client Requires: osgi(org.tukaani.xz) -# Provides/obsoletes added in F26 -# This is the best place to add this because adding it to the nls RPMs causes every -# single language pack to be installed, which is not desireable -- it needs to be -# obsoleted by exactly one thing. -Provides: eclipse-nls = %{version}-%{release} -Obsoletes: eclipse-nls < %{version}-%{release} +# Obsoletes added in F31 +Obsoletes: eclipse-epp-logging <= 2.0.8-4 +Obsoletes: eclipse-abrt <= 0.0.3-10 %description platform The Eclipse Platform is the base of all IDE plugins. This does not include the @@ -332,7 +319,7 @@ Summary: Eclipse Plugin Development Environment Requires: %{name}-platform = %{epoch}:%{version}-%{release} Requires: %{name}-jdt = %{epoch}:%{version}-%{release} -Requires: objectweb-asm >= 6.1.1 +Requires: objectweb-asm >= 7.0 %description pde Eclipse Plugin Development Environment. This package is required for @@ -351,25 +338,17 @@ install from existing P2 repositories or as a framework to build branded installer UIs. %if %{without bootstrap} && %{with contrib_tools} + %package contributor-tools Summary: Tools for Eclipse Contributors +# No longer shipping tests +Obsoletes: %{name}-tests < 1:4.14-2 Requires: %{name}-platform = %{epoch}:%{version}-%{release} -Requires: easymock -Requires: hamcrest -Requires: mockito >= 2.23.9 %description contributor-tools This package contains tools specifically for Eclipse contributors. It includes SWT tools, E4 tools, Rel-Eng tools and Eclipse Test frameworks. - -%package tests -Summary: Eclipse Tests - -Requires: %{name}-contributor-tools = %{epoch}:%{version}-%{release} - -%description tests -Eclipse Tests. %endif %prep @@ -382,7 +361,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 @@ -394,17 +373,15 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ %patch0 %patch1 -%patch2 +%patch2 -p1 %patch3 %patch4 -p1 %patch5 -#%patch6 %patch12 %patch13 -p1 %patch14 %patch15 -%patch16 -%patch17 +%patch17 -p1 %patch18 %patch19 %patch20 @@ -414,19 +391,21 @@ rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/ %endif %patch22 %patch23 -p1 -%patch24 +%patch24 -p1 %patch25 %patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 +%patch27 + +# SCL-specific patches +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 # Optional (unused) multipart support (see patch 25) rm rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/multipart/MultipartSupport{Impl,FactoryImpl,Part}.java -# 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 @@ -452,9 +431,6 @@ rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/ %pom_disable_module features/org.eclipse.equinox.sdk rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.console.jaas.fragment rt.equinox.bundles %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 @@ -465,10 +441,9 @@ rm eclipse.platform.swt/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/ %pom_disable_module features/org.eclipse.equinox.p2.sdk rt.equinox.p2 %pom_disable_module features/org.eclipse.equinox.server.p2 rt.equinox.bundles %pom_disable_module features/org.eclipse.equinox.serverside.sdk rt.equinox.bundles -%pom_disable_module bundles/org.eclipse.equinox.p2.tests.reconciler.product rt.equinox.p2 %pom_disable_module bundles/org.eclipse.equinox.p2.artifact.optimizers rt.equinox.p2 -%pom_disable_module bundles/org.eclipse.equinox.p2.tests.optimizers rt.equinox.p2 %pom_disable_module bundles/org.eclipse.equinox.p2.artifact.processors rt.equinox.p2 +%pom_disable_module bundles/org.eclipse.equinox.p2.artifact.checksums.bouncycastle rt.equinox.p2 # Don't need annotations for obsolete JDKs %pom_disable_module org.eclipse.jdt.annotation_v1 eclipse.jdt.core @@ -493,20 +468,34 @@ sed -i -e 's/javax.annotation/javax.annotation-api/' eclipse-platform-parent/pom %pom_disable_module examples/org.eclipse.compare.examples eclipse.platform.team %pom_disable_module examples/org.eclipse.compare.examples.xml eclipse.platform.team %pom_disable_module examples/org.eclipse.team.examples.filesystem eclipse.platform.team +%pom_disable_module org.eclipse.jface.text.examples eclipse.platform.text %pom_disable_module org.eclipse.ui.genericeditor.examples eclipse.platform.text %pom_disable_module org.eclipse.ui.intro.quicklinks.examples eclipse.platform.ua %pom_disable_module org.eclipse.ui.intro.solstice.examples eclipse.platform.ua -# Except for this one example, which is used by tests -%pom_xpath_inject "pom:modules" "examples/org.eclipse.jface.examples.databinding" eclipse.platform.ui + +# Disable tests +for pom in eclipse.jdt.core{,.binaries} eclipse.jdt.debug eclipse.jdt.ui eclipse.pde.build eclipse.pde.ui{,/apitools} \ + eclipse.platform eclipse.platform.debug eclipse.platform.releng eclipse.platform.resources eclipse.platform.runtime \ + eclipse.platform.swt eclipse.platform.team eclipse.platform.text eclipse.platform.ui eclipse.platform.ua \ + rt.equinox.bundles rt.equinox.framework rt.equinox.p2 ; do + sed -i -e '/.*tests.*<\/module>/d' $pom/pom.xml +done +%pom_disable_module bundles/org.eclipse.equinox.frameworkadmin.test rt.equinox.p2 +%pom_disable_module eclipse-junit-tests eclipse.platform.releng.tychoeclipsebuilder +%pom_disable_module ./tests/org.eclipse.e4.tools.test eclipse.platform.ui.tools + +# Disable test framework if we are not shipping tests +%pom_disable_module features/org.eclipse.test-feature eclipse.platform.releng +%pom_disable_module bundles/org.eclipse.test eclipse.platform.releng +%pom_disable_module bundles/org.eclipse.test.performance eclipse.platform.releng +%pom_disable_module bundles/org.eclipse.test.performance.win32 eclipse.platform.releng +%pom_disable_module bundles/org.eclipse.ant.optional.junit eclipse.platform.releng # Disable servletbridge stuff %pom_disable_module bundles/org.eclipse.equinox.http.servletbridge rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.servletbridge rt.equinox.bundles %pom_disable_module bundles/org.eclipse.equinox.servletbridge.template rt.equinox.bundles -# Missing dep on reddeer -%pom_disable_module ui/org.eclipse.pde.ui.tests.smartimport eclipse.pde.ui - # Don't need enforcer on RPM builds %pom_remove_plugin :maven-enforcer-plugin eclipse-platform-parent @@ -523,7 +512,6 @@ done # we are not currently building) TYCHO_ENV="linuxgtk%{eclipse_arch}" %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse-platform-parent -%pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests %pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse.platform.ui/bundles/org.eclipse.e4.ui.swt.gtk for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt\.(?!gtk\.linux.%{eclipse_arch}$)'` ; do module=$(grep ">bundles/$b<" eclipse.platform.swt.binaries/pom.xml || :) @@ -546,14 +534,13 @@ 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 || :) if [ -n "$module" ] ; then %pom_disable_module bundles/$b eclipse.platform.resources - %pom_xpath_remove -f "plugin[@id='$b']" eclipse.platform.resources/tests/org.eclipse.core.tests.filesystem.feature/feature.xml fi done %pom_disable_module org.eclipse.jdt.launching.macosx eclipse.jdt.debug @@ -577,10 +564,6 @@ for f in eclipse.jdt/org.eclipse.jdt-feature/feature.xml \ done done -# We don't need SWT fragments since we only care for current arch -%pom_disable_module tests/org.eclipse.swt.tests.fragments.feature eclipse.platform.swt -%pom_xpath_remove "pom:dependency-resolution" eclipse.platform.swt/tests/org.eclipse.swt.tests{,.gtk} - %if %{with bootstrap} || %{without contrib_tools} # Disable contributor tools that have external dependencies during bootstrap %pom_disable_module eclipse.platform.ui.tools @@ -590,21 +573,6 @@ done %pom_disable_module bundles/org.eclipse.swt.tools eclipse.platform.swt %pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng %pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng -# Disable tests for bootstrapping -%pom_disable_module features/org.eclipse.test-feature eclipse.platform.releng -%pom_disable_module bundles/org.eclipse.test eclipse.platform.releng -%pom_disable_module bundles/org.eclipse.test.performance eclipse.platform.releng -%pom_disable_module bundles/org.eclipse.test.performance.win32 eclipse.platform.releng -%pom_disable_module bundles/org.eclipse.ant.optional.junit eclipse.platform.releng -for pom in eclipse.jdt.core{,.binaries} eclipse.jdt.debug eclipse.jdt.ui eclipse.pde.build eclipse.pde.ui \ - eclipse.platform eclipse.platform.debug eclipse.platform.releng eclipse.platform.resources eclipse.platform.runtime \ - eclipse.platform.swt eclipse.platform.team eclipse.platform.text eclipse.platform.ui eclipse.platform.ua \ - rt.equinox.bundles rt.equinox.framework rt.equinox.p2 ; do - sed -i -e '/.*tests.*<\/module>/d' $pom/pom.xml -done -%pom_disable_module bundles/org.eclipse.equinox.frameworkadmin.test rt.equinox.p2 -%pom_disable_module eclipse-junit-tests eclipse.platform.releng.tychoeclipsebuilder -%pom_disable_module examples/org.eclipse.jface.examples.databinding eclipse.platform.ui %endif # Include some extra features with the product that some other projects may need at @@ -618,9 +586,6 @@ sed -i -e '/org.eclipse.ui.themes/i' \ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml -# Prevent dep cycle -%pom_xpath_remove "plugin[@id='org.eclipse.core.tests.harness']" eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml - # Include maven descriptors to allow our test execution setup to work %pom_xpath_set "pom:plugin[pom:artifactId = 'tycho-packaging-plugin']/pom:configuration/pom:archive/pom:addMavenDescriptor" "true" eclipse-platform-parent @@ -668,13 +633,12 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse. ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.coordinator/lib/ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse.equinox.log.stream/osgi/ +# Allow library detector to build on Java 11 +sed -i -e 's/target="1.1" source="1.3"/target="1.6" source="1.6"/' eclipse.jdt.debug/org.eclipse.jdt.launching/scripts/buildLaunchingSupportJAR.xml + # The order of these mvn_package calls is important %mvn_package "::pom::" __noinstall -%mvn_package ":*tests*" tests -%mvn_package ":org.eclipse.equinox.frameworkadmin.test" tests -%mvn_package ":org.eclipse.jface.examples.databinding" tests -%mvn_package ":org.eclipse.pde.tools.versioning" tests -%mvn_package "org.eclipse.test:org.eclipse.test" contributor-tools +%mvn_package ":org.eclipse.pde.tools.versioning" contributor-tools %mvn_package "::jar:sources{,-feature}:" sdk %mvn_package ":org.eclipse.jdt.doc.isv" sdk %mvn_package ":org.eclipse.platform.doc.isv" sdk @@ -686,11 +650,10 @@ ln -s $(build-classpath osgi-annotation) rt.equinox.bundles/bundles/org.eclipse. %mvn_package ":org.eclipse.e4{,.core}.tools*" contributor-tools %mvn_package ":org.eclipse.releng.tools" contributor-tools %mvn_package ":org.eclipse.swt.tools*" contributor-tools -%mvn_package "org.eclipse.test{,.feature}:" contributor-tools -%mvn_package ":org.eclipse.ant.optional.junit" contributor-tools %mvn_package "org.eclipse.cvs{,.feature}:" cvs %mvn_package "org.eclipse.team:org.eclipse.team.cvs*" cvs %mvn_package "org.eclipse.pde{,.ui,.feature}:" pde +%mvn_package ":org.eclipse.pde.api.tools*" pde %mvn_package "org.eclipse.ui:org.eclipse.ui.trace" pde %mvn_package "org.eclipse.sdk{,.feature}:" sdk %mvn_package ":" __noinstall @@ -707,7 +670,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 @@ -718,7 +682,7 @@ QUALIFIER=$(date -u -d"$(stat --format=%y %{SOURCE0})" +v%Y%m%d-%H%M) %if %{with bootstrap} -P !api-generation,!build-docs \ %endif - -Declipse.javadoc=/usr/bin/javadoc -Dnative=gtk.linux.%{eclipse_arch} \ + -Declipse.javadoc=%{_jvmdir}/java/bin/javadoc -Dnative=gtk.linux.%{eclipse_arch} \ -Dtycho.local.keepTarget \ -Dfedora.p2.repos=$(pwd)/.m2/p2/repo-sdk/plugins -DbuildType=X @@ -775,6 +739,7 @@ EOF popd #eclipse %install +export JAVA_HOME=%{_jvmdir}/java-11 %mvn_install # Some directories we need @@ -880,21 +845,6 @@ pushd %{buildroot}/%{_eclipsedir}/ ln -s $(abs2rel %{_jnidir}/swt.jar %{_eclipsedir}) popd -%if %{without bootstrap} && %{with contrib_tools} -# Tests framework -unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip \ - -d $RPM_BUILD_ROOT/%{_datadir}/ -x eclipse-testing/runtests.bat eclipse-testing/runtestsmac.sh -cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing -rm $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/eclipse-junit-tests-*.zip - -# These properties are not correct and nested properties won't get resolved -sed -i '/org.eclipse.equinox.p2.reconciler.test/ d' $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/equinoxp2tests.properties - -# Package testbundle-to-eclipse-test -cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/testbundle -mv $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/testbundle/eclipse-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/eclipse-runTestBundles -%endif - #fix so permissions find $RPM_BUILD_ROOT/%{_eclipsedir} -name *.so -exec chmod a+x {} \; @@ -972,6 +922,7 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.e4.ui.css.swt.theme_* %{_eclipsedir}/plugins/org.eclipse.e4.ui.di_* %{_eclipsedir}/plugins/org.eclipse.e4.ui.dialogs_* +%{_eclipsedir}/plugins/org.eclipse.e4.ui.ide_* %{_eclipsedir}/plugins/org.eclipse.e4.ui.model.workbench_* %{_eclipsedir}/plugins/org.eclipse.e4.ui.services_* %{_eclipsedir}/plugins/org.eclipse.e4.ui.swt.gtk_* @@ -1029,7 +980,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_* @@ -1051,6 +1001,7 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.team.genericeditor.diff.extension_* %{_eclipsedir}/plugins/org.eclipse.team.ui_* %{_eclipsedir}/plugins/org.eclipse.text_* +%{_eclipsedir}/plugins/org.eclipse.text.quicksearch_* %{_eclipsedir}/plugins/org.eclipse.ui_* %{_eclipsedir}/plugins/org.eclipse.ui.browser_* %{_eclipsedir}/plugins/org.eclipse.ui.cheatsheets_* @@ -1077,13 +1028,11 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.update.configurator_* %{_eclipsedir}/plugins/org.eclipse.urischeme_* %{_eclipsedir}/plugins/org.glassfish.web.javax.servlet.jsp_* -%{_eclipsedir}/plugins/org.kxml2_* %{_eclipsedir}/plugins/org.sat4j.core_* %{_eclipsedir}/plugins/org.sat4j.pb_* %{_eclipsedir}/plugins/org.tukaani.xz_* %{_eclipsedir}/plugins/org.w3c.css.sac_* %{_eclipsedir}/plugins/org.w3c.dom.svg_* -%{_eclipsedir}/plugins/org.xmlpull_* %doc %{_eclipsedir}/readme %{_eclipsedir}/artifacts.xml %{_eclipsedir}/p2 @@ -1099,11 +1048,8 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %files p2-discovery -f .mfiles-p2-discovery %if %{without bootstrap} && %{with contrib_tools} -%files contributor-tools -f .mfiles-contributor-tools -%files tests -f .mfiles-tests -%{_bindir}/eclipse-runTestBundles -%{_datadir}/eclipse-testing +%files contributor-tools -f .mfiles-contributor-tools %endif %files equinox-osgi -f .mfiles-equinox-osgi @@ -1113,6 +1059,60 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} %{_eclipsedir}/plugins/org.eclipse.osgi.util_* %changelog +* Thu Apr 02 2020 Mat Booth - 1:4.15-5 +- Make the requirement on felix-scr more strict + +* Thu Apr 02 2020 Mat Booth - 1:4.15-4 +- Allow library detector to build on Java 11 + +* Sun Mar 29 2020 Mat Booth - 1:4.15-3 +- Don't build and ship the test framework. We are not shipping any actual tests + anyway and this allows to drop the dependency on mockito and friends. + +* Mon Mar 23 2020 Mat Booth - 1:4.15-2 +- Set compiler release to Java 8 on certain bundles + +* Sat Mar 21 2020 Mat Booth - 1:4.15-1 +- Update to latest upstream release + +* Tue Jan 28 2020 Mat Booth - 1:4.14-5 +- Backport patch to fix build against GCC 10 + +* Thu Jan 23 2020 Mat Booth - 1:4.14-4 +- Remove BR on bouncycastle + +* Thu Jan 23 2020 Mat Booth - 1:4.14-3 +- Remove references to kxml/xpp3 + +* Thu Dec 19 2019 Mat Booth - 1:4.14-2 +- Full build +- Drop tests sub-package + +* 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 + +* Wed Dec 18 2019 Mat Booth - 1:4.13-6 +- Remove unnecessary dep on apache-commons-el +- Enable bootstrap mode + +* Wed Nov 20 2019 Mat Booth - 1:4.13-5 +- Obsolete retired packages + +* Mon Sep 23 2019 Mat Booth - 1:4.13-4 +- Add patch for ebz#550606 + +* Mon Sep 23 2019 Mat Booth - 1:4.13-3 +- Fix explicit hamcrest reqs + +* Mon Sep 16 2019 Mat Booth - 1:4.13-2 +- Fix PDE installation + +* Mon Sep 09 2019 Mat Booth - 1:4.13-1 +- Update to latest upstream release + * Wed Jul 24 2019 Mat Booth - 1:4.12-6 - Reenable normal debuginfo generation for the launcher binary on Fedora @@ -1400,4 +1400,3 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist} - Update to Oxygen I-build - Don't build unsupported GTK2 backend for SWT - Move installation to a multilib agnostic location /usr/lib -