[154947] Plugin version tolerances
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.consumer/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.connectivity.oda.consumer/META-INF/MANIFEST.MF
index 735547c..4a74e5d 100644
--- a/plugins/org.eclipse.datatools.connectivity.oda.consumer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.connectivity.oda.consumer/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DTP ODA Consumer Helper Component Plug-in
 Bundle-SymbolicName: org.eclipse.datatools.connectivity.oda.consumer;singleton:=true
-Bundle-Version: 3.0.2.200608221
+Bundle-Version: 3.0.2.200608301
 Bundle-Localization: plugin
 Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.datatools.connectivity.oda;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.datatools.connectivity.oda;bundle-version="[3.0.2,4.0.0)";visibility:=reexport
 Export-Package: org.eclipse.datatools.connectivity.oda.consumer.helper,
  org.eclipse.datatools.connectivity.oda.consumer.nls;x-friends:="org.eclipse.datatools.connectivity.oda.consumer.tests",
  org.eclipse.datatools.connectivity.oda.consumer.services,
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.connectivity.oda.design.ui/META-INF/MANIFEST.MF
index ca875db..e455ced 100644
--- a/plugins/org.eclipse.datatools.connectivity.oda.design.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.connectivity.oda.design.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.datatools.connectivity.oda.design.ui; singleton:=true
-Bundle-Version: 3.0.2.200608251
+Bundle-Version: 3.0.2.200608301
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
 Export-Package: org.eclipse.datatools.connectivity.oda.design.internal.ui,
@@ -10,10 +10,10 @@
  org.eclipse.datatools.connectivity.oda.design.ui.manifest,
  org.eclipse.datatools.connectivity.oda.design.ui.pages.impl,
  org.eclipse.datatools.connectivity.oda.design.ui.wizards
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.datatools.connectivity.ui;visibility:=reexport,
- org.eclipse.datatools.connectivity.oda;visibility:=reexport,
- org.eclipse.datatools.connectivity.oda.profile;visibility:=reexport,
- org.eclipse.datatools.connectivity.oda.design;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.datatools.connectivity.ui;bundle-version="[0.9.1,1.0.0)";visibility:=reexport,
+ org.eclipse.datatools.connectivity.oda;bundle-version="[3.0.2,4.0.0)";visibility:=reexport,
+ org.eclipse.datatools.connectivity.oda.profile;bundle-version="[3.0.2,4.0.0)";visibility:=reexport,
+ org.eclipse.datatools.connectivity.oda.design;bundle-version="[3.0.2,4.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.design/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.connectivity.oda.design/META-INF/MANIFEST.MF
index 584c9e4..303b7ca 100644
--- a/plugins/org.eclipse.datatools.connectivity.oda.design/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.connectivity.oda.design/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.connectivity.oda.design; singleton:=true
-Bundle-Version: 3.0.1.200608111
+Bundle-Version: 3.0.2.200608301
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
 Export-Package: org.eclipse.datatools.connectivity.oda.design,
  org.eclipse.datatools.connectivity.oda.design.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- com.ibm.icu;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.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
+ com.ibm.icu;bundle-version="[3.4.4,4.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/META-INF/MANIFEST.MF
index fbcce7f..61e915d 100644
--- a/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.connectivity.oda.flatfile.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.datatools.connectivity.oda.flatfile.ui; singleton:=true
-Bundle-Version: 3.0.1.200607031
+Bundle-Version: 3.0.2.200608301
 Bundle-Activator: org.eclipse.datatools.connectivity.oda.flatfile.ui.FlatFileUIPlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
 Export-Package: org.eclipse.datatools.connectivity.oda.flatfile.ui,
  org.eclipse.datatools.connectivity.oda.flatfile.ui.wizards
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.datatools.connectivity.oda.design.ui,
- org.eclipse.datatools.connectivity.oda.flatfile
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.datatools.connectivity.oda.design.ui;bundle-version="[3.0.2,4.0.0)",
+ org.eclipse.datatools.connectivity.oda.flatfile;bundle-version="[3.0.2,4.0.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.connectivity.oda.flatfile/META-INF/MANIFEST.MF
index 63356e2..6003be5 100644
--- a/plugins/org.eclipse.datatools.connectivity.oda.flatfile/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.connectivity.oda.flatfile/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.datatools.connectivity.oda.flatfile; singleton:=true
-Bundle-Version: 3.0.1.200608251
+Bundle-Version: 3.0.2.200608301
 Bundle-Activator: org.eclipse.datatools.connectivity.oda.flatfile.plugin.FlatfilePlugin
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
 Export-Package: org.eclipse.datatools.connectivity.oda.flatfile,
  org.eclipse.datatools.connectivity.oda.flatfile.plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.datatools.connectivity.oda,
