Added dependency version ranges.

21 files changed, 187 insertions, 186 deletions

diff --git a/doc/org.eclipse.gmf.doc.ui/META-INF/MANIFEST.MF b/doc/org.eclipse.gmf.doc.ui/META-INF/MANIFEST.MF
index a62641b92..2ab0e6190 100644
--- a/doc/org.eclipse.gmf.doc.ui/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.gmf.doc.ui/META-INF/MANIFEST.MF
@@ -6,13 +6,13 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.gmf.internal.doc.ui.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ui.cheatsheets,
- org.eclipse.gmf.graphdef.edit,
- org.eclipse.gmf.bridge.ui,
- org.eclipse.emf.codegen.ecore.ui,
- org.eclipse.gmf.tooldef.edit
+Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.cheatsheets;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.gmf.graphdef.edit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.bridge.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.gmf.tooldef.edit;bundle-version="[1.0.0,2.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.gmf.internal.doc.ui;x-internal:=true,
  org.eclipse.gmf.internal.doc.ui.actions;x-internal:=true
diff --git a/examples/org.eclipse.gmf.ecore.editor/META-INF/MANIFEST.MF b/examples/org.eclipse.gmf.ecore.editor/META-INF/MANIFEST.MF
index a081ec4fe..288c41664 100644
--- a/examples/org.eclipse.gmf.ecore.editor/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.gmf.ecore.editor/META-INF/MANIFEST.MF
@@ -8,29 +8,30 @@ Bundle-Activator: org.eclipse.gmf.ecore.part.EcoreDiagramEditorPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.gmf.ecore.part
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.gef;visibility:=reexport,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,org.eclipse.gmf.runtime.diagram.ui.printing.render,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.gmf.runtime.notation.providers,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.emf.query.ocl;visibility:=reexport,
- org.eclipse.emf.ocl;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.gef;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.emf.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.emf.ui.properties;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.printing.render;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.notation.providers;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.query.ocl;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ocl;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
diff --git a/examples/org.eclipse.gmf.examples.taipan.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.gmf.examples.taipan.edit/META-INF/MANIFEST.MF
index 3c46ad4db..8aac57961 100644
--- a/examples/org.eclipse.gmf.examples.taipan.edit/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.gmf.examples.taipan.edit/META-INF/MANIFEST.MF
@@ -9,11 +9,11 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.gmf.examples.taipan.presentation,
  org.eclipse.gmf.examples.taipan.provider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.gmf.examples.taipan;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.examples.taipan;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/META-INF/MANIFEST.MF b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/META-INF/MANIFEST.MF
index 2465b5b42..07cb2089a 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/META-INF/MANIFEST.MF
@@ -8,28 +8,28 @@ Bundle-Activator: org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanDiagramE
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.gmf.examples.taipan.gmf.editor.part
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.ui.ide,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.gef;visibility:=reexport,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.gmf.runtime.notation.providers,
- org.eclipse.gmf.examples.taipan;visibility:=reexport,
- org.eclipse.gmf.examples.taipan.edit;visibility:=reexport,
- org.eclipse.emf.query.ocl;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.gef;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.emf.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.emf.ui.properties;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.notation.providers;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.examples.taipan;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.examples.taipan.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.query.ocl;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
diff --git a/examples/org.eclipse.gmf.examples.taipan/META-INF/MANIFEST.MF b/examples/org.eclipse.gmf.examples.taipan/META-INF/MANIFEST.MF
index a0b998a60..dc8bf76ed 100644
--- a/examples/org.eclipse.gmf.examples.taipan/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.gmf.examples.taipan/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@ Bundle-Localization: plugin
 Export-Package: org.eclipse.gmf.examples.taipan,
  org.eclipse.gmf.examples.taipan.impl,
  org.eclipse.gmf.examples.taipan.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.gmf.bridge.ui.dashboard/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.bridge.ui.dashboard/META-INF/MANIFEST.MF
index d049da4e9..645cf5af3 100644
--- a/plugins/org.eclipse.gmf.bridge.ui.dashboard/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.bridge.ui.dashboard/META-INF/MANIFEST.MF
@@ -6,17 +6,17 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.gmf.internal.bridge.ui.dashboard.Plugin
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.draw2d,
- org.eclipse.emf.ecore.editor,
- org.eclipse.emf.importer,
- org.eclipse.gmf.graphdef.edit,
- org.eclipse.gmf.tooldef.edit,
- org.eclipse.gmf.map.edit,
- org.eclipse.gmf.codegen.edit,
- org.eclipse.gmf.codegen.ui,
- org.eclipse.gmf.bridge.ui
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.ecore.editor;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.importer;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.gmf.graphdef.edit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.tooldef.edit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.map.edit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.codegen.edit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.codegen.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.bridge.ui;bundle-version="[1.0.0,2.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.gmf.internal.bridge.ui.dashboard;x-internal:=true
diff --git a/plugins/org.eclipse.gmf.bridge.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.bridge.ui/META-INF/MANIFEST.MF
index 7c152f305..a5bc1298e 100644
--- a/plugins/org.eclipse.gmf.bridge.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.bridge.ui/META-INF/MANIFEST.MF
@@ -6,18 +6,18 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.gmf.internal.bridge.ui.Plugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.jdt.ui,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore.edit,
- org.eclipse.gmf.bridge,
- org.eclipse.gmf.graphdef.edit,
- org.eclipse.gmf.tooldef.edit,
- org.eclipse.gmf.map.edit,
- org.eclipse.emf.codegen.ecore.ui
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.ecore.edit;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.gmf.bridge;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.graphdef.edit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.tooldef.edit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.map.edit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.2.0,3.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.gmf.internal.bridge.resolver;x-internal:=true,
  org.eclipse.gmf.internal.bridge.ui;x-friends:="org.eclipse.gmf.bridge.ui.dashboard,org.eclipse.gmf.doc.ui",
