From c626ede91792ecdc390aeac3c999f261173cb1ca Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Sun, 24 Feb 2019 16:19:56 -0500 Subject: [PATCH] Bug 543958: CDT Standalone debugger crashes on startup org.apache.felix.scr now needs a start-level. See also https://bugs.eclipse.org/bugs/show_bug.cgi?id=538729 Change-Id: Ia6f83a93449aeb32566be8893237e4bd2842b462 Signed-off-by: Marc-Andre Laperle --- debug/org.eclipse.cdt.debug.application.product/debug.product | 1 + .../org/eclipse/cdt/debug/application/ConfigGenerator.java | 1 + 2 files changed, 2 insertions(+) diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product index e6e57d2b759..7936d167058 100644 --- a/debug/org.eclipse.cdt.debug.application.product/debug.product +++ b/debug/org.eclipse.cdt.debug.application.product/debug.product @@ -383,6 +383,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U + diff --git a/debug/org.eclipse.cdt.debug.application/src-config-generator/org/eclipse/cdt/debug/application/ConfigGenerator.java b/debug/org.eclipse.cdt.debug.application/src-config-generator/org/eclipse/cdt/debug/application/ConfigGenerator.java index b0d04b60c04..c9766f48829 100644 --- a/debug/org.eclipse.cdt.debug.application/src-config-generator/org/eclipse/cdt/debug/application/ConfigGenerator.java +++ b/debug/org.eclipse.cdt.debug.application/src-config-generator/org/eclipse/cdt/debug/application/ConfigGenerator.java @@ -39,6 +39,7 @@ public class ConfigGenerator { private static final Set PLUGINS_NOT_IN_SCRIPT_VERSION = new HashSet<>(); static { + PLUGINS_WITH_START_LEVEL.put("org.apache.felix.scr", "@1\\:start"); //$NON-NLS-1$ //$NON-NLS-2$ PLUGINS_WITH_START_LEVEL.put("org.eclipse.equinox.ds", "@1\\:start"); //$NON-NLS-1$ //$NON-NLS-2$ PLUGINS_WITH_START_LEVEL.put("org.eclipse.equinox.common", "@2\\:start"); //$NON-NLS-1$ //$NON-NLS-2$ PLUGINS_WITH_START_LEVEL.put("org.eclipse.core.runtime", "@start"); //$NON-NLS-1$ //$NON-NLS-2$