Releng : Change version to 2
diff --git a/plugins/org.eclipse.datatools.sqltools.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.common.ui/META-INF/MANIFEST.MF
index 524666a..fb478d0 100644
--- a/plugins/org.eclipse.datatools.sqltools.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.common.ui/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.common.ui;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.common.ui.internal.Activator
 Bundle-Vendor: %Plugin.ProviderName
 Bundle-Localization: plugin
-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.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity.sqm.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.datatools.help;bundle-version="[0.9.0,1.7.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)"
-Import-Package: com.ibm.icu.text;version="3.6.1",
- com.ibm.icu.util;version="3.6.1"
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.debug.core,
+ org.eclipse.datatools.modelbase.sql,
+ org.eclipse.datatools.connectivity,
+ org.eclipse.datatools.connectivity.ui,
+ org.eclipse.datatools.connectivity.sqm.core,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.eclipse.core.filesystem,
+ org.eclipse.datatools.help,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.forms
+Import-Package: com.ibm.icu.text,
+ com.ibm.icu.util
 Export-Package: org.eclipse.datatools.sqltools.common.core.tableviewer,
  org.eclipse.datatools.sqltools.common.ui.actions,
  org.eclipse.datatools.sqltools.common.ui.dialog,
diff --git a/plugins/org.eclipse.datatools.sqltools.data.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.data.core/META-INF/MANIFEST.MF
index dfc96db..e65cb2e 100644
--- a/plugins/org.eclipse.datatools.sqltools.data.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.data.core/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.data.core; singleton:=true
-Bundle-Version: 1.2.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.data.internal.core.DataCorePlugin
 Bundle-Vendor: %plugin.Provider
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0, 4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity.sqm.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.result;bundle-version="[1.0.0,2.0.0)"
-Import-Package: com.ibm.icu.text;version="3.6.1",
- com.ibm.icu.util;version="3.6.1"
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.datatools.modelbase.sql,
+ org.eclipse.datatools.connectivity.sqm.core,
+ org.eclipse.datatools.sqltools.result
+Import-Package: com.ibm.icu.text,
+ com.ibm.icu.util
 Export-Package: org.eclipse.datatools.sqltools.data.internal.core,
  org.eclipse.datatools.sqltools.data.internal.core.common,
  org.eclipse.datatools.sqltools.data.internal.core.common.data,
diff --git a/plugins/org.eclipse.datatools.sqltools.data.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.data.ui/META-INF/MANIFEST.MF
index aae5abc..c6345ab 100644
--- a/plugins/org.eclipse.datatools.sqltools.data.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.data.ui/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.data.ui; singleton:=true
-Bundle-Version: 1.2.2.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.data.internal.ui.DataUIPlugin
 Bundle-Vendor: %plugin.Provider
 Bundle-Localization: plugin
-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.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity.sqm.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity.sqm.core.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity.sqm.server.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.data.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.result;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.tabledataeditor;bundle-version="[0.9.0,1.5.0)"
-Import-Package: com.ibm.icu.text;version="3.6.1",
- com.ibm.icu.util;version="3.6.1"
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.jface.text,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.navigator,
+ org.eclipse.datatools.modelbase.sql,
+ org.eclipse.datatools.connectivity,
+ org.eclipse.datatools.connectivity.sqm.core,
+ org.eclipse.datatools.connectivity.sqm.core.ui,
+ org.eclipse.datatools.connectivity.sqm.server.ui,
+ org.eclipse.datatools.sqltools.data.core,
+ org.eclipse.datatools.sqltools.result,
+ org.eclipse.datatools.sqltools.tabledataeditor
+Import-Package: com.ibm.icu.text,
+ com.ibm.icu.util
 Export-Package: org.eclipse.datatools.sqltools.data.internal.ui,
  org.eclipse.datatools.sqltools.data.internal.ui.editor,
  org.eclipse.datatools.sqltools.data.internal.ui.extract,
diff --git a/plugins/org.eclipse.datatools.sqltools.db.derby.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.db.derby.ui/META-INF/MANIFEST.MF
index ee61710..77eb50f 100644
--- a/plugins/org.eclipse.datatools.sqltools.db.derby.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.db.derby.ui/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.db.derby.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.db.derby.ui.DerbyUIActivator
 Bundle-Localization: plugin