diff --git a/plugins/org.eclipse.gmf.bridge/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.bridge/META-INF/MANIFEST.MF
index 09544c836..44d33fcd9 100644
--- a/plugins/org.eclipse.gmf.bridge/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.bridge/META-INF/MANIFEST.MF
@@ -5,14 +5,14 @@ Bundle-SymbolicName: org.eclipse.gmf.bridge
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.gmf.map;visibility:=reexport,
- org.eclipse.gmf.codegen;visibility:=reexport,
- org.eclipse.gmf.runtime.notation;visibility:=reexport,
- org.eclipse.gmf.graphdef.codegen,
- org.eclipse.draw2d
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.gmf.map;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.codegen;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.graphdef.codegen;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)"
 Export-Package: org.eclipse.gmf.bridge.genmodel,
  org.eclipse.gmf.internal.bridge;x-friends:="org.eclipse.gmf.tests",
  org.eclipse.gmf.internal.bridge.naming;x-friends:="org.eclipse.gmf.tests",
diff --git a/plugins/org.eclipse.gmf.codegen.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.codegen.edit/META-INF/MANIFEST.MF
index 53ade62ec..6f834a3ac 100644
--- a/plugins/org.eclipse.gmf.codegen.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.codegen.edit/META-INF/MANIFEST.MF
@@ -8,12 +8,12 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.gmf.codegen.gmfgen.presentation,
  org.eclipse.gmf.codegen.gmfgen.provider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.gmf.codegen;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.emf.codegen.ecore.ui
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.codegen;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.2.0,3.0.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.gmf.codegen.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.codegen.ui/META-INF/MANIFEST.MF
index c2075efde..f9ee51085 100644
--- a/plugins/org.eclipse.gmf.codegen.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.codegen.ui/META-INF/MANIFEST.MF
@@ -5,11 +5,11 @@ Bundle-SymbolicName: org.eclipse.gmf.codegen.ui; singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.gmf.internal.codegen.CodeGenUIPlugin
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.gmf.bridge,
- org.eclipse.gmf.codegen.edit
+Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.gmf.bridge;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.codegen.edit;bundle-version="[1.0.0,2.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.gmf.internal.codegen;x-friends:="org.eclipse.gmf.tests",
diff --git a/plugins/org.eclipse.gmf.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.codegen/META-INF/MANIFEST.MF
index 5ff7a6eaa..6ac140514 100644
--- a/plugins/org.eclipse.gmf.codegen/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.codegen/META-INF/MANIFEST.MF
@@ -8,13 +8,13 @@ Bundle-Localization: plugin
 Export-Package: org.eclipse.gmf.codegen.gmfgen,
  org.eclipse.gmf.codegen.gmfgen.util,
  org.eclipse.gmf.codegen.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.jface.text,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.codegen.ecore;visibility:=reexport,
- org.eclipse.emf.edit,
- org.eclipse.gef,
- org.eclipse.gmf.common;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.gmf.common;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.gmf.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.common/META-INF/MANIFEST.MF
index d40dd6b3b..ccd35f383 100644
--- a/plugins/org.eclipse.gmf.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.common/META-INF/MANIFEST.MF
@@ -8,10 +8,10 @@ Export-Package: org.eclipse.gmf.common,
  org.eclipse.gmf.common.codegen,
  org.eclipse.gmf.internal.codegen.dispatch;x-friends:="org.eclipse.gmf.codegen,org.eclipse.gmf.graphdef.codegen",
  org.eclipse.gmf.internal.common.reconcile;x-friends:="org.eclipse.gmf.codegen.ui,org.eclipse.gmf.tests"
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.codegen,
- org.eclipse.emf.codegen.ecore,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.eclipse.jface.text
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.codegen;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)"
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.graphdef.codegen.ui/META-INF/MANIFEST.MF
index e5f86d6f7..8ea2a9220 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.graphdef.codegen.ui/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@ Bundle-SymbolicName: org.eclipse.gmf.graphdef.codegen.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.pde.ui,
- org.eclipse.jface,
- org.eclipse.core.runtime,
- org.eclipse.pde.core,
- org.eclipse.core.resources,
- org.eclipse.gmf.graphdef.codegen,
- org.eclipse.emf.ecore,
- org.eclipse.gmf.common,
- org.eclipse.ui,
- org.eclipse.jdt.core
+Require-Bundle: org.eclipse.pde.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.pde.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.gmf.graphdef.codegen;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.gmf.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)"
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.graphdef.codegen/META-INF/MANIFEST.MF
index 95397c5a8..caebb81c9 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/META-INF/MANIFEST.MF
@@ -5,11 +5,11 @@ Bundle-SymbolicName: org.eclipse.gmf.graphdef.codegen;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.gmf.common, 
- org.eclipse.gmf.graphdef;visibility:=reexport,
- org.eclipse.emf.codegen,
- org.eclipse.draw2d
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.gmf.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.graphdef;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.codegen;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)"
 Export-Package: org.eclipse.gmf.graphdef.codegen,
  org.eclipse.gmf.internal.graphdef.codegen;x-friends:="org.eclipse.gmf.graphdef.codegen.ui,org.eclipse.gmf.tests"
