[310404] Updating the version range of dependency features
diff --git a/features/org.eclipse.datatools.connectivity.feature/feature.xml b/features/org.eclipse.datatools.connectivity.feature/feature.xml
index 62f2ca0..5fddcae 100644
--- a/features/org.eclipse.datatools.connectivity.feature/feature.xml
+++ b/features/org.eclipse.datatools.connectivity.feature/feature.xml
@@ -36,7 +36,7 @@
          optional="true"/>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.connectivity.oda.designer.core.feature/feature.xml b/features/org.eclipse.datatools.connectivity.oda.designer.core.feature/feature.xml
index bbbe724..90bdf9d 100644
--- a/features/org.eclipse.datatools.connectivity.oda.designer.core.feature/feature.xml
+++ b/features/org.eclipse.datatools.connectivity.oda.designer.core.feature/feature.xml
@@ -22,9 +22,9 @@
 
    <requires>
       <import feature="org.eclipse.emf" version="2.4.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.oda.feature" version="1.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.doc.user" version="1.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.7.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.oda.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.doc.user" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.connectivity.oda.designer.feature/feature.xml b/features/org.eclipse.datatools.connectivity.oda.designer.feature/feature.xml
index a1cae2c..d751d72 100644
--- a/features/org.eclipse.datatools.connectivity.oda.designer.feature/feature.xml
+++ b/features/org.eclipse.datatools.connectivity.oda.designer.feature/feature.xml
@@ -21,7 +21,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.pde" version="3.4.1" match="greaterOrEqual"/>
+      <import feature="org.eclipse.pde" version="3.4.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.datatools.connectivity.oda.designer.core.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
diff --git a/features/org.eclipse.datatools.enablement.apache.derby.feature/feature.xml b/features/org.eclipse.datatools.enablement.apache.derby.feature/feature.xml
index 119db17..45b4935 100644
--- a/features/org.eclipse.datatools.enablement.apache.derby.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.apache.derby.feature/feature.xml
@@ -25,9 +25,9 @@
          version="0.0.0"/>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.sqldevtools.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.sqldevtools.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.feature/feature.xml b/features/org.eclipse.datatools.enablement.feature/feature.xml
index ab7ae68..1757856 100644
--- a/features/org.eclipse.datatools.enablement.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.feature/feature.xml
@@ -95,10 +95,9 @@
          version="0.0.0"
          optional="true"/>
 
-
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.hsqldb.feature/feature.xml b/features/org.eclipse.datatools.enablement.hsqldb.feature/feature.xml
index 4769ff9..5ca38f2 100644
--- a/features/org.eclipse.datatools.enablement.hsqldb.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.hsqldb.feature/feature.xml
@@ -25,8 +25,8 @@
          version="0.0.0"/>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.ibm.feature/feature.xml b/features/org.eclipse.datatools.enablement.ibm.feature/feature.xml