-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.datatools.sqltools.sql.ui;bundle-version="[1.0.0,1.5.0)",
- org.eclipse.datatools.sqltools.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.db.derby;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.editor.core.ui;bundle-version="[1.0.0,1.5.0)",
- org.eclipse.datatools.sqltools.db.generic.ui;bundle-version="[1.0.0,1.5.0)"
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.datatools.sqltools.sql.ui,
+ org.eclipse.datatools.sqltools.sql,
+ org.eclipse.datatools.sqltools.db.derby,
+ org.eclipse.datatools.sqltools.editor.core.ui,
+ org.eclipse.datatools.sqltools.db.generic.ui
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Plugin.ProviderName
diff --git a/plugins/org.eclipse.datatools.sqltools.db.derby/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.db.derby/META-INF/MANIFEST.MF
index 1864a8b..7c56860 100644
--- a/plugins/org.eclipse.datatools.sqltools.db.derby/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.db.derby/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.db.derby;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.db.derby.Activator
 Bundle-Vendor: %Plugin.ProviderName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.modelbase.dbdefinition;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.db.generic;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.routineeditor;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.result;bundle-version="[0.9.0,1.5.0)"
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.datatools.sqltools.editor.core,
+ org.eclipse.datatools.sqltools.sql,
+ org.eclipse.datatools.connectivity,
+ org.eclipse.datatools.modelbase.sql,
+ org.eclipse.datatools.modelbase.dbdefinition,
+ org.eclipse.datatools.sqltools.db.generic,
+ org.eclipse.core.resources,
+ org.eclipse.debug.core,
+ org.eclipse.jface.text,
+ org.eclipse.datatools.sqltools.routineeditor,
+ org.eclipse.datatools.sqltools.result
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.datatools.sqltools.db.generic.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.db.generic.ui/META-INF/MANIFEST.MF
index 60f7046..2d47a8d 100644
--- a/plugins/org.eclipse.datatools.sqltools.db.generic.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.db.generic.ui/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.db.generic.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.db.generic.ui.GenericUIActivator
 Bundle-Localization: plugin
-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.datatools.sqltools.editor.core.ui;bundle-version="[1.0.0,1.5.0)",
- org.eclipse.datatools.sqltools.sqleditor;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.sql.ui;bundle-version="[1.0.0,1.5.0)",
- org.eclipse.datatools.sqltools.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.db.generic;bundle-version="[0.9.0,1.5.0)"
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.datatools.sqltools.editor.core.ui,
+ org.eclipse.datatools.sqltools.sqleditor,
+ org.eclipse.datatools.sqltools.sql.ui,
+ org.eclipse.datatools.sqltools.sql,
+ org.eclipse.datatools.sqltools.db.generic
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.datatools.sqltools.db.generic.ui,
diff --git a/plugins/org.eclipse.datatools.sqltools.db.generic/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.db.generic/META-INF/MANIFEST.MF
index 6dedf06..d94c5c7 100644
--- a/plugins/org.eclipse.datatools.sqltools.db.generic/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.db.generic/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.db.generic;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.db.generic.internal.GenericPlugin
 Bundle-Vendor: %Plugin.ProviderName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)"
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.datatools.sqltools.sql,
+ org.eclipse.datatools.sqltools.editor.core,
+ org.eclipse.jface.text
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.datatools.sqltools.db.generic;x-friends:="org.eclipse.datatools.sqltools.db.derby",
diff --git a/plugins/org.eclipse.datatools.sqltools.ddlgen.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.ddlgen.ui/META-INF/MANIFEST.MF
index d11e82b..222dcfb 100644
--- a/plugins/org.eclipse.datatools.sqltools.ddlgen.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.ddlgen.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.ddlgen.ui; singleton:=true
-Bundle-Version: 1.0.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.ddlgen.internal.ui.FEUiPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -10,16 +10,16 @@
  org.eclipse.datatools.sqltools.ddlgen.internal.ui.actions.popup;x-internal:=true,
  org.eclipse.datatools.sqltools.ddlgen.internal.ui.util;x-internal:=true,
  org.eclipse.datatools.sqltools.ddlgen.internal.ui.wizards;x-internal:=true