diff --git a/plugins/org.eclipse.gmf.graphdef.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.graphdef.edit/META-INF/MANIFEST.MF
index 72653a910..263f8c8c8 100644
--- a/plugins/org.eclipse.gmf.graphdef.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.graphdef.edit/META-INF/MANIFEST.MF
@@ -9,11 +9,11 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.gmf.gmfgraph.presentation,
  org.eclipse.gmf.gmfgraph.provider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.gmf.graphdef;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.graphdef;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.gmf.graphdef/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.graphdef/META-INF/MANIFEST.MF
index bfbd4e32f..6e1d7aa26 100644
--- a/plugins/org.eclipse.gmf.graphdef/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.graphdef/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@ Bundle-SymbolicName: org.eclipse.gmf.graphdef; singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.emf.ecore,
- org.eclipse.gmf.common
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.gmf.common;bundle-version="[1.0.0,2.0.0)"
 Export-Package: org.eclipse.gmf.gmfgraph,
  org.eclipse.gmf.gmfgraph.impl;x-friends:="org.eclipse.gmf.map",
  org.eclipse.gmf.gmfgraph.util
diff --git a/plugins/org.eclipse.gmf.map.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.map.edit/META-INF/MANIFEST.MF
index f8908c11b..4381604e0 100644
--- a/plugins/org.eclipse.gmf.map.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.map.edit/META-INF/MANIFEST.MF
@@ -8,14 +8,14 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.gmf.mappings.presentation,
  org.eclipse.gmf.mappings.provider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.gmf.map;visibility:=reexport,
- org.eclipse.gmf.graphdef.edit,
- org.eclipse.gmf.tooldef.edit,
- org.eclipse.emf.ecore.edit
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.map;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.graphdef.edit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.tooldef.edit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emf.ecore.edit;bundle-version="[2.2.0,3.0.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.gmf.map/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.map/META-INF/MANIFEST.MF
index 9d7ee9a20..cc048b5f5 100644
--- a/plugins/org.eclipse.gmf.map/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.map/META-INF/MANIFEST.MF
@@ -7,8 +7,8 @@ Bundle-Vendor: Eclipse.org
 Export-Package: org.eclipse.gmf.mappings,
  org.eclipse.gmf.mappings.impl,
  org.eclipse.gmf.mappings.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.gmf.graphdef;visibility:=reexport,
- org.eclipse.gmf.tooldef;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.gmf.graphdef;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.gmf.tooldef;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.gmf.tooldef.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.tooldef.edit/META-INF/MANIFEST.MF
index 07d61515c..a89a9728c 100644
--- a/plugins/org.eclipse.gmf.tooldef.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.tooldef.edit/META-INF/MANIFEST.MF
@@ -9,11 +9,11 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.gmf.tooldef.presentation,
  org.eclipse.gmf.tooldef.provider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.gmf.tooldef;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.tooldef;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.gmf.tooldef/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.tooldef/META-INF/MANIFEST.MF
index b457b9db7..72279b8bc 100644
--- a/plugins/org.eclipse.gmf.tooldef/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.tooldef/META-INF/MANIFEST.MF
@@ -8,6 +8,6 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.gmf.tooldef,
  org.eclipse.gmf.tooldef.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF
index a7e0dc7c9..a3b98fe29 100644
--- a/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF
@@ -4,18 +4,18 @@ Bundle-Name: Graphical Modeling Framework Tests
 Bundle-SymbolicName: org.eclipse.gmf.tests;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jdt.core,
- org.junit,
- org.eclipse.gmf.bridge,
- org.eclipse.jface,
- org.eclipse.gef,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.graphdef.codegen,
- org.eclipse.gmf.tooldef,
- org.eclipse.emf.validation,
- org.eclipse.gmf.codegen.ui
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.junit;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.gmf.bridge;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.graphdef.codegen;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.tooldef;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emf.validation;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.gmf.codegen.ui;bundle-version="[1.0.0,2.0.0)"
 Bundle-Activator: org.eclipse.gmf.tests.Plugin
 Eclipse-LazyStart: true