[238545]Upgrade all datatools feature version to 1.6.1
diff --git a/features/org.eclipse.datatools.intro/feature.xml b/features/org.eclipse.datatools.intro/feature.xml
index 1a8dbdf..af4934b 100644
--- a/features/org.eclipse.datatools.intro/feature.xml
+++ b/features/org.eclipse.datatools.intro/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.datatools.intro"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.datatools.intro"
       image="eclipse32.png">
diff --git a/features/org.eclipse.datatools.modelbase.feature/feature.xml b/features/org.eclipse.datatools.modelbase.feature/feature.xml
index 3894c7a..d826462 100644
--- a/features/org.eclipse.datatools.modelbase.feature/feature.xml
+++ b/features/org.eclipse.datatools.modelbase.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.datatools.modelbase.feature"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.datatools.modelbase.sql"
       image="eclipse_update_120.jpg">
diff --git a/features/org.eclipse.datatools.sdk-all.feature/feature.xml b/features/org.eclipse.datatools.sdk-all.feature/feature.xml
index 82bb981..e98133e 100644
--- a/features/org.eclipse.datatools.sdk-all.feature/feature.xml
+++ b/features/org.eclipse.datatools.sdk-all.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.datatools.sdk-all.feature"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -26,7 +26,7 @@
    <includes
          id="org.eclipse.datatools.intro"
          version="0.0.0"/>
-   
+
    <includes
          id="org.eclipse.datatools.doc.user"
          version="0.0.0"/>
@@ -42,17 +42,49 @@
    <includes
          id="org.eclipse.datatools.sqltools.doc.user"
          version="0.0.0"/>
-             
-   <includes id="org.eclipse.datatools.intro.source" version="0.0.0"/>
-   <includes id="org.eclipse.datatools.modelbase.feature.source" version="0.0.0"/>
-   <includes id="org.eclipse.datatools.connectivity.feature.source" version="0.0.0"/>
-   <includes id="org.eclipse.datatools.connectivity.oda.designer.feature.source" version="0.0.0"/>
-   <includes id="org.eclipse.datatools.connectivity.oda.feature.source" version="0.0.0"/>
-   <includes id="org.eclipse.datatools.sqldevtools.feature.source" version="0.0.0"/>
-   <includes id="org.eclipse.datatools.sqldevtools.data.feature.source" version="0.0.0"/>
-   <includes id="org.eclipse.datatools.sqldevtools.ddl.feature.source" version="0.0.0"/>
-   <includes id="org.eclipse.datatools.sqldevtools.ddlgen.feature.source" version="0.0.0"/>
-   <includes id="org.eclipse.datatools.sqldevtools.parsers.feature.source" version="0.0.0"/>
-   <includes id="org.eclipse.datatools.sqldevtools.results.feature.source" version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.datatools.intro.source"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.datatools.modelbase.feature.source"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.datatools.connectivity.feature.source"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.datatools.connectivity.oda.designer.feature.source"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.datatools.connectivity.oda.feature.source"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.datatools.sqldevtools.feature.source"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.datatools.sqldevtools.data.feature.source"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.datatools.sqldevtools.ddl.feature.source"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.datatools.sqldevtools.ddlgen.feature.source"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.datatools.sqldevtools.parsers.feature.source"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.datatools.sqldevtools.results.feature.source"
+         version="0.0.0"/>
 
 </feature>
diff --git a/features/org.eclipse.datatools.sdk.feature/feature.xml b/features/org.eclipse.datatools.sdk.feature/feature.xml
index 94718b5..43c5524 100644
--- a/features/org.eclipse.datatools.sdk.feature/feature.xml
+++ b/features/org.eclipse.datatools.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.datatools.sdk.feature"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.datatools.connectivity.ui.templates"
       image="eclipse_update_120.jpg">
@@ -38,7 +38,7 @@
    <includes
          id="org.eclipse.datatools.sdk.feature.source"
          version="0.0.0"/>
-         
+
    <requires>
       <import feature="org.eclipse.pde" version="3.3.0" match="greaterOrEqual"/>
    </requires>
diff --git a/features/org.eclipse.datatools.sqldevtools.data.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.data.feature/feature.xml
index df49516..978814e 100644
--- a/features/org.eclipse.datatools.sqldevtools.data.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.data.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.datatools.sqldevtools.data.feature"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -20,9 +20,9 @@
    </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.ddl.feature" version="1.6.0"/>
+      <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"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.sqldevtools.ddl.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.ddl.feature/feature.xml
index a754cd3..4507b2e 100644
--- a/features/org.eclipse.datatools.sqldevtools.ddl.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.ddl.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.datatools.sqldevtools.ddl.feature"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -24,8 +24,8 @@
          version="0.0.0"/>
 
    <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.modelbase.feature" version="1.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.datatools.connectivity.feature" version="1.6.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/feature.xml
index 248d397..a139b9e 100644
--- a/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.datatools.sqldevtools.ddlgen.feature"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -20,9 +20,9 @@
    </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.results.feature" version="1.6.0"/>
+      <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"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.sqldevtools.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.feature/feature.xml
index 243211b..74797b3 100644
--- a/features/org.eclipse.datatools.sqldevtools.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.datatools.sqldevtools.feature"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.datatools.sqltools.common.ui"
       image="eclipse_update_120.jpg">
@@ -48,9 +48,9 @@
          optional="true"/>
 
    <requires>
-      <import feature="org.eclipse.gef" version="3.2.0"/>
-      <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.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"/>
    </requires>
diff --git a/features/org.eclipse.datatools.sqldevtools.parsers.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.parsers.feature/feature.xml
index 406ae73..90de683 100644
--- a/features/org.eclipse.datatools.sqldevtools.parsers.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.parsers.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.datatools.sqldevtools.parsers.feature"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -20,7 +20,7 @@
    </url>
 
    <requires>
-      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.0"/>
+      <import feature="org.eclipse.datatools.modelbase.feature" version="1.6.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 121892e..1f5edfb 100644
--- a/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.datatools.sqldevtools.results.feature"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -20,8 +20,8 @@
    </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.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"/>
    </requires>
 
diff --git a/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/feature.xml
index f055742..1ca9ce6 100644
--- a/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/feature.xml
+++ b/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
@@ -21,13 +21,13 @@
 
    <requires>
       <import feature="org.eclipse.emf" version="2.2.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.gef" version="3.2.0"/>
-      <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.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"/>
-      <import feature="org.eclipse.datatools.sqldevtools.results.feature" version="1.6.0" match="compatible"/>
-      <import feature="org.eclipse.datatools.sqldevtools.parsers.feature" version="1.6.0" match="compatible"/>
+      <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"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.datatools.sqltools.doc.user/feature.xml b/features/org.eclipse.datatools.sqltools.doc.user/feature.xml
index 5b3a676..3d74dbc 100644
--- a/features/org.eclipse.datatools.sqltools.doc.user/feature.xml
+++ b/features/org.eclipse.datatools.sqltools.doc.user/feature.xml
@@ -3,7 +3,7 @@
 <feature
       id="org.eclipse.datatools.sqltools.doc.user"
       label="%featureName"
-      version="1.6.0.qualifier"
+      version="1.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.datatools.sqltools.doc.user"
       image="eclipse_update_120.jpg">