diff --git a/examples/org.eclipse.ocl.examples.codegen/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.codegen/META-INF/MANIFEST.MF
index 4c0b3c6..9daded4 100644
--- a/examples/org.eclipse.ocl.examples.codegen/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.codegen/META-INF/MANIFEST.MF
@@ -4,8 +4,8 @@
 Bundle-SymbolicName: org.eclipse.ocl.examples.codegen;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.text;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.codegen.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.uml2.codegen.ecore;bundle-version="[1.7.0,2.0.0)",
diff --git a/examples/org.eclipse.ocl.examples.common/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.common/META-INF/MANIFEST.MF
index 60a25c1..3e613c1 100644
--- a/examples/org.eclipse.ocl.examples.common/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.common/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.ocl.ecore;bundle-version="[3.0.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.ocl.examples.domain/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.domain/META-INF/MANIFEST.MF
index 1530db4..d96fd7c 100644
--- a/examples/org.eclipse.ocl.examples.domain/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.domain/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ocl.examples.domain;singleton:=true
 Bundle-Version: 3.3.0.qualifier
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.ocl.examples.common;bundle-version="[3.2.0,4.0.0)";visibility:=reexport
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer.ui/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.impactanalyzer.ui/META-INF/MANIFEST.MF
index 9a41480..60dc7f1 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer.ui/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer.ui/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@
 Bundle-Version: 3.2.100.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl.ecore;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.6.0,3.0.0)",
diff --git a/examples/org.eclipse.ocl.examples.impactanalyzer/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.impactanalyzer/META-INF/MANIFEST.MF
index 233443d..cba49bd 100644
--- a/examples/org.eclipse.ocl.examples.impactanalyzer/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.impactanalyzer/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl.ecore;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.osgi;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
diff --git a/examples/org.eclipse.ocl.examples.interpreter/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.interpreter/META-INF/MANIFEST.MF
index f287e99..477437c 100644
--- a/examples/org.eclipse.ocl.examples.interpreter/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.interpreter/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@
  org.eclipse.ocl.examples.interpreter.console.text,
  org.eclipse.ocl.examples.interpreter.delegate,
  org.eclipse.ocl.examples.interpreter.internal.l10n;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.console;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
diff --git a/examples/org.eclipse.ocl.examples.library/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.library/META-INF/MANIFEST.MF
index 3f51a5d..f0f4ea3 100644
--- a/examples/org.eclipse.ocl.examples.library/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.library/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ocl.examples.library;singleton:=true
 Bundle-Version: 3.3.0.qualifier
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl.examples.domain;bundle-version="[3.3.0,4.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.ocl.examples.library,
diff --git a/examples/org.eclipse.ocl.examples.modelregistry.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.modelregistry.edit/META-INF/MANIFEST.MF
index 0259ac4..2db5468 100644
--- a/examples/org.eclipse.ocl.examples.modelregistry.edit/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.modelregistry.edit/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.ocl.examples.modelregistry.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.emf.ecore.edit;bundle-version="[2.6.0,3.0.0)";visibility:=reexport,
  org.eclipse.ocl.examples.modelregistry;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
diff --git a/examples/org.eclipse.ocl.examples.modelregistry.editor/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.modelregistry.editor/META-INF/MANIFEST.MF
index df1b230..39ffaea 100644
--- a/examples/org.eclipse.ocl.examples.modelregistry.editor/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.modelregistry.editor/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.ocl.examples.modelregistry.presentation
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.emf.ecore.editor;bundle-version="[2.6.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.ocl.examples.modelregistry.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
diff --git a/examples/org.eclipse.ocl.examples.modelregistry.ui/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.modelregistry.ui/META-INF/MANIFEST.MF
index eb8d976..ee2eda9 100644
--- a/examples/org.eclipse.ocl.examples.modelregistry.ui/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.modelregistry.ui/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@
 Bundle-Localization: plugin
 Export-Package: org.eclipse.ocl.examples.modelregistry.ui.properties,
  org.eclipse.ocl.examples.modelregistry.ui.ripoffs
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl.examples.modelregistry.editor;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.ocl.examples.pivot/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.pivot/META-INF/MANIFEST.MF
index 118944b..cff10d3 100644
--- a/examples/org.eclipse.ocl.examples.pivot/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.pivot/META-INF/MANIFEST.MF
@@ -28,7 +28,7 @@
  org.eclipse.ocl.examples.pivot.util,
  org.eclipse.ocl.examples.pivot.utilities,
  org.eclipse.ocl.examples.pivot.validation
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.emf.codegen.ecore;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.emf.mapping.ecore2xml;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.uml2.codegen.ecore;bundle-version="[1.8.0,2.0.0)",
diff --git a/examples/org.eclipse.ocl.examples.ui/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.ui/META-INF/MANIFEST.MF
index 833602b..4f737b3 100644
--- a/examples/org.eclipse.ocl.examples.ui/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.ocl.examples.ui;singleton:=true
 Bundle-Version: 1.1.0.qualifier
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.xtext.ui;bundle-version="[2.0.0,3.0.0)"
diff --git a/examples/org.eclipse.ocl.examples.xtext.base/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.xtext.base/META-INF/MANIFEST.MF
index aef9a51..e157bbc 100644
--- a/examples/org.eclipse.ocl.examples.xtext.base/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.xtext.base/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@
  org.eclipse.ocl.examples.xtext.base.services,
  org.eclipse.ocl.examples.xtext.base.util,
  org.eclipse.ocl.examples.xtext.base.utilities
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl.examples.pivot;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
  org.eclipse.xtext;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.common.types;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
diff --git a/examples/org.eclipse.ocl.examples.xtext.completeocl/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.xtext.completeocl/META-INF/MANIFEST.MF
index 2e8e7cf..498699a 100644
--- a/examples/org.eclipse.ocl.examples.xtext.completeocl/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.xtext.completeocl/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@
 Bundle-Version: 3.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.ocl.examples.xtext.completeocl; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl.examples.xtext.essentialocl;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.validation;bundle-version="[1.0.0,2.0.0)";resolution:=optional
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/examples/org.eclipse.ocl.examples.xtext.console/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.xtext.console/META-INF/MANIFEST.MF
index 1154172..3f62263 100644
--- a/examples/org.eclipse.ocl.examples.xtext.console/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.xtext.console/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@
  org.eclipse.ocl.examples.xtext.console.actions,
  org.eclipse.ocl.examples.xtext.console.messages;x-internal:=true,
  org.eclipse.ocl.examples.xtext.console.xtfo
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui.console;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
  org.eclipse.ui.navigator;bundle-version="[3.4.0,4.0.0)",
diff --git a/examples/org.eclipse.ocl.examples.xtext.essentialocl/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.xtext.essentialocl/META-INF/MANIFEST.MF
index b8a7624..064defb 100644
--- a/examples/org.eclipse.ocl.examples.xtext.essentialocl/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.xtext.essentialocl/META-INF/MANIFEST.MF
@@ -24,8 +24,8 @@
  org.eclipse.ocl.examples.xtext.essentialocl.util,
  org.eclipse.ocl.examples.xtext.essentialocl.utilities,
  org.eclipse.ocl.examples.xtext.essentialocl.validation
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl.examples.xtext.base;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
  org.eclipse.xtext.common.types;bundle-version="[2.4.0,3.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.ocl.examples.xtext.markup/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.xtext.markup/META-INF/MANIFEST.MF
index ffd1bae..993f964 100644
--- a/examples/org.eclipse.ocl.examples.xtext.markup/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.xtext.markup/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@
  org.eclipse.ocl.examples.xtext.markup.services,
  org.eclipse.ocl.examples.xtext.markup.util,
  org.eclipse.ocl.examples.xtext.markup.validation
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.xtext;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
  org.eclipse.ocl.examples.pivot;bundle-version="[3.3.0,4.0.0)";visibility:=reexport
diff --git a/examples/org.eclipse.ocl.examples.xtext.oclinecore/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.xtext.oclinecore/META-INF/MANIFEST.MF
index 1bf8012..34cd725 100644
--- a/examples/org.eclipse.ocl.examples.xtext.oclinecore/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.xtext.oclinecore/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-Version: 3.3.0.qualifier
 Bundle-SymbolicName: org.eclipse.ocl.examples.xtext.oclinecore; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl.examples.xtext.essentialocl;bundle-version="[3.3.0,4.0.0)";visibility:=reexport
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/examples/org.eclipse.ocl.examples.xtext.oclstdlib/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.xtext.oclstdlib/META-INF/MANIFEST.MF
index 61113ea..8a15570 100644
--- a/examples/org.eclipse.ocl.examples.xtext.oclstdlib/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.xtext.oclstdlib/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.ocl.examples.xtext.oclstdlib; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl.examples.xtext.essentialocl;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
  org.eclipse.xtext.common.types;bundle-version="[2.4.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/examples/org.eclipse.ocl.examples.xtext2lpg/META-INF/MANIFEST.MF b/examples/org.eclipse.ocl.examples.xtext2lpg/META-INF/MANIFEST.MF
index 1b42c16..724ed71 100644
--- a/examples/org.eclipse.ocl.examples.xtext2lpg/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.ocl.examples.xtext2lpg/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.acceleo.engine;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)"
diff --git a/plugins/org.eclipse.ocl.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.ocl.common.ui/META-INF/MANIFEST.MF
index 9bc8383..d018d76 100644
--- a/plugins/org.eclipse.ocl.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ocl.common.ui/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@
 Bundle-Localization: plugin
 Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.ocl.common.ui.internal.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.ocl.common;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.ocl.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.ocl.common/META-INF/MANIFEST.MF
index d65e09b..4ffca29 100644
--- a/plugins/org.eclipse.ocl.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ocl.common/META-INF/MANIFEST.MF
@@ -16,6 +16,6 @@
  org.eclipse.ocl.common.internal.options,
  org.eclipse.ocl.common.internal.preferences,
  org.eclipse.ocl.common.preferences
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.ocl.ecore.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.ocl.ecore.edit/META-INF/MANIFEST.MF
index be6b338..7925f6e 100644
--- a/plugins/org.eclipse.ocl.ecore.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ocl.ecore.edit/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.ocl.ecore.edit,
  org.eclipse.ocl.ecore.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl.ecore;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.ocl.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.ocl.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.ocl.ecore/META-INF/MANIFEST.MF
index e267d56..ac2efff 100644
--- a/plugins/org.eclipse.ocl.ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ocl.ecore/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-Activator: org.eclipse.ocl.ecore.internal.OCLEcorePlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.ocl.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.ocl.edit/META-INF/MANIFEST.MF
index 180ddb1..4970b47 100644
--- a/plugins/org.eclipse.ocl.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ocl.edit/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@
  org.eclipse.ocl.expressions.provider,
  org.eclipse.ocl.types.provider,
  org.eclipse.ocl.utilities.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.uml2.common.edit;bundle-version="[1.5.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.ocl.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.ocl.ui/META-INF/MANIFEST.MF
index 2f5b8a9..249cef1 100644
--- a/plugins/org.eclipse.ocl.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ocl.ui/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@
 Bundle-SymbolicName: org.eclipse.ocl.ui;singleton:=true
 Bundle-Localization: plugin
 Bundle-Version: 1.1.0.qualifier
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
  org.eclipse.ocl.common.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.ocl.uml.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.ocl.uml.edit/META-INF/MANIFEST.MF
index 6438097..770d8e3 100644
--- a/plugins/org.eclipse.ocl.uml.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ocl.uml.edit/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.ocl.uml.edit,
  org.eclipse.ocl.uml.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl.uml;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.ocl.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.uml2.uml.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
diff --git a/plugins/org.eclipse.ocl.uml.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.ocl.uml.ui/META-INF/MANIFEST.MF
index c244d72..fd6dbed 100644
--- a/plugins/org.eclipse.ocl.uml.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ocl.uml.ui/META-INF/MANIFEST.MF
@@ -4,8 +4,8 @@
 Bundle-SymbolicName: org.eclipse.ocl.uml.ui;singleton:=true
 Bundle-Localization: plugin
 Bundle-Version: 1.0.100.qualifier
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ocl.uml;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.ocl.common.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.ocl.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.ocl.uml/META-INF/MANIFEST.MF
index f5de12a..6424236 100644
--- a/plugins/org.eclipse.ocl.uml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ocl.uml/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@
  org.eclipse.ocl.uml.internal;x-friends:="org.eclipse.ocl.uml.tests",
  org.eclipse.ocl.uml.internal.operations,
  org.eclipse.ocl.uml.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.uml2.uml.resources;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.ocl;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
diff --git a/plugins/org.eclipse.ocl/META-INF/MANIFEST.MF b/plugins/org.eclipse.ocl/META-INF/MANIFEST.MF
index e618558..6a68a49 100644
--- a/plugins/org.eclipse.ocl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ocl/META-INF/MANIFEST.MF
@@ -40,7 +40,7 @@
  org.eclipse.ocl.utilities.util
 Import-Package: com.ibm.icu.lang;version="4.0.0";resolution:=optional,
  com.ibm.icu.text;version="4.0.0";resolution:=optional
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  lpg.runtime.java;bundle-version="[2.0.17,3.0.0)";visibility:=reexport,
diff --git a/tests/org.eclipse.ocl.examples.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ocl.examples.tests/META-INF/MANIFEST.MF
index 29acecc..8b216c5 100644
--- a/tests/org.eclipse.ocl.examples.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ocl.examples.tests/META-INF/MANIFEST.MF
@@ -10,8 +10,8 @@
  org.eclipse.ocl.examples.test.modelregistry.testProject,
  org.eclipse.ocl.examples.test.modelregistry.testProject.model
 Require-Bundle: org.junit4;bundle-version="[4.5.0,5.0.0)";visibility:=reexport,
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.ui.editors;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ocl.examples.xtext.tests/META-INF/MANIFEST.MF
index ca05eb7..1c306b6 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
 Bundle-Activator: org.eclipse.ocl.examples.xtext.tests.Activator
 Require-Bundle: org.junit;visibility:=reexport,
  org.apache.log4j;bundle-version="[1.2.15,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.codegen.ecore;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.examples.library,