- org.junit;resolution:=optional,
- com.ibm.icu
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.datatools.connectivity.oda;bundle-version="[3.0.2,4.0.0)",
+ org.junit;bundle-version="[3.8.1,4.0.0)";resolution:=optional,
+ com.ibm.icu;bundle-version="[3.4.4,4.0.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.datatools.connectivity.oda.profile/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.connectivity.oda.profile/META-INF/MANIFEST.MF
index 192e4d5..8478dac 100644
--- a/plugins/org.eclipse.datatools.connectivity.oda.profile/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.connectivity.oda.profile/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.datatools.connectivity.oda.profile
-Bundle-Version: 3.0.1.200608161
+Bundle-Version: 3.0.2.200608301
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
 Export-Package: org.eclipse.datatools.connectivity.oda.profile
-Require-Bundle: org.eclipse.datatools.connectivity;visibility:=reexport,
- org.eclipse.datatools.connectivity.oda.consumer,
- org.eclipse.core.runtime,
- org.eclipse.ui,
- org.junit;resolution:=optional
+Require-Bundle: org.eclipse.datatools.connectivity;bundle-version="[0.9.1,1.0.0)";visibility:=reexport,
+ org.eclipse.datatools.connectivity.oda.consumer;bundle-version="[3.0.2,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.junit;bundle-version="[3.8.1,4.0.0)";resolution:=optional
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.datatools.connectivity.oda/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.connectivity.oda/META-INF/MANIFEST.MF
index 46fe282..a9ab27e 100644
--- a/plugins/org.eclipse.datatools.connectivity.oda/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.connectivity.oda/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DTP Open Data Access
 Bundle-SymbolicName: org.eclipse.datatools.connectivity.oda; singleton:=true
-Bundle-Version: 3.0.2.200608231
+Bundle-Version: 3.0.2.200608301
 Bundle-Vendor: Eclipse.org
 Bundle-Localization: plugin
 Export-Package: org.eclipse.datatools.connectivity.oda,
@@ -10,7 +10,7 @@
  org.eclipse.datatools.connectivity.oda.util,
  org.eclipse.datatools.connectivity.oda.util.logging,
  org.eclipse.datatools.connectivity.oda.util.manifest
-Require-Bundle: org.eclipse.core.runtime,
- com.ibm.icu;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ com.ibm.icu;bundle-version="[3.4.4,4.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-Activator: org.eclipse.datatools.connectivity.oda.util.OdaPlugin
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/META-INF/MANIFEST.MF
index d7d012c..59c798f 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DTP ODA Consumer Helper Tests Suite
 Bundle-SymbolicName: org.eclipse.datatools.connectivity.oda.consumer.tests;singleton:=true
-Bundle-Version: 3.0.2.200608221
+Bundle-Version: 3.0.2.200608301
 Bundle-Localization: plugin
 Bundle-Vendor: Eclipse.org
-Require-Bundle: org.junit,
- org.eclipse.datatools.connectivity.oda.consumer,
- org.eclipse.datatools.connectivity.oda.flatfile;resolution:=optional,
- org.eclipse.core.runtime
+Require-Bundle: org.junit;bundle-version="[3.8.1,4.0.0)",
+ org.eclipse.datatools.connectivity.oda.consumer;bundle-version="[3.0.2,4.0.0)",
+ org.eclipse.datatools.connectivity.oda.flatfile;bundle-version="[3.0.2,4.0.0)";resolution:=optional,
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)"
diff --git a/tests/org.eclipse.datatools.connectivity.oda.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.datatools.connectivity.oda.tests/META-INF/MANIFEST.MF
index 532365e..cc23e3c 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.datatools.connectivity.oda.tests/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: DTP ODA Tests Suite
 Bundle-SymbolicName: org.eclipse.datatools.connectivity.oda.tests;singleton:=true
-Bundle-Version: 3.0.2.200608041
+Bundle-Version: 3.0.2.200608301
 Bundle-Localization: plugin
 Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.datatools.connectivity.oda,
- org.junit
+Require-Bundle: org.eclipse.datatools.connectivity.oda;bundle-version="[3.0.2,4.0.0)",
+ org.junit;bundle-version="[3.8.1,4.0.0)"