index 4a95611..45e6ccc 100644
--- a/features/org.eclipse.datatools.enablement.ibm.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.ibm.feature/feature.xml
@@ -21,9 +21,9 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.ingres.feature/feature.xml b/features/org.eclipse.datatools.enablement.ingres.feature/feature.xml
index 7873cce..064c4c3 100644
--- a/features/org.eclipse.datatools.enablement.ingres.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.ingres.feature/feature.xml
@@ -20,10 +20,10 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0"/>
-      <import feature="org.eclipse.datatools.sqldevtools.feature" version="1.6.0"/>
-      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.6.0"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.sqldevtools.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.jdbc.feature/feature.xml b/features/org.eclipse.datatools.enablement.jdbc.feature/feature.xml
index b5eab81..22a11a0 100644
--- a/features/org.eclipse.datatools.enablement.jdbc.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.jdbc.feature/feature.xml
@@ -21,7 +21,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.jdt.feature/feature.xml b/features/org.eclipse.datatools.enablement.jdt.feature/feature.xml
index fd3bb25..7ab5403 100644
--- a/features/org.eclipse.datatools.enablement.jdt.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.jdt.feature/feature.xml
@@ -21,7 +21,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.jdt" version="3.2.2" match="greaterOrEqual"/>
+      <import feature="org.eclipse.jdt" version="3.4.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.msft.feature/feature.xml b/features/org.eclipse.datatools.enablement.msft.feature/feature.xml
index 3ed629b..91f0818 100644
--- a/features/org.eclipse.datatools.enablement.msft.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.msft.feature/feature.xml
@@ -21,9 +21,9 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.mysql.feature/feature.xml b/features/org.eclipse.datatools.enablement.mysql.feature/feature.xml
index e34efa2..87f27be 100644
--- a/features/org.eclipse.datatools.enablement.mysql.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.mysql.feature/feature.xml
@@ -21,9 +21,9 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.oda.designer.feature/feature.xml b/features/org.eclipse.datatools.enablement.oda.designer.feature/feature.xml
index 4a8f258..1477642 100644
--- a/features/org.eclipse.datatools.enablement.oda.designer.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.oda.designer.feature/feature.xml
@@ -21,8 +21,8 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.connectivity.oda.designer.feature" version="1.7.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.enablement.oda.feature" version="1.7.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.oda.designer.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.enablement.oda.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.oda.feature/feature.xml b/features/org.eclipse.datatools.enablement.oda.feature/feature.xml
index d0c864f..6b445ac 100644
--- a/features/org.eclipse.datatools.enablement.oda.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.oda.feature/feature.xml
@@ -21,7 +21,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.connectivity.oda.feature" version="1.7.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.oda.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.oracle.feature/feature.xml b/features/org.eclipse.datatools.enablement.oracle.feature/feature.xml
index 0e055ff..b234050 100644
--- a/features/org.eclipse.datatools.enablement.oracle.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.oracle.feature/feature.xml
@@ -21,9 +21,9 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.postgresql.feature/feature.xml b/features/org.eclipse.datatools.enablement.postgresql.feature/feature.xml
index 2e86a9f..e8e6d9a 100644
--- a/features/org.eclipse.datatools.enablement.postgresql.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.postgresql.feature/feature.xml
@@ -21,9 +21,9 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.sap.feature/feature.xml b/features/org.eclipse.datatools.enablement.sap.feature/feature.xml
index 87aca36..dcb86bc 100644
--- a/features/org.eclipse.datatools.enablement.sap.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.sap.feature/feature.xml
@@ -21,12 +21,12 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0"/>
-      <import feature="org.eclipse.datatools.connectivity.oda.feature" version="1.6.0"/>
-      <import feature="org.eclipse.datatools.connectivity.oda.designer.feature" version="1.6.0"/>
-      <import feature="org.eclipse.datatools.sqldevtools.feature" version="1.6.0"/>
-      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.6.0"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.oda.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.oda.designer.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.sqldevtools.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.sqlite.feature/feature.xml b/features/org.eclipse.datatools.enablement.sqlite.feature/feature.xml
index 4758100..6974cd8 100644
--- a/features/org.eclipse.datatools.enablement.sqlite.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.sqlite.feature/feature.xml
@@ -20,10 +20,10 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0"/>
-      <import feature="org.eclipse.datatools.sqldevtools.feature" version="1.6.0"/>
-      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.6.0"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.sqldevtools.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.enablement.sybase.feature/feature.xml b/features/org.eclipse.datatools.enablement.sybase.feature/feature.xml
index ae2a942..cdce95e 100644
--- a/features/org.eclipse.datatools.enablement.sybase.feature/feature.xml
+++ b/features/org.eclipse.datatools.enablement.sybase.feature/feature.xml
@@ -21,10 +21,10 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.sqldevtools.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.sqldevtools.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.modelbase.feature/feature.xml b/features/org.eclipse.datatools.modelbase.feature/feature.xml
index ec61554..d83fa9e 100644
--- a/features/org.eclipse.datatools.modelbase.feature/feature.xml
+++ b/features/org.eclipse.datatools.modelbase.feature/feature.xml
@@ -21,7 +21,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.emf" version="2.2.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.emf" version="2.4.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.sdk.feature/feature.xml b/features/org.eclipse.datatools.sdk.feature/feature.xml
index 8f2fbb6..fd45cbd 100644
--- a/features/org.eclipse.datatools.sdk.feature/feature.xml
+++ b/features/org.eclipse.datatools.sdk.feature/feature.xml
@@ -58,27 +58,30 @@
    <includes
          id="org.eclipse.datatools.sqltools.doc.user"
          version="0.0.0"/>
-                  
+
    <includes
          id="org.eclipse.datatools.connectivity.feature.source"
          version="0.0.0"/>
-         
+
    <includes
          id="org.eclipse.datatools.sqldevtools.feature.source"
-         version="0.0.0"/>      
+         version="0.0.0"/>
 
    <includes
          id="org.eclipse.datatools.connectivity.oda.designer.feature.source"