-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.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.connectivity.sqm.core.ui;bundle-version="[1.0.0,1.5.0)",
- org.eclipse.help.base;bundle-version="[3.2.0,5.0.0)",
- org.eclipse.datatools.connectivity.ui.dse;bundle-version="[1.0.1,2.0.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.datatools.sqltools.sqleditor;bundle-version="[1.0.0,2.0.0)"
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.ide,
+ org.eclipse.core.resources,
+ org.eclipse.ui.navigator,
+ org.eclipse.datatools.connectivity.sqm.core.ui,
+ org.eclipse.help.base,
+ org.eclipse.datatools.connectivity.ui.dse,
+ org.eclipse.datatools.sqltools.editor.core,
+ org.eclipse.datatools.sqltools.sqleditor
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.datatools.sqltools.debugger.core.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.debugger.core.ui/META-INF/MANIFEST.MF
index 4c769e7..0cb83b3 100644
--- a/plugins/org.eclipse.datatools.sqltools.debugger.core.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.debugger.core.ui/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.debugger.core.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.debugger.core.ui.DebuggerCoreUIPlugin
-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.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.console;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.debugger.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.common.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.sqleditor;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.routineeditor.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.routineeditor;bundle-version="[0.9.0,1.5.0)"
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.debug.core,
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors,
+ org.eclipse.debug.ui,
+ org.eclipse.ui.console,
+ org.eclipse.datatools.sqltools.debugger.core,
+ org.eclipse.datatools.sqltools.common.ui,
+ org.eclipse.datatools.sqltools.sqleditor,
+ org.eclipse.datatools.sqltools.editor.core,
+ org.eclipse.datatools.sqltools.routineeditor.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.jdt.debug.ui,
+ org.eclipse.datatools.sqltools.routineeditor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.datatools.sqltools.debugger.actions,
diff --git a/plugins/org.eclipse.datatools.sqltools.debugger.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.debugger.core/META-INF/MANIFEST.MF
index b54fd2c..9b09fa2 100644
--- a/plugins/org.eclipse.datatools.sqltools.debugger.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.debugger.core/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.debugger.core;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.debugger.core.internal.DebuggerCorePlugin
 Bundle-Vendor: %Plugin.ProviderName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.sqleditor;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.result;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.routineeditor;bundle-version="[0.9.0,1.5.0)"
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.datatools.sqltools.editor.core,
+ org.eclipse.debug.core,
+ org.eclipse.core.resources,
+ org.eclipse.datatools.sqltools.sqleditor,
+ org.eclipse.datatools.sqltools.result,
+ org.eclipse.datatools.sqltools.sql,
+ org.eclipse.datatools.sqltools.routineeditor
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.datatools.sqltools.debugger.breakpoint,
diff --git a/plugins/org.eclipse.datatools.sqltools.editor.core.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.editor.core.ui/META-INF/MANIFEST.MF
index 0ea8359..1320196 100644
--- a/plugins/org.eclipse.datatools.sqltools.editor.core.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.editor.core.ui/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.editor.core.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.editor.ui.core.EditorCoreUIPlugin
 Bundle-Localization: plugin
-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.datatools.sqltools.common.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.plan;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity.sqm.core.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.sql.ui;bundle-version="[1.0.0,1.5.0)"
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.datatools.sqltools.common.ui,
+ org.eclipse.datatools.sqltools.editor.core,
+ org.eclipse.datatools.connectivity.ui,
+ org.eclipse.debug.core,
+ org.eclipse.ui.editors,
+ org.eclipse.datatools.sqltools.plan,
+ org.eclipse.datatools.connectivity.sqm.core.ui,
+ org.eclipse.jface.text,
+ org.eclipse.datatools.sqltools.sql,
+ org.eclipse.datatools.sqltools.sql.ui
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.datatools.sqltools.core.dbitem,
diff --git a/plugins/org.eclipse.datatools.sqltools.editor.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.editor.core/META-INF/MANIFEST.MF
index 9b8c76d..3b28924 100644
--- a/plugins/org.eclipse.datatools.sqltools.editor.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.editor.core/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.editor.core;singleton:=true
-Bundle-Version: 1.0.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.core.EditorCorePlugin
 Bundle-Localization: plugin
 Bundle-Vendor: %Plugin.ProviderName
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.modelbase.dbdefinition;bundle-version="[0.9.0,1.5.0)";visibility:=reexport,
- org.eclipse.datatools.connectivity;bundle-version="[0.9.0,1.5.0)";visibility:=reexport,
- org.eclipse.datatools.connectivity.db.generic;bundle-version="[0.9.0,1.5.0)";visibility:=reexport,
- org.eclipse.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)";visibility:=reexport,
- org.eclipse.datatools.connectivity.sqm.core;bundle-version="[0.9.0,1.5.0)";visibility:=reexport,
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.modelbase.sql.query;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.result;bundle-version="[0.9.0,1.5.0)"
-Import-Package: com.ibm.icu.text;version="3.6.1",
- com.ibm.icu.util;version="3.6.1"
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.debug.core,
+ org.eclipse.datatools.modelbase.dbdefinition;visibility:=reexport,
+ org.eclipse.datatools.connectivity;visibility:=reexport,
+ org.eclipse.datatools.connectivity.db.generic;visibility:=reexport,
+ org.eclipse.datatools.modelbase.sql;visibility:=reexport,
+ org.eclipse.datatools.connectivity.sqm.core;visibility:=reexport,
+ org.eclipse.core.resources,
+ org.eclipse.datatools.modelbase.sql.query,
+ org.eclipse.datatools.sqltools.sql,
+ org.eclipse.text,
+ org.eclipse.datatools.sqltools.result
+Import-Package: com.ibm.icu.text,
+ com.ibm.icu.util
 Export-Package: org.eclipse.datatools.sqltools.core,
  org.eclipse.datatools.sqltools.core.dbitem,
  org.eclipse.datatools.sqltools.core.internal.dbitem,
diff --git a/plugins/org.eclipse.datatools.sqltools.parsers.sql.lexer/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.parsers.sql.lexer/META-INF/MANIFEST.MF
index 4a38243..455023a 100644
--- a/plugins/org.eclipse.datatools.sqltools.parsers.sql.lexer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.parsers.sql.lexer/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.parsers.sql.lexer;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.parsers.sql.lexer.LexerPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: 
  org.eclipse.datatools.sqltools.parsers.sql.lexer
 Require-Bundle: 
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- net.sourceforge.lpg.lpgjavaruntime;visibility:=reexport;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.core.runtime,
+ net.sourceforge.lpg.lpgjavaruntime;visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.datatools.sqltools.parsers.sql.query/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.parsers.sql.query/META-INF/MANIFEST.MF
index 9bc2695..557f45f 100644
--- a/plugins/org.eclipse.datatools.sqltools.parsers.sql.query/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.parsers.sql.query/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.parsers.sql.query; singleton:=true
-Bundle-Version: 1.2.1.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.parsers.sql.query.SQLQueryParserPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,11 +11,11 @@
  org.eclipse.datatools.sqltools.parsers.sql.query.postparse,
  org.eclipse.datatools.sqltools.parsers.sql.query.util
 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.datatools.modelbase.sql.query;bundle-version="[0.9.0,1.5.0)";visibility:=reexport,
- org.eclipse.datatools.sqltools.parsers.sql;bundle-version="[0.9.0,1.5.0)";visibility:=reexport,
- org.eclipse.datatools.sqltools.parsers.sql.lexer;bundle-version="[0.9.0,1.5.0)"
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.datatools.modelbase.sql.query;visibility:=reexport,
+ org.eclipse.datatools.sqltools.parsers.sql;visibility:=reexport,
+ org.eclipse.datatools.sqltools.parsers.sql.lexer
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.datatools.sqltools.parsers.sql.xml.query/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.parsers.sql.xml.query/META-INF/MANIFEST.MF
index cbed761..b78529f 100644
--- a/plugins/org.eclipse.datatools.sqltools.parsers.sql.xml.query/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.parsers.sql.xml.query/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.parsers.sql.xml.query;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.parsers.sql.xml.query.SQLXMLQueryParserPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: 
  org.eclipse.datatools.sqltools.parsers.sql.xml.query
 Require-Bundle: 
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.parsers.sql.query;bundle-version="[0.9.0,1.5.0)";visibility:=reexport,
- org.eclipse.datatools.modelbase.sql.xml.query;bundle-version="[0.9.0,1.5.0)";visibility:=reexport,
- org.eclipse.datatools.sqltools.parsers.sql.lexer;bundle-version="[0.9.0,1.5.0)"
+ org.eclipse.core.runtime,
+ org.eclipse.datatools.sqltools.parsers.sql.query;visibility:=reexport,
+ org.eclipse.datatools.modelbase.sql.xml.query;visibility:=reexport,
+ org.eclipse.datatools.sqltools.parsers.sql.lexer
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.datatools.sqltools.parsers.sql/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.parsers.sql/META-INF/MANIFEST.MF
index ee518be..4f28c13 100644
--- a/plugins/org.eclipse.datatools.sqltools.parsers.sql/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.parsers.sql/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.parsers.sql;singleton:=true
-Bundle-Version: 1.0.2.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.parsers.sql.SQLParserPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,10 +11,10 @@
  org.eclipse.datatools.sqltools.parsers.sql.postparse,
  org.eclipse.datatools.sqltools.parsers.sql.util
 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.datatools.sqltools.parsers.sql.lexer;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.modelbase.sql.query;bundle-version="[0.9.0,1.5.0)";visibility:=reexport
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore,
+ org.eclipse.datatools.sqltools.parsers.sql.lexer,
+ org.eclipse.datatools.modelbase.sql.query;visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.datatools.sqltools.plan/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.plan/META-INF/MANIFEST.MF
index 914ca0a..6b12908 100644
--- a/plugins/org.eclipse.datatools.sqltools.plan/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.plan/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.plan;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.plan.internal.PlanViewPlugin
 Bundle-Vendor: %Plugin.ProviderName
 Bundle-Localization: plugin
-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.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.common.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.help;bundle-version="[0.9.0,2.0.0)"
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.draw2d,
+ org.eclipse.datatools.sqltools.common.ui,
+ org.eclipse.help,
+ org.eclipse.datatools.help
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.datatools.sqltools.plan,
diff --git a/plugins/org.eclipse.datatools.sqltools.result.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.result.ui/META-INF/MANIFEST.MF
index 49542a4..e3753e3 100644
--- a/plugins/org.eclipse.datatools.sqltools.result.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.result.ui/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.result.ui;singleton:=true
-Bundle-Version: 1.1.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.result.ui.ResultsViewUIPlugin
 Bundle-Localization: plugin
 Bundle-Vendor: %Plugin.ProviderName
-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.datatools.help;bundle-version="[0.9.0,2.0.0)",
- org.eclipse.datatools.sqltools.result;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.common.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)"
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.datatools.help,
+ org.eclipse.datatools.sqltools.result,
+ org.eclipse.datatools.connectivity,
+ org.eclipse.datatools.sqltools.common.ui,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.jface.text,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide
 Import-Package: com.ibm.icu.text;version="3.6.1",
  com.ibm.icu.util;version="3.6.1"
 Export-Package: org.eclipse.datatools.sqltools.result.ui,
diff --git a/plugins/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF
index bada6b2..b4e4e1e 100644
--- a/plugins/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.result/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.result; singleton:=true
-Bundle-Version: 1.1.6.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.result.ResultsViewPlugin
 Bundle-Vendor: %Plugin.ProviderName
 Bundle-Localization: plugin
-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.help;bundle-version="[3.2.0,4.0.0)",
- org.apache.lucene.core;bundle-version="[2.9.0,4.0.0)",
- org.eclipse.datatools.connectivity;bundle-version="[1.0.0,2.0.0)"
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.help,
+ org.apache.lucene.core,
+ org.eclipse.datatools.connectivity
 Import-Package: com.ibm.icu.text;version="3.6.1",
  com.ibm.icu.util;version="3.6.1"
 Export-Package: org.eclipse.datatools.sqltools.result,
diff --git a/plugins/org.eclipse.datatools.sqltools.routineeditor.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.routineeditor.ui/META-INF/MANIFEST.MF
index 0d00dff..db91912 100644
--- a/plugins/org.eclipse.datatools.sqltools.routineeditor.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.routineeditor.ui/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.routineeditor.ui;singleton:=true
-Bundle-Version: 1.0.3.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.routineeditor.ui.RoutineEditorUIActivator
-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.datatools.sqltools.editor.core.ui;bundle-version="[1.0.0,1.5.0)",
- org.eclipse.datatools.connectivity;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.routineeditor;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.sqleditor;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.help;bundle-version="[0.9.0,2.0.0)",
- org.eclipse.datatools.sqltools.common.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.plan;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.sql.ui;bundle-version="[1.0.0,1.5.0)"
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.datatools.sqltools.editor.core.ui,
+ org.eclipse.datatools.connectivity,
+ org.eclipse.datatools.modelbase.sql,
+ org.eclipse.datatools.sqltools.editor.core,
+ org.eclipse.datatools.sqltools.routineeditor,
+ org.eclipse.datatools.sqltools.sqleditor,
+ org.eclipse.debug.core,
+ org.eclipse.datatools.help,
+ org.eclipse.datatools.sqltools.common.ui,
+ org.eclipse.debug.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.datatools.sqltools.plan,
+ org.eclipse.ui.navigator,
+ org.eclipse.datatools.sqltools.sql,
+ org.eclipse.datatools.sqltools.sql.ui
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.datatools.sqltools.routineeditor.plan,
diff --git a/plugins/org.eclipse.datatools.sqltools.routineeditor/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.routineeditor/META-INF/MANIFEST.MF
index d451d2d..c1d48e3 100644
--- a/plugins/org.eclipse.datatools.sqltools.routineeditor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.routineeditor/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.routineeditor;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.routineeditor.internal.RoutineEditorActivator
 Bundle-Vendor: %Plugin.ProviderName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.modelbase.dbdefinition;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.modelbase.sql.query;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.result;bundle-version="[0.9.0,1.5.0)"
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.datatools.sqltools.editor.core,
+ org.eclipse.datatools.connectivity,
+ org.eclipse.datatools.modelbase.dbdefinition,
+ org.eclipse.datatools.modelbase.sql,
+ org.eclipse.datatools.modelbase.sql.query,
+ org.eclipse.datatools.sqltools.sql,
+ org.eclipse.core.resources,
+ org.eclipse.debug.core,
+ org.eclipse.datatools.sqltools.result
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.datatools.sqltools.routineeditor.internal,
diff --git a/plugins/org.eclipse.datatools.sqltools.schemaobjecteditor.ui.pages/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.schemaobjecteditor.ui.pages/META-INF/MANIFEST.MF
index 916514b..77a9830 100644
--- a/plugins/org.eclipse.datatools.sqltools.schemaobjecteditor.ui.pages/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.schemaobjecteditor.ui.pages/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.schemaobjecteditor.ui.pages;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.schemaobjecteditor.ui.pages.SOEUIPagePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-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.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.cheatsheets;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.help.base;bundle-version="[3.2.0,5.0.0)",
- org.eclipse.datatools.help;bundle-version="[0.9.0,2.0.0)",
- org.eclipse.datatools.sqltools.common.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.sqleditor;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.schemaobjecteditor.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.schemaobjecteditor;bundle-version="[0.9.0,1.5.0)"
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.draw2d,
+ org.eclipse.ui,
+ org.eclipse.ui.forms,
+ org.eclipse.ui.cheatsheets,
+ org.eclipse.jface.text,
+ org.eclipse.help,
+ org.eclipse.help.base,
+ org.eclipse.datatools.help,
+ org.eclipse.datatools.sqltools.common.ui,
+ org.eclipse.datatools.sqltools.sqleditor,
+ org.eclipse.datatools.sqltools.editor.core,
+ org.eclipse.datatools.sqltools.schemaobjecteditor.ui,
+ org.eclipse.datatools.sqltools.schemaobjecteditor
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.datatools.sqltools.schemaobjecteditor.ui.pages,
diff --git a/plugins/org.eclipse.datatools.sqltools.schemaobjecteditor.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.schemaobjecteditor.ui/META-INF/MANIFEST.MF
index 53e5996..be9f1ed 100644
--- a/plugins/org.eclipse.datatools.sqltools.schemaobjecteditor.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.schemaobjecteditor.ui/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.schemaobjecteditor.ui;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.schemaobjecteditor.ui.internal.SOEUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-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.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.help;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.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.cheatsheets;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.connectivity.sqm.core.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.common.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.sqleditor;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.schemaobjecteditor;bundle-version="[0.9.0,1.5.0)"
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.draw2d,
+ org.eclipse.help,
+ org.eclipse.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.navigator,
+ org.eclipse.ui.cheatsheets,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.forms,
+ org.eclipse.datatools.connectivity.sqm.core.ui,
+ org.eclipse.datatools.sqltools.common.ui,
+ org.eclipse.datatools.sqltools.editor.core,
+ org.eclipse.datatools.sqltools.sqleditor,
+ org.eclipse.datatools.sqltools.schemaobjecteditor
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.datatools.sqltools.schemaobjecteditor.ui,
  org.eclipse.datatools.sqltools.schemaobjecteditor.ui.action,
diff --git a/plugins/org.eclipse.datatools.sqltools.schemaobjecteditor/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.schemaobjecteditor/META-INF/MANIFEST.MF
index a04b21b..e9a57f6 100644
--- a/plugins/org.eclipse.datatools.sqltools.schemaobjecteditor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.schemaobjecteditor/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.Name
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.schemaobjecteditor
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.schemaobjecteditor.SOEPlugin
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore.change;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.datatools.connectivity.sqm.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[1.0.0,2.0.0)"
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore.change,
+ org.eclipse.emf.ecore.xmi,
+ org.eclipse.datatools.connectivity.sqm.core,
+ org.eclipse.datatools.modelbase.sql,
+ org.eclipse.datatools.sqltools.editor.core
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.datatools.sqltools.schemaobjecteditor,
  org.eclipse.datatools.sqltools.schemaobjecteditor.ddl,
diff --git a/plugins/org.eclipse.datatools.sqltools.sql.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.sql.ui/META-INF/MANIFEST.MF
index 391bf4b..060d328 100644
--- a/plugins/org.eclipse.datatools.sqltools.sql.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.sql.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.sql.ui;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.sql.ui.SQLUIActivator
 Bundle-Localization: plugin
-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.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.sql;bundle-version="[0.9.0,1.5.0)"
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.datatools.modelbase.sql,
+ org.eclipse.jface.text,
+ org.eclipse.datatools.sqltools.sql
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.datatools.sqltools.sql.ui,
diff --git a/plugins/org.eclipse.datatools.sqltools.sql/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.sql/META-INF/MANIFEST.MF
index 7c8c62b..5a2fe42 100644
--- a/plugins/org.eclipse.datatools.sqltools.sql/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.sql/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.sql;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.sql.internal.SQLActivator
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.modelbase.dbdefinition;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity.sqm.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.modelbase.sql.query;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.text;bundle-version="[3.2.0,4.0.0)"
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.datatools.modelbase.sql,
+ org.eclipse.datatools.modelbase.dbdefinition,
+ org.eclipse.datatools.connectivity.sqm.core,
+ org.eclipse.datatools.modelbase.sql.query,
+ org.eclipse.text
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.datatools.sqltools.sql,
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlbuilder/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.sqlbuilder/META-INF/MANIFEST.MF
index cf8e137..4208157 100644
--- a/plugins/org.eclipse.datatools.sqltools.sqlbuilder/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.sqlbuilder/META-INF/MANIFEST.MF
@@ -3,27 +3,27 @@
 Bundle-Name: %_UI_PLUGIN_NAME
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.sqlbuilder; singleton:=true
 Bundle-ClassPath: .
-Bundle-Version: 1.0.7.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: org.eclipse.datatools.sqltools.sqlbuilder.SQLBuilderPlugin
 Bundle-Vendor: %_UI_PLUGIN_PROVIDER
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.1.2,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.1.2,4.0.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.gef;bundle-version="[3.1.1,4.0.0)",
- org.eclipse.datatools.modelbase.sql.query.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.datatools.modelbase.sql.xml.query;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.datatools.sqltools.parsers.sql.query;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.datatools.sqltools.sqleditor;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.1.1,4.0.0)",
- org.eclipse.datatools.sqltools.editor.core.ui;bundle-version="[1.0.0,1.5.0)",
- org.eclipse.datatools.sqltools.result.ui;bundle-version="[1.0.0,1.5.0)",
- org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.sql.ui;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.edit.ui,
+ org.eclipse.gef,
+ org.eclipse.datatools.modelbase.sql.query.edit;visibility:=reexport,
+ org.eclipse.datatools.modelbase.sql.xml.query,
+ org.eclipse.datatools.sqltools.editor.core;visibility:=reexport,
+ org.eclipse.datatools.sqltools.parsers.sql.query,
+ org.eclipse.datatools.sqltools.sqleditor;visibility:=reexport,
+ org.eclipse.ui,
+ org.eclipse.ui.forms,
+ org.eclipse.ui.ide,
+ org.eclipse.datatools.sqltools.editor.core.ui,
+ org.eclipse.datatools.sqltools.result.ui,
+ org.eclipse.help,
+ org.eclipse.datatools.sqltools.sql.ui;visibility:=reexport
 Import-Package: com.ibm.icu.text;version="3.6.1",
  com.ibm.icu.util;version="3.6.1"
 Export-Package: org.eclipse.datatools.sqltools.sqlbuilder,
diff --git a/plugins/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF
index e74510a..60d0d75 100644
--- a/plugins/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF
@@ -2,32 +2,32 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.sqleditor; singleton:=true
-Bundle-Version: 1.0.4.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
- org.eclipse.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.modelbase.dbdefinition;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.result;bundle-version="[0.9.0,1.5.0)";visibility:=reexport,
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.sqltools.common.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.plan;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.help;bundle-version="[0.9.0,2.0.0)",
- org.eclipse.datatools.sqltools.editor.core.ui;bundle-version="[1.0.0,1.5.0)",
- org.eclipse.datatools.sqltools.sql.ui;bundle-version="[1.0.0,1.5.0)"
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text;visibility:=reexport,
+ org.eclipse.ui,
+ org.eclipse.ui.editors;visibility:=reexport,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views;visibility:=reexport,
+ org.eclipse.ui.workbench.texteditor;visibility:=reexport,
+ org.eclipse.datatools.modelbase.sql,
+ org.eclipse.datatools.connectivity,
+ org.eclipse.datatools.modelbase.dbdefinition,
+ org.eclipse.datatools.sqltools.editor.core,
+ org.eclipse.datatools.sqltools.sql,
+ org.eclipse.datatools.sqltools.result;visibility:=reexport,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.datatools.sqltools.common.ui,
+ org.eclipse.datatools.sqltools.plan,
+ org.eclipse.help,
+ org.eclipse.datatools.help,
+ org.eclipse.datatools.sqltools.editor.core.ui,
+ org.eclipse.datatools.sqltools.sql.ui
 Import-Package: com.ibm.icu.text;version="3.6.1",
  com.ibm.icu.util;version="3.6.1"
 Export-Package: org.eclipse.datatools.sqltools.sqleditor,
diff --git a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/META-INF/MANIFEST.MF
index 260cdb4..e8d9f59 100644
--- a/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.sqlscrapbook/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.sqlscrapbook; singleton:=true
-Bundle-Version: 1.0.2.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.internal.sqlscrapbook.SqlscrapbookPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -16,27 +16,27 @@
  org.eclipse.datatools.sqltools.internal.sqlscrapbook.views.execute,
  org.eclipse.datatools.sqltools.internal.sqlscrapbook.wizards,
  org.eclipse.datatools.sqltools.sqlscrapbook.actions
-Require-Bundle: org.eclipse.datatools.sqltools.sqleditor;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.editor.core;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.modelbase.dbdefinition;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.common.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity.ui;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.datatools.help;bundle-version="[0.9.0,2.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.connectivity.sqm.core.ui;bundle-version="[0.9.0,1.5.0)",
+Require-Bundle: org.eclipse.datatools.sqltools.sqleditor,
+ org.eclipse.jface.text,
+ org.eclipse.ui,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.ide,
+ org.eclipse.datatools.modelbase.sql,
+ org.eclipse.datatools.sqltools.sql,
+ org.eclipse.datatools.sqltools.editor.core,
+ org.eclipse.datatools.connectivity,
+ org.eclipse.datatools.modelbase.dbdefinition,
+ org.eclipse.datatools.sqltools.common.ui,
+ org.eclipse.datatools.connectivity.ui,
+ org.eclipse.core.filesystem,
+ org.eclipse.datatools.help,
+ org.eclipse.ui.navigator,
+ org.eclipse.datatools.connectivity.sqm.core.ui,
  org.eclipse.datatools.sqltools.editor.core.ui;bundle-version="1.0.0",
- org.eclipse.datatools.sqltools.plan;bundle-version="[0.9.0,1.5.0)"
+ org.eclipse.datatools.sqltools.plan
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.datatools.sqltools.tabledataeditor/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.sqltools.tabledataeditor/META-INF/MANIFEST.MF
index 4da0441..3b88157 100644
--- a/plugins/org.eclipse.datatools.sqltools.tabledataeditor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.sqltools.tabledataeditor/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.tabledataeditor; singleton:=true
-Bundle-Version: 1.0.2.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.datatools.sqltools.internal.tabledataeditor.TableDataEditorPlugin
 Bundle-Localization: plugin
-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.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.datatools.modelbase.sql;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.modelbase.dbdefinition;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.sqltools.result;bundle-version="[0.9.0,1.5.0)",
- org.eclipse.datatools.connectivity.sqm.core;bundle-version="[0.9.1,1.5.0)",
- org.eclipse.datatools.connectivity.sqm.core.ui;bundle-version="[0.9.1,1.5.0)",
- org.eclipse.datatools.connectivity;bundle-version="[0.9.1,1.5.0)",
- org.eclipse.datatools.sqltools.result.ui;bundle-version="[0.9.0,1.5.0)"
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.ui.navigator,
+ org.eclipse.datatools.modelbase.sql,
+ org.eclipse.datatools.modelbase.dbdefinition,
+ org.eclipse.datatools.sqltools.result,
+ org.eclipse.datatools.connectivity.sqm.core,
+ org.eclipse.datatools.connectivity.sqm.core.ui,
+ org.eclipse.datatools.connectivity,
+ org.eclipse.datatools.sqltools.result.ui
 Import-Package: com.ibm.icu.text;version="3.6.1",
  com.ibm.icu.util;version="3.6.1"
 Export-Package: org.eclipse.datatools.sqltools.internal.tabledataeditor,