commit d19215a5ae3190b86b13d9ce52f1ca6166df5ece
author Markus Keller <markus_keller@ch.ibm.com> Thu Feb 02 18:23:10 2017 +0100
committer Markus Keller <markus_keller@ch.ibm.com> Thu Feb 02 18:23:10 2017 +0100
tree f187256fe9fbb70d41e5d7725316c69a7775cedb
parent 0664d57975509e82995923f043ab322804ccbc4b

Bug 511517: 11 test errors in SearchCheatsheet since I20170201-1030

Temporary workaround for a resolver issue, see bug 511517 comment 6

org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF

diff --git a/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF b/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
index 818d64c..d3d6a5d 100644
--- a/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@
  org.eclipse.ui.forms;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.help;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.help.base;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
+ org.eclipse.help.base;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.help.ui;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
  org.eclipse.core.expressions;bundle-version="3.4.200"
 Eclipse-LazyStart: true

org.eclipse.ui.intro/META-INF/MANIFEST.MF

diff --git a/org.eclipse.ui.intro/META-INF/MANIFEST.MF b/org.eclipse.ui.intro/META-INF/MANIFEST.MF
index bd504d4..1ea79b6 100644
--- a/org.eclipse.ui.intro/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.intro/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@
  org.eclipse.ui.intro.contentproviders
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.help;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.help.base;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
+ org.eclipse.help.base;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.ui.forms;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="3.4.200",