-         version="0.0.0" optional="true"/>
+         version="0.0.0"
+         optional="true"/>
 
    <includes
          id="org.eclipse.datatools.connectivity.oda.designer.core.feature.source"
-         version="0.0.0" optional="true"/>
-         
+         version="0.0.0"
+         optional="true"/>
+
    <includes
          id="org.eclipse.datatools.connectivity.oda.feature.source"
-         version="0.0.0" optional="true"/>
-         
+         version="0.0.0"
+         optional="true"/>
+
    <includes
          id="org.eclipse.datatools.sqldevtools.data.feature.source"
          version="0.0.0"/>
@@ -98,11 +101,13 @@
    <includes
          id="org.eclipse.datatools.sqldevtools.results.feature.source"
          version="0.0.0"/>
-   
-   <includes id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.source" version="0.0.0"/>
-            
+
+   <includes
+         id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.source"
+         version="0.0.0"/>
+
    <requires>
-      <import feature="org.eclipse.pde" version="3.3.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.pde" version="3.4.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -118,18 +123,19 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.eclipse.datatools.connectivity.ui.templates"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>  
-          
+         unpack="false"/>
+
    <plugin
          id="org.eclipse.datatools.connectivity.ui.templates.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>               
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.eclipse.datatools.sqldevtools.data.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.data.feature/feature.xml
index 4c9e93f..4093c2d 100644
--- a/features/org.eclipse.datatools.sqldevtools.data.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.data.feature/feature.xml
@@ -20,9 +20,9 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.sqldevtools.ddl.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.sqldevtools.ddl.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -45,14 +45,14 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.eclipse.datatools.sqltools.result.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.eclipse.datatools.sqltools.common.ui"
          download-size="0"
diff --git a/features/org.eclipse.datatools.sqldevtools.ddl.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.ddl.feature/feature.xml
index 11308cd..864ce0c 100644
--- a/features/org.eclipse.datatools.sqldevtools.ddl.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.ddl.feature/feature.xml
@@ -24,8 +24,8 @@
          version="0.0.0"/>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
 </feature>
diff --git a/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/feature.xml
index 60186d7..19a283a 100644
--- a/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/feature.xml
@@ -21,9 +21,9 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.sqldevtools.results.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.sqldevtools.results.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.sqldevtools.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.feature/feature.xml
index 9c613c1..b0b5b05 100644
--- a/features/org.eclipse.datatools.sqldevtools.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.feature/feature.xml
@@ -52,13 +52,13 @@
          id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature"
          version="0.0.0"
          optional="true"/>
-         
+
    <requires>
-      <import feature="org.eclipse.gef" version="3.2.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.doc.user" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.gef" version="3.4.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.doc.user" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -130,42 +130,40 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-    
-    <plugin
+
+   <plugin
          id="org.eclipse.datatools.sqltools.debugger.core.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.datatools.sqltools.editor.core.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.datatools.sqltools.result.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.datatools.sqltools.routineeditor.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-    <plugin
+
+   <plugin
          id="org.eclipse.datatools.sqltools.sql.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
-    
 
 </feature>
diff --git a/features/org.eclipse.datatools.sqldevtools.parsers.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.parsers.feature/feature.xml
index d5bbc65..9eb39bc 100644
--- a/features/org.eclipse.datatools.sqldevtools.parsers.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.parsers.feature/feature.xml
@@ -21,7 +21,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml
index f195177..acc0fe7 100644
--- a/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml
@@ -20,9 +20,9 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.doc.user" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.doc.user" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature/feature.xml
index e507783..da47629 100644
--- a/features/org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature/feature.xml
@@ -20,8 +20,8 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.draw2d" version="3.5.0.v20090316-1158-44-7w311A141702258"/>
-      <import feature="org.eclipse.datatools.sqldevtools.sqlbuilder.feature" version="1.7.0.v200904011704-77--CcNBC0BUCbIlKO"/>
+      <import feature="org.eclipse.draw2d" version="3.4.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.sqldevtools.sqlbuilder.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/feature.xml
index 98ece1b..42dbe0f 100644
--- a/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/feature.xml
@@ -20,14 +20,14 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.emf" version="2.2.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.gef" version="3.2.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.doc.user" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.sqldevtools.results.feature" version="1.6.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.datatools.sqldevtools.parsers.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.emf" version="2.4.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.gef" version="3.4.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.doc.user" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.enablement.jdbc.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.sqldevtools.results.feature" version="1.8.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.sqldevtools.parsers.feature" version="1.8.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin