diff --git a/doc/org.eclipse.uml2.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.uml2.doc/META-INF/MANIFEST.MF
index 0bc6259..bc62b39 100644
--- a/doc/org.eclipse.uml2.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.uml2.doc/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.doc; singleton:=true
-Bundle-Version: 3.1.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
+Require-Bundle: org.eclipse.help
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/examples/org.eclipse.uml2.examples.uml.ui/META-INF/MANIFEST.MF b/examples/org.eclipse.uml2.examples.uml.ui/META-INF/MANIFEST.MF
index a7d1999..92fe85a 100644
--- a/examples/org.eclipse.uml2.examples.uml.ui/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.uml2.examples.uml.ui/META-INF/MANIFEST.MF
@@ -11,10 +11,10 @@
 Export-Package: org.eclipse.uml2.examples.uml.ui,
  org.eclipse.uml2.examples.uml.ui.actions,
  org.eclipse.uml2.examples.uml.ui.dialogs
-Require-Bundle: org.eclipse.uml2.uml.editor;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecore.editor;bundle-version="[2.5.0,3.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)"
+Require-Bundle: org.eclipse.uml2.uml.editor;visibility:=reexport,
+ org.eclipse.ui.ide,
+ org.eclipse.emf.ecore.editor,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.uml2.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.uml2.examples/META-INF/MANIFEST.MF
index 5a03a1e..f1a4cc6 100644
--- a/examples/org.eclipse.uml2.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.uml2.examples/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.examples
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.codegen.ecore.ui/META-INF/MANIFEST.MF
index ecdeb92..00d741e 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.codegen.ecore.ui; singleton:=true
-Bundle-Version: 1.6.100.qualifier
+Bundle-Version: 1.7.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.uml2.codegen.ecore.ui.CodeGenEcoreUIPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -10,11 +10,11 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.uml2.codegen.ecore.genmodel.provider,
  org.eclipse.uml2.codegen.ecore.ui
-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)",
- org.eclipse.jdt.core;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.7.0,2.8.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.uml2.codegen.ecore;bundle-version="[1.5.0,2.0.0)";visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.jdt.core,
+ org.eclipse.emf.codegen.ecore.ui,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.uml2.codegen.ecore;visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.uml2.codegen.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.codegen.ecore/META-INF/MANIFEST.MF
index db78552..f5ab8e3 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.codegen.ecore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.codegen.ecore; singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.uml2.codegen.ecore.CodeGenEcorePlugin$Implementation
 Bundle-Vendor: %providerName
@@ -16,10 +16,10 @@
  org.eclipse.uml2.codegen.ecore.templates.edit;x-internal:=true,
  org.eclipse.uml2.codegen.ecore.templates.model;x-internal:=true,
  org.eclipse.uml2.codegen.ecore.templates.model.tests;x-internal:=true
-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)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.codegen.ecore;bundle-version="[2.7.0,2.8.0)";visibility:=reexport,
- org.eclipse.jdt.core;bundle-version="[3.5.0,4.0.0)"
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.emf.codegen.ecore;visibility:=reexport,
+ org.eclipse.jdt.core
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.uml2.common.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.common.edit/META-INF/MANIFEST.MF
index 449da31..bf45df0 100644
--- a/plugins/org.eclipse.uml2.common.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.common.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.common.edit; singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.6.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,9 +10,9 @@
 Export-Package: org.eclipse.uml2.common.edit.command,
  org.eclipse.uml2.common.edit.domain,
  org.eclipse.uml2.common.edit.provider
-Require-Bundle: org.eclipse.uml2.common;bundle-version="[1.5.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.change;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"
+Require-Bundle: org.eclipse.uml2.common;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.change;visibility:=reexport,
+ org.eclipse.core.runtime
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF
index f45735a..37c8d58 100644
--- a/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.common/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.common; singleton:=true
-Bundle-Version: 1.6.0.qualifier
+Bundle-Version: 1.7.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.uml2.common,
  org.eclipse.uml2.common.util
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"
+Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.core.runtime
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.uml2.common.CommonPlugin$Implementation
diff --git a/plugins/org.eclipse.uml2.uml.ecore.exporter/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml.ecore.exporter/META-INF/MANIFEST.MF
index 0761807..55d4557 100644
--- a/plugins/org.eclipse.uml2.uml.ecore.exporter/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml.ecore.exporter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.uml.ecore.exporter; singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.uml2.uml.ecore.exporter.UMLExporterPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -10,10 +10,10 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.uml2.uml.ecore.exporter,
  org.eclipse.uml2.uml.ecore.exporter.ui
-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)",
- org.eclipse.uml2.uml;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.exporter;bundle-version="[2.6.0,2.7.0)",
- org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.7.0,2.8.0)";resolution:=optional
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.uml2.uml,
+ org.eclipse.emf.exporter,
+ org.eclipse.emf.codegen.ecore.ui;resolution:=optional
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.uml2.uml.ecore.importer/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml.ecore.importer/META-INF/MANIFEST.MF
index 7f5228e..6e1f620 100644
--- a/plugins/org.eclipse.uml2.uml.ecore.importer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml.ecore.importer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.uml.ecore.importer;singleton:=true
-Bundle-Version: 2.5.0.qualifier
+Bundle-Version: 2.6.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.uml2.uml.ecore.importer.UMLImporterPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -11,13 +11,13 @@
 Export-Package: org.eclipse.uml2.uml.ecore.importer,
  org.eclipse.uml2.uml.ecore.importer.taskdefs,
  org.eclipse.uml2.uml.ecore.importer.ui
-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)",
- org.eclipse.uml2.uml;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.uml2.codegen.ecore;bundle-version="[1.5.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.importer;bundle-version="[2.6.0,2.7.0)",
- org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.7.0,2.8.0)";resolution:=optional,
- org.eclipse.emf.ant;bundle-version="[2.4.0,3.0.0)";resolution:=optional,
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.uml2.uml,
+ org.eclipse.uml2.codegen.ecore;visibility:=reexport,
+ org.eclipse.emf.importer,
+ org.eclipse.emf.codegen.ecore.ui;resolution:=optional,
+ org.eclipse.emf.ant;resolution:=optional,
  org.apache.ant;resolution:=optional
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.uml2.uml.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml.edit/META-INF/MANIFEST.MF
index 7f86d26..94c15f4 100644
--- a/plugins/org.eclipse.uml2.uml.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml.edit/META-INF/MANIFEST.MF
@@ -10,9 +10,9 @@
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.uml2.uml.edit,
  org.eclipse.uml2.uml.edit.providers
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.uml2.common.edit;bundle-version="[1.5.0,2.0.0)";visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.uml2.uml;visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.uml2.common.edit;visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.uml2.uml.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml.editor/META-INF/MANIFEST.MF
index 757bb02..827cd7b 100644
--- a/plugins/org.eclipse.uml2.uml.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml.editor/META-INF/MANIFEST.MF
@@ -12,11 +12,11 @@
  org.eclipse.uml2.uml.editor.actions,
  org.eclipse.uml2.uml.editor.dialogs,
  org.eclipse.uml2.uml.editor.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)";visibility:=reexport,
- org.eclipse.uml2.uml.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="[2.6.0,3.0.0)";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)";visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources;visibility:=reexport,
+ org.eclipse.uml2.uml.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.emf.edit.ui;visibility:=reexport,
+ org.eclipse.ui.ide;visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF
index ea12db3..71cf9f0 100644
--- a/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml.resources/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.uml2.uml;bundle-version="[4.0.0,5.0.0)"
+Require-Bundle: org.eclipse.uml2.uml
diff --git a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
index 9f30eb7..9bb3fa6 100644
--- a/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.uml/META-INF/MANIFEST.MF
@@ -14,11 +14,11 @@
  org.eclipse.uml2.uml.internal.resource;x-internal:=true,
  org.eclipse.uml2.uml.resource,
  org.eclipse.uml2.uml.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.uml2.common;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,
- org.eclipse.uml2.types;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.mapping.ecore2xml;bundle-version="[2.5.0,3.0.0)"
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.uml2.common;visibility:=reexport,
+ org.eclipse.uml2.types;visibility:=reexport,
+ org.eclipse.emf.mapping.ecore2xml
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF
index a86b31c..44f9330 100644
--- a/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.uml2.tests/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.uml2.tests
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/tests/org.eclipse.uml2.uml.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.uml.tests/META-INF/MANIFEST.MF
index 2b61e03..e400f1f 100644
--- a/tests/org.eclipse.uml2.uml.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.uml2.uml.tests/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.uml2.uml.tests
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.uml2.uml;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.junit;bundle-version="3.8.1";visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.uml2.uml;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.junit;visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy