fix groupId for features
fix groupId for plugins
fix groupId for tests
fix groupId for examples
diff --git a/examples/org.eclipse.datatools.connectivity.oda.jdbc.dbprofile.sample.ui/pom.xml b/examples/org.eclipse.datatools.connectivity.oda.jdbc.dbprofile.sample.ui/pom.xml
index 67bcb9f..c417885 100644
--- a/examples/org.eclipse.datatools.connectivity.oda.jdbc.dbprofile.sample.ui/pom.xml
+++ b/examples/org.eclipse.datatools.connectivity.oda.jdbc.dbprofile.sample.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>examples</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.examples</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.jdbc.dbprofile.sample.ui</artifactId>
   <version>1.0.1</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/examples/org.eclipse.datatools.connectivity.oda.jdbc.dbprofile.sample/pom.xml b/examples/org.eclipse.datatools.connectivity.oda.jdbc.dbprofile.sample/pom.xml
index 102978a..70dbdc6 100644
--- a/examples/org.eclipse.datatools.connectivity.oda.jdbc.dbprofile.sample/pom.xml
+++ b/examples/org.eclipse.datatools.connectivity.oda.jdbc.dbprofile.sample/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>examples</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.examples</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.jdbc.dbprofile.sample</artifactId>
   <version>1.0.1</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/examples/org.eclipse.datatools.connectivity.sample.ftp/pom.xml b/examples/org.eclipse.datatools.connectivity.sample.ftp/pom.xml
index 80180b8..a5c1da2 100644
--- a/examples/org.eclipse.datatools.connectivity.sample.ftp/pom.xml
+++ b/examples/org.eclipse.datatools.connectivity.sample.ftp/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>examples</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.examples</groupId>
   <artifactId>org.eclipse.datatools.connectivity.sample.ftp</artifactId>
   <version>2.0.0</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/examples/org.eclipse.datatools.connectivity.sample/pom.xml b/examples/org.eclipse.datatools.connectivity.sample/pom.xml
index 4af3036..5dad902 100644
--- a/examples/org.eclipse.datatools.connectivity.sample/pom.xml
+++ b/examples/org.eclipse.datatools.connectivity.sample/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>examples</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.examples</groupId>
   <artifactId>org.eclipse.datatools.connectivity.sample</artifactId>
   <version>1.0.0</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/examples/org.eclipse.datatools.enablement.rcp/pom.xml b/examples/org.eclipse.datatools.enablement.rcp/pom.xml
index 965ce98..fd3ee5d 100644
--- a/examples/org.eclipse.datatools.enablement.rcp/pom.xml
+++ b/examples/org.eclipse.datatools.enablement.rcp/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>examples</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.examples</groupId>
   <artifactId>org.eclipse.datatools.enablement.rcp</artifactId>
   <version>1.1.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/examples/org.eclipse.datatools.sqltools.sqlbuilder.examples/pom.xml b/examples/org.eclipse.datatools.sqltools.sqlbuilder.examples/pom.xml
index d705ff9..230fda8 100644
--- a/examples/org.eclipse.datatools.sqltools.sqlbuilder.examples/pom.xml
+++ b/examples/org.eclipse.datatools.sqltools.sqlbuilder.examples/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>examples</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.examples</groupId>
   <artifactId>org.eclipse.datatools.sqltools.sqlbuilder.examples</artifactId>
   <version>1.0.0.200803111</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/features/org.eclipse.datatools.connectivity.doc.user/pom.xml b/features/org.eclipse.datatools.connectivity.doc.user/pom.xml
index 9b8db55..c914c7f 100644
--- a/features/org.eclipse.datatools.connectivity.doc.user/pom.xml
+++ b/features/org.eclipse.datatools.connectivity.doc.user/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.connectivity.doc.user</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.connectivity.feature/pom.xml b/features/org.eclipse.datatools.connectivity.feature/pom.xml
index 82dd60c..71b2392 100644
--- a/features/org.eclipse.datatools.connectivity.feature/pom.xml
+++ b/features/org.eclipse.datatools.connectivity.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.connectivity.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.connectivity.oda.designer.core.feature/pom.xml b/features/org.eclipse.datatools.connectivity.oda.designer.core.feature/pom.xml
index d0070d2..d19ec89 100644
--- a/features/org.eclipse.datatools.connectivity.oda.designer.core.feature/pom.xml
+++ b/features/org.eclipse.datatools.connectivity.oda.designer.core.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.designer.core.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.connectivity.oda.designer.feature/pom.xml b/features/org.eclipse.datatools.connectivity.oda.designer.feature/pom.xml
index 95afdae..4d7753f 100644
--- a/features/org.eclipse.datatools.connectivity.oda.designer.feature/pom.xml
+++ b/features/org.eclipse.datatools.connectivity.oda.designer.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.designer.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.connectivity.oda.feature/pom.xml b/features/org.eclipse.datatools.connectivity.oda.feature/pom.xml
index 5d0a870..41919f0 100644
--- a/features/org.eclipse.datatools.connectivity.oda.feature/pom.xml
+++ b/features/org.eclipse.datatools.connectivity.oda.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.apache.derby.feature/pom.xml b/features/org.eclipse.datatools.enablement.apache.derby.feature/pom.xml
index 8d235df..0e4368d 100644
--- a/features/org.eclipse.datatools.enablement.apache.derby.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.apache.derby.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.apache.derby.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.feature/pom.xml b/features/org.eclipse.datatools.enablement.feature/pom.xml
index afb2c5d..8659993 100644
--- a/features/org.eclipse.datatools.enablement.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.hsqldb.feature/pom.xml b/features/org.eclipse.datatools.enablement.hsqldb.feature/pom.xml
index 24b5ab4..e561b27 100644
--- a/features/org.eclipse.datatools.enablement.hsqldb.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.hsqldb.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.hsqldb.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.ibm.feature/pom.xml b/features/org.eclipse.datatools.enablement.ibm.feature/pom.xml
index 76b6d26..f0297e9 100644
--- a/features/org.eclipse.datatools.enablement.ibm.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.ibm.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.ingres.feature/pom.xml b/features/org.eclipse.datatools.enablement.ingres.feature/pom.xml
index 8ec11da..c19a3a3 100644
--- a/features/org.eclipse.datatools.enablement.ingres.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.ingres.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.ingres.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.jdbc.feature/pom.xml b/features/org.eclipse.datatools.enablement.jdbc.feature/pom.xml
index d48f8a7..ad5d5e5 100644
--- a/features/org.eclipse.datatools.enablement.jdbc.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.jdbc.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.jdbc.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.jdt.feature/pom.xml b/features/org.eclipse.datatools.enablement.jdt.feature/pom.xml
index eb7cd35..e831007 100644
--- a/features/org.eclipse.datatools.enablement.jdt.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.jdt.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.jdt.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.msft.feature/pom.xml b/features/org.eclipse.datatools.enablement.msft.feature/pom.xml
index 8ee886d..917c07e 100644
--- a/features/org.eclipse.datatools.enablement.msft.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.msft.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.msft.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.mysql.feature/pom.xml b/features/org.eclipse.datatools.enablement.mysql.feature/pom.xml
index deef9ae..84aea4a 100644
--- a/features/org.eclipse.datatools.enablement.mysql.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.mysql.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.mysql.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.oda.designer.feature/pom.xml b/features/org.eclipse.datatools.enablement.oda.designer.feature/pom.xml
index e3f7244..f1cae71 100644
--- a/features/org.eclipse.datatools.enablement.oda.designer.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.oda.designer.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.designer.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.oda.ecore.feature/pom.xml b/features/org.eclipse.datatools.enablement.oda.ecore.feature/pom.xml
index 47972e9..3cbd231 100644
--- a/features/org.eclipse.datatools.enablement.oda.ecore.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.oda.ecore.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.ecore.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.oda.ecore.sdk.feature/pom.xml b/features/org.eclipse.datatools.enablement.oda.ecore.sdk.feature/pom.xml
index 58a6a34..9ed37eb 100644
--- a/features/org.eclipse.datatools.enablement.oda.ecore.sdk.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.oda.ecore.sdk.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.ecore.sdk.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.oda.feature/pom.xml b/features/org.eclipse.datatools.enablement.oda.feature/pom.xml
index f14a1ea..ffa0cdd 100644
--- a/features/org.eclipse.datatools.enablement.oda.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.oda.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.oracle.feature/pom.xml b/features/org.eclipse.datatools.enablement.oracle.feature/pom.xml
index e70585a..4472e3f 100644
--- a/features/org.eclipse.datatools.enablement.oracle.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.oracle.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.oracle.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.postgresql.feature/pom.xml b/features/org.eclipse.datatools.enablement.postgresql.feature/pom.xml
index 7d17ae8..59f2e33 100644
--- a/features/org.eclipse.datatools.enablement.postgresql.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.postgresql.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.postgresql.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.sap.feature/pom.xml b/features/org.eclipse.datatools.enablement.sap.feature/pom.xml
index c5a41b3..f105ca1 100644
--- a/features/org.eclipse.datatools.enablement.sap.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.sap.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.sap.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.sdk.feature/pom.xml b/features/org.eclipse.datatools.enablement.sdk.feature/pom.xml
index efe259b..3e7908a 100644
--- a/features/org.eclipse.datatools.enablement.sdk.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.sdk.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.sdk.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.sqlite.feature/pom.xml b/features/org.eclipse.datatools.enablement.sqlite.feature/pom.xml
index 049790d..b3c33b7 100644
--- a/features/org.eclipse.datatools.enablement.sqlite.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.sqlite.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.sqlite.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.enablement.sybase.feature/pom.xml b/features/org.eclipse.datatools.enablement.sybase.feature/pom.xml
index e6e51fc..1b6d060 100644
--- a/features/org.eclipse.datatools.enablement.sybase.feature/pom.xml
+++ b/features/org.eclipse.datatools.enablement.sybase.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.modelbase.feature/pom.xml b/features/org.eclipse.datatools.modelbase.feature/pom.xml
index 229fdc4..6e5ee4c 100644
--- a/features/org.eclipse.datatools.modelbase.feature/pom.xml
+++ b/features/org.eclipse.datatools.modelbase.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.modelbase.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.sdk.feature/pom.xml b/features/org.eclipse.datatools.sdk.feature/pom.xml
index 1edc7d3..ee359fd 100644
--- a/features/org.eclipse.datatools.sdk.feature/pom.xml
+++ b/features/org.eclipse.datatools.sdk.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.sdk.feature</artifactId>
   <version>1.14.100-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.datatools.sqldevtools.data.feature/pom.xml b/features/org.eclipse.datatools.sqldevtools.data.feature/pom.xml
index 0fd8d39..00f742b 100644
--- a/features/org.eclipse.datatools.sqldevtools.data.feature/pom.xml
+++ b/features/org.eclipse.datatools.sqldevtools.data.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.sqldevtools.data.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.sqldevtools.ddl.feature/pom.xml b/features/org.eclipse.datatools.sqldevtools.ddl.feature/pom.xml
index c4693ea..3356222 100644
--- a/features/org.eclipse.datatools.sqldevtools.ddl.feature/pom.xml
+++ b/features/org.eclipse.datatools.sqldevtools.ddl.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.sqldevtools.ddl.feature</artifactId>
   <version>1.14.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/pom.xml b/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/pom.xml
index 61f8eca..bf0bc9b 100644
--- a/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/pom.xml
+++ b/features/org.eclipse.datatools.sqldevtools.ddlgen.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.sqldevtools.ddlgen.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.sqldevtools.feature/pom.xml b/features/org.eclipse.datatools.sqldevtools.feature/pom.xml
index 9b18dc9..3644219 100644
--- a/features/org.eclipse.datatools.sqldevtools.feature/pom.xml
+++ b/features/org.eclipse.datatools.sqldevtools.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.sqldevtools.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.sqldevtools.parsers.feature/pom.xml b/features/org.eclipse.datatools.sqldevtools.parsers.feature/pom.xml
index c1980e0..fd3e080 100644
--- a/features/org.eclipse.datatools.sqldevtools.parsers.feature/pom.xml
+++ b/features/org.eclipse.datatools.sqldevtools.parsers.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.sqldevtools.parsers.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.sqldevtools.results.feature/pom.xml b/features/org.eclipse.datatools.sqldevtools.results.feature/pom.xml
index c1a8a8e..259da58 100644
--- a/features/org.eclipse.datatools.sqldevtools.results.feature/pom.xml
+++ b/features/org.eclipse.datatools.sqldevtools.results.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.sqldevtools.results.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature/pom.xml b/features/org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature/pom.xml
index 5dd2b81..ccea6d5 100644
--- a/features/org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature/pom.xml
+++ b/features/org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/pom.xml b/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/pom.xml
index 3d25c3d..a5fed89 100644
--- a/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/pom.xml
+++ b/features/org.eclipse.datatools.sqldevtools.sqlbuilder.feature/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.sqldevtools.sqlbuilder.feature</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.datatools.sqltools.doc.user/pom.xml b/features/org.eclipse.datatools.sqltools.doc.user/pom.xml
index 1a6bf69..2cf99a6 100644
--- a/features/org.eclipse.datatools.sqltools.doc.user/pom.xml
+++ b/features/org.eclipse.datatools.sqltools.doc.user/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>features</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.sqltools.doc.user</artifactId>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition.nl/pom.xml
index 9f398e1..f04e51f 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.apache.derby.dbdefinition.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/pom.xml
index fef592d..844db1d 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.apache.derby.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.nl/pom.xml
index f134ad4..88c5fb5 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.apache.derby.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui.nl/pom.xml
index 1c7fb3d..5dc7550 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.apache.derby.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/pom.xml
index 63f697e..1e4ea11 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.apache.derby.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/pom.xml
index 75d03a1..1d6ea7c 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.apache.derby/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.apache.derby</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile.nl/pom.xml
index a79bbb2..8ff6b03 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.console.profile.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/pom.xml
index 13d76a8..50af0c9 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.console.profile/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.console.profile</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.nl/pom.xml
index 639d254..8f51d7d 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.db.generic.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui.nl/pom.xml
index 243ca76..1b13fe2 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.db.generic.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/pom.xml
index 5107700..468493a 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.db.generic.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/pom.xml
index 027334c..af37e02 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.db.generic/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.db.generic</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC.nl/pom.xml
index ea47ceb..5fcee0c 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.dbdefinition.genericJDBC.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/pom.xml
index 7ab0016..2030514 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.dbdefinition.genericJDBC/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.dbdefinition.genericJDBC</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/pom.xml
index 224a37e..df0df12 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.jdt/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.jdt</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer.nl/pom.xml
index 60399c6..471bb4e 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.consumer.nl1</artifactId>
   <version>3.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/pom.xml
index bbef4d9..571b79a 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.consumer/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.consumer</artifactId>
   <version>3.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.nl/pom.xml
index bef1654..5ad75b0 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.design.nl1</artifactId>
   <version>3.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui.nl/pom.xml
index 38906cc..112689b 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.design.ui.nl1</artifactId>
   <version>3.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/pom.xml
index 63a69da..c059ef2 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.design.ui</artifactId>
   <version>3.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/pom.xml
index 547afbf..2dc3cf6 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.design/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.design</artifactId>
   <version>3.5.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.nl/pom.xml
index f9b0c0f..7e90f17 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.flatfile.nl1</artifactId>
   <version>3.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui.nl/pom.xml
index 82885d0..e6ebc40 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.flatfile.ui.nl1</artifactId>
   <version>3.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/pom.xml
index 52212e2..c5a2f76 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.flatfile.ui</artifactId>
   <version>3.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/pom.xml
index 266601b..334571e 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.flatfile/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.flatfile</artifactId>
   <version>3.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.nl/pom.xml
index ded85d5..7331dcc 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.nl1</artifactId>
   <version>3.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile.nl/pom.xml
index 0a4cd0a..581ac4c 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.profile.nl1</artifactId>
   <version>3.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/pom.xml
index 51914e3..1a231fc 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.profile/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.profile</artifactId>
   <version>3.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui.nl/pom.xml
index 0fee707..fdb29d0 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.template.ui.nl1</artifactId>
   <version>3.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/pom.xml
index be3e0d6..c119f4b 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda.template.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.template.ui</artifactId>
   <version>3.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.oda/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/pom.xml
index bdca1c6..b47e80a 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.oda/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.oda/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda</artifactId>
   <version>3.6.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.nl/pom.xml
index e8093e8..fa3c069 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.sqm.core.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui.nl/pom.xml
index 9c330b0..fbb4bed 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.sqm.core.ui.nl1</artifactId>
   <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/pom.xml
index c9b4bf2..5e4d0b4 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.sqm.core.ui</artifactId>
   <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core/pom.xml
index 9f3921c..de0174b 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.core/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.sqm.core</artifactId>
   <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.server.ui.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.server.ui.nl/pom.xml
index 7d77def..74e1afc 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.server.ui.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.server.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.sqm.server.ui.nl1</artifactId>
   <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.server.ui/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.server.ui/pom.xml
index e9e132c..5bea1b7 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.server.ui/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.sqm.server.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.sqm.server.ui</artifactId>
   <version>1.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.ui.dse.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.ui.dse.nl/pom.xml
index 04b2446..a100896 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.ui.dse.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.ui.dse.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.ui.dse.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.ui.dse/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.ui.dse/pom.xml
index 483e5c7..8fb54e9 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.ui.dse/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.ui.dse/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.ui.dse</artifactId>
   <version>1.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.ui.nl/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.ui.nl/pom.xml
index 35417ef..db9e8cf 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.ui.nl/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.ui.templates/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.ui.templates/pom.xml
index e4d2dce..c25e8d8 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.ui.templates/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.ui.templates/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.ui.templates</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity.ui/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity.ui/pom.xml
index a1de673..dc4a14d 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity.ui/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.ui</artifactId>
   <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/connectivity/org.eclipse.datatools.connectivity/pom.xml b/plugins/connectivity/org.eclipse.datatools.connectivity/pom.xml
index 48ade6e..0df59b1 100644
--- a/plugins/connectivity/org.eclipse.datatools.connectivity/pom.xml
+++ b/plugins/connectivity/org.eclipse.datatools.connectivity/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>connectivity</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity</artifactId>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/docs/org.eclipse.datatools.connectivity.doc.user.contexts/pom.xml b/plugins/docs/org.eclipse.datatools.connectivity.doc.user.contexts/pom.xml
index 0c06bb1..53f2451 100644
--- a/plugins/docs/org.eclipse.datatools.connectivity.doc.user.contexts/pom.xml
+++ b/plugins/docs/org.eclipse.datatools.connectivity.doc.user.contexts/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>docs</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.connectivity.doc.user.contexts</artifactId>
   <version>1.7.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/docs/org.eclipse.datatools.connectivity.doc.user/pom.xml b/plugins/docs/org.eclipse.datatools.connectivity.doc.user/pom.xml
index d4e2ab9..95b9e75 100644
--- a/plugins/docs/org.eclipse.datatools.connectivity.doc.user/pom.xml
+++ b/plugins/docs/org.eclipse.datatools.connectivity.doc.user/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>docs</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.features</groupId>
   <artifactId>org.eclipse.datatools.connectivity.doc.user</artifactId>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/docs/org.eclipse.datatools.doc.isv/pom.xml b/plugins/docs/org.eclipse.datatools.doc.isv/pom.xml
index a6be398..83b14ae 100644
--- a/plugins/docs/org.eclipse.datatools.doc.isv/pom.xml
+++ b/plugins/docs/org.eclipse.datatools.doc.isv/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>docs</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.doc.isv</artifactId>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/docs/org.eclipse.datatools.help/pom.xml b/plugins/docs/org.eclipse.datatools.help/pom.xml
index 8daf1c4..85b46ab 100644
--- a/plugins/docs/org.eclipse.datatools.help/pom.xml
+++ b/plugins/docs/org.eclipse.datatools.help/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>docs</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.help</artifactId>
   <version>1.7.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/docs/org.eclipse.datatools.oda.cshelp/pom.xml b/plugins/docs/org.eclipse.datatools.oda.cshelp/pom.xml
index 70a7126..1385973 100644
--- a/plugins/docs/org.eclipse.datatools.oda.cshelp/pom.xml
+++ b/plugins/docs/org.eclipse.datatools.oda.cshelp/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>docs</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.oda.cshelp</artifactId>
   <version>1.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/docs/org.eclipse.datatools.sqltools.doc.user.contexts/pom.xml b/plugins/docs/org.eclipse.datatools.sqltools.doc.user.contexts/pom.xml
index d59b218..493a302 100644
--- a/plugins/docs/org.eclipse.datatools.sqltools.doc.user.contexts/pom.xml
+++ b/plugins/docs/org.eclipse.datatools.sqltools.doc.user.contexts/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>docs</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.doc.user.contexts</artifactId>
   <version>1.7.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/docs/org.eclipse.datatools.sqltools.doc.user/pom.xml b/plugins/docs/org.eclipse.datatools.sqltools.doc.user/pom.xml
index 4d8d13f..4dcb609 100644
--- a/plugins/docs/org.eclipse.datatools.sqltools.doc.user/pom.xml
+++ b/plugins/docs/org.eclipse.datatools.sqltools.doc.user/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>docs</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.doc.user</artifactId>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.finfo/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.finfo/pom.xml
index 8cfd940..1620c71 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.finfo/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.finfo/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.finfo</artifactId>
   <version>1.7.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.dbdefinition.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.dbdefinition.nl/pom.xml
index 3555fe5..dcde6ea 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.dbdefinition.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.dbdefinition.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.hsqldb.dbdefinition.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.dbdefinition/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.dbdefinition/pom.xml
index 3693f08..ade19d0 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.dbdefinition/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.hsqldb.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.nl/pom.xml
index 2d13a77..83f3e30 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.hsqldb.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.ui.nl/pom.xml
index ec7c0e7..9430a42 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.hsqldb.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.ui/pom.xml
index e96dba0..2ccd12e 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.hsqldb.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.hsqldb.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.hsqldb/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.hsqldb/pom.xml
index b919db5..da4fcd3 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.hsqldb/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.hsqldb/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.hsqldb</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition.nl/pom.xml
index 2fc1f9a..4995562 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition/pom.xml
index a5022c8..e85f78a 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.iseries.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.nl/pom.xml
index c2fb54c..3e6c40f 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.iseries.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.ui.nl/pom.xml
index bd7884d..e6f3109 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.iseries.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.ui/pom.xml
index 4f2942e..3db6bf4 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.iseries.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries/pom.xml
index c4b7df1..1131e64 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.iseries/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.iseries</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition.nl/pom.xml
index 84f16d4..e515bf1 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition/pom.xml
index a8e10b0..68c5f02 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.luw.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.nl/pom.xml
index 087dd59..7c4b3fa 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.luw.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.ui.nl/pom.xml
index ffe5439..22da76c 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.luw.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.ui/pom.xml
index a27e953..292bd12 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.luw.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw/pom.xml
index a4b37b5..995b0b0 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.luw/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.luw</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition.nl/pom.xml
index 5439fa6..9c6b4fe 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition/pom.xml
index d84c7b9..36253bc 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.zseries.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.nl/pom.xml
index 6b2f7bc..251a92e 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.zseries.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.ui.nl/pom.xml
index 201e9e9..623cb9b 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.zseries.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.ui/pom.xml
index 95edb01..40323ca 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.zseries.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries/pom.xml
index 4d32e30..6fe30e3 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2.zseries/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2.zseries</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2/pom.xml
index 4a7bf70..86faed3 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.db2/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.db2</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.dbdefinition.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.dbdefinition.nl/pom.xml
index 6153ed1..66691f0 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.dbdefinition.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.dbdefinition.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.informix.dbdefinition.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.dbdefinition/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.dbdefinition/pom.xml
index 191885e..c806c76 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.dbdefinition/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.informix.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.nl/pom.xml
index 8aa96e7..7629909 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.informix.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.ui.nl/pom.xml
index 325b04a..191f87b 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.informix.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.ui/pom.xml
index 7839cce..6e05809 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.informix.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix/pom.xml
index 22d2466..ad65ff8 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.informix/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.informix</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.ui.nl/pom.xml
index 152a1a3..64ffdfb 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm.ui/pom.xml
index f8fb0d2..e561a61 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ibm/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ibm/pom.xml
index 524be2d..986f1ba 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ibm/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ibm/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ibm</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ingres.dbdefinition.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ingres.dbdefinition.nl/pom.xml
index 02c127b..84a1116 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ingres.dbdefinition.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ingres.dbdefinition.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ingres.dbdefinition.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ingres.dbdefinition/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ingres.dbdefinition/pom.xml
index 7904f7d..1e79362 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ingres.dbdefinition/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ingres.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ingres.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ingres.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ingres.nl/pom.xml
index 18ad7ce..cfcc28f 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ingres.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ingres.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ingres.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ingres.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ingres.ui.nl/pom.xml
index 48c4679..2e69044 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ingres.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ingres.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ingres.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ingres.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ingres.ui/pom.xml
index df1c418..debf66a 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ingres.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ingres.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ingres.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.ingres/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.ingres/pom.xml
index 0d641ef..a12588e 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.ingres/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.ingres/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.ingres</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.jdt.classpath.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.jdt.classpath.nl/pom.xml
index e3709d3..c784d40 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.jdt.classpath.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.jdt.classpath.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.jdt.classpath.nl1</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.jdt.classpath/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.jdt.classpath/pom.xml
index 2d6e9e6..852864a 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.jdt.classpath/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.jdt.classpath/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.jdt.classpath</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition.nl/pom.xml
index 9315998..9044a18 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition/pom.xml
index ea7e6d6..7b2c28b 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.msft.sqlserver.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.nl/pom.xml
index da65f3f..509ab83 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.msft.sqlserver.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.ui.nl/pom.xml
index f284bcf..efa84ed 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.msft.sqlserver.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.ui/pom.xml
index 3fa93d3..c42c41a 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.msft.sqlserver.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver/pom.xml
index 8603e07..e157cf8 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.msft.sqlserver/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.msft.sqlserver</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.mysql.dbdefinition.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.mysql.dbdefinition.nl/pom.xml
index d81915c..17f1e93 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.mysql.dbdefinition.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.mysql.dbdefinition.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.mysql.dbdefinition.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.mysql.dbdefinition/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.mysql.dbdefinition/pom.xml
index e110fc1..424064e 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.mysql.dbdefinition/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.mysql.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.mysql.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.mysql.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.mysql.nl/pom.xml
index e5e4b19..47d35a4 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.mysql.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.mysql.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.mysql.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.mysql.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.mysql.ui.nl/pom.xml
index 66745ad..a9aa81f 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.mysql.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.mysql.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.mysql.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.mysql.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.mysql.ui/pom.xml
index ad48801..b479e86 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.mysql.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.mysql.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.mysql.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.mysql/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.mysql/pom.xml
index 61a9ad8..1888a4b 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.mysql/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.mysql/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.mysql</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oda.ecore.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oda.ecore.ui/pom.xml
index f35f51d..336381e 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oda.ecore.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oda.ecore.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.ecore.ui</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oda.ecore/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oda.ecore/pom.xml
index 48a0bdb..d7dc403 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oda.ecore/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oda.ecore/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.ecore</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oda.ws.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oda.ws.nl/pom.xml
index 0585b07..184113e 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oda.ws.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oda.ws.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.ws.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oda.ws.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oda.ws.ui.nl/pom.xml
index 7293532..4fcec72 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oda.ws.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oda.ws.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.ws.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oda.ws.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oda.ws.ui/pom.xml
index 5fcaf5e..e8b71b3 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oda.ws.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oda.ws.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.ws.ui</artifactId>
   <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oda.ws/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oda.ws/pom.xml
index db978c7..2e9f539 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oda.ws/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oda.ws/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.ws</artifactId>
   <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oda.xml.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oda.xml.nl/pom.xml
index 3bb8a5c..c04bc12 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oda.xml.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oda.xml.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.xml.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oda.xml.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oda.xml.ui.nl/pom.xml
index 29eb0ed..39c6fd8 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oda.xml.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oda.xml.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.xml.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oda.xml.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oda.xml.ui/pom.xml
index e5b0b20..599ac5f 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oda.xml.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oda.xml.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.xml.ui</artifactId>
   <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oda.xml/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oda.xml/pom.xml
index ebc2240..57dfbb5 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oda.xml/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oda.xml/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.xml</artifactId>
   <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oracle.dbdefinition.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oracle.dbdefinition.nl/pom.xml
index bd0f295..09173a7 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oracle.dbdefinition.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oracle.dbdefinition.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oracle.dbdefinition.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oracle.dbdefinition/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oracle.dbdefinition/pom.xml
index 74b2834..bc2cf9f 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oracle.dbdefinition/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oracle.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oracle.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oracle.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oracle.nl/pom.xml
index 6c06bf9..afdd186 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oracle.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oracle.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oracle.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oracle.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oracle.ui.nl/pom.xml
index 564e040..f967bb0 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oracle.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oracle.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oracle.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oracle.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oracle.ui/pom.xml
index 91a58ca..e0cedf2 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oracle.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oracle.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oracle.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.oracle/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.oracle/pom.xml
index 5616c01..84bd959 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.oracle/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.oracle/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.oracle</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.postgresql.dbdefinition/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.postgresql.dbdefinition/pom.xml
index 84b8d35..6e8d529 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.postgresql.dbdefinition/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.postgresql.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.postgresql.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.postgresql.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.postgresql.nl/pom.xml
index e0a7a6f..87c16ec 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.postgresql.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.postgresql.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.postgresql.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.postgresql.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.postgresql.ui.nl/pom.xml
index 27928ef..32fa146 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.postgresql.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.postgresql.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.postgresql.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.postgresql.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.postgresql.ui/pom.xml
index b32b5b8..b0755e9 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.postgresql.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.postgresql.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.postgresql.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.postgresql/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.postgresql/pom.xml
index 32cd53b..184e5db 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.postgresql/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.postgresql/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.postgresql</artifactId>
   <version>1.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.dbdefinition.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.dbdefinition.nl/pom.xml
index 117645a..02bc9bd 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.dbdefinition.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.dbdefinition.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sap.maxdb.dbdefinition.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.dbdefinition/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.dbdefinition/pom.xml
index 51648f8..2a09bf6 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.dbdefinition/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sap.maxdb.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.nl/pom.xml
index abeb8bd..25a337e 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sap.maxdb.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.ui.nl/pom.xml
index aac7b30..de07c94 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sap.maxdb.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.ui/pom.xml
index 8b0c0cb..d6c2639 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sap.maxdb.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb/pom.xml
index 511b392..27cc81b 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sap.maxdb/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sap.maxdb</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sqlite.dbdefinition.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sqlite.dbdefinition.nl/pom.xml
index 854366c..a070883 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sqlite.dbdefinition.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sqlite.dbdefinition.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sqlite.dbdefinition.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sqlite.dbdefinition/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sqlite.dbdefinition/pom.xml
index 2315f58..f71d89c 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sqlite.dbdefinition/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sqlite.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sqlite.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sqlite.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sqlite.nl/pom.xml
index 3db613d..f3c6ecc 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sqlite.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sqlite.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sqlite.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sqlite.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sqlite.ui.nl/pom.xml
index 977e0d7..d7da081 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sqlite.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sqlite.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sqlite.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sqlite.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sqlite.ui/pom.xml
index e7c6044..34aebfa 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sqlite.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sqlite.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sqlite.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sqlite/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sqlite/pom.xml
index 395e4d6..0c6c57a 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sqlite/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sqlite/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sqlite</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.dbdefinition/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.dbdefinition/pom.xml
index e517204..0384fc1 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.dbdefinition/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.asa.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.models.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.models.nl/pom.xml
index 507289d..d40a51e 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.models.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.models.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.asa.models.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.models/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.models/pom.xml
index 88d7964..4de2bcc 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.models/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.models/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.asa.models</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.nl/pom.xml
index 8cfd2cc..1020a13 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.asa.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/pom.xml
index 57226cb..a3dfe62 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.asa.schemaobjecteditor.examples</artifactId>
   <version>2.7.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.ui/pom.xml
index 75f416c..caf53b2 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.asa.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa/pom.xml
index 59ca49b..5a006c7 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.asa/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.asa</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.dbdefinition.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.dbdefinition.nl/pom.xml
index 81bbf3f..3aa0766 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.dbdefinition.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.dbdefinition.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.ase.dbdefinition.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.dbdefinition/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.dbdefinition/pom.xml
index d5ce67e..2e0de18 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.dbdefinition/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.ase.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.models/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.models/pom.xml
index b1cad7f..0f3dc78 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.models/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.models/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.ase.models</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.ui/pom.xml
index 2fd1f3b..fc5959f 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.ase.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase/pom.xml
index 8254c60..9281b70 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.ase/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.ase</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.models/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.models/pom.xml
index 1c177e0..91ad0fb 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.models/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.models/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.models</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.nl/pom.xml
index a9c9c0b..935c2c8 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.ui.nl/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.ui.nl/pom.xml
index 16ae31d..0758ff2 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.ui.nl/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.ui.nl1</artifactId>
   <version>1.0.0</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase.ui/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase.ui/pom.xml
index f8ab93e..e8b9a84 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase.ui/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/enablement/org.eclipse.datatools.enablement.sybase/pom.xml b/plugins/enablement/org.eclipse.datatools.enablement.sybase/pom.xml
index e49d5b9..d2207bf 100644
--- a/plugins/enablement/org.eclipse.datatools.enablement.sybase/pom.xml
+++ b/plugins/enablement/org.eclipse.datatools.enablement.sybase/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>enablement</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.enablement.sybase</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/modelbase/org.eclipse.datatools.modelbase.dbdefinition.nl/pom.xml b/plugins/modelbase/org.eclipse.datatools.modelbase.dbdefinition.nl/pom.xml
index d261a51..58d4c03 100644
--- a/plugins/modelbase/org.eclipse.datatools.modelbase.dbdefinition.nl/pom.xml
+++ b/plugins/modelbase/org.eclipse.datatools.modelbase.dbdefinition.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>modelbase</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.modelbase.dbdefinition.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/modelbase/org.eclipse.datatools.modelbase.dbdefinition/pom.xml b/plugins/modelbase/org.eclipse.datatools.modelbase.dbdefinition/pom.xml
index d8f7ec0..2be0b10 100644
--- a/plugins/modelbase/org.eclipse.datatools.modelbase.dbdefinition/pom.xml
+++ b/plugins/modelbase/org.eclipse.datatools.modelbase.dbdefinition/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>modelbase</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.modelbase.dbdefinition</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/modelbase/org.eclipse.datatools.modelbase.derby.nl/pom.xml b/plugins/modelbase/org.eclipse.datatools.modelbase.derby.nl/pom.xml
index 6b4a73d..66b36d4 100644
--- a/plugins/modelbase/org.eclipse.datatools.modelbase.derby.nl/pom.xml
+++ b/plugins/modelbase/org.eclipse.datatools.modelbase.derby.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>modelbase</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.modelbase.derby.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/modelbase/org.eclipse.datatools.modelbase.derby/pom.xml b/plugins/modelbase/org.eclipse.datatools.modelbase.derby/pom.xml
index 502daa6..1dd856c 100644
--- a/plugins/modelbase/org.eclipse.datatools.modelbase.derby/pom.xml
+++ b/plugins/modelbase/org.eclipse.datatools.modelbase.derby/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>modelbase</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.modelbase.derby</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.edit.nl/pom.xml b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.edit.nl/pom.xml
index 162408c..07ed060 100644
--- a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.edit.nl/pom.xml
+++ b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.edit.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>modelbase</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.modelbase.sql.edit.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.edit/pom.xml b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.edit/pom.xml
index 675de9a..8fd8f56 100644
--- a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.edit/pom.xml
+++ b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.edit/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>modelbase</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.modelbase.sql.edit</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.nl/pom.xml b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.nl/pom.xml
index e84c02f..ac59c2c 100644
--- a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.nl/pom.xml
+++ b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>modelbase</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.modelbase.sql.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query.edit.nl/pom.xml b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query.edit.nl/pom.xml
index b0f7402..fea5f63 100644
--- a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query.edit.nl/pom.xml
+++ b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query.edit.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>modelbase</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.modelbase.sql.query.edit.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query.edit/pom.xml b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query.edit/pom.xml
index 8f60756..ae5d97a 100644
--- a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query.edit/pom.xml
+++ b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query.edit/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>modelbase</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.modelbase.sql.query.edit</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query.nl/pom.xml b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query.nl/pom.xml
index 21985a8..0994c05 100644
--- a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query.nl/pom.xml
+++ b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>modelbase</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.modelbase.sql.query.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query/pom.xml b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query/pom.xml
index 6dd6148..0badeba 100644
--- a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query/pom.xml
+++ b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.query/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>modelbase</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.modelbase.sql.query</artifactId>
   <version>1.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.xml.query.nl/pom.xml b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.xml.query.nl/pom.xml
index 6224ccb..7e1eb3a 100644
--- a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.xml.query.nl/pom.xml
+++ b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.xml.query.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>modelbase</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.modelbase.sql.xml.query.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.xml.query/pom.xml b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.xml.query/pom.xml
index 4af349d..fa837f3 100644
--- a/plugins/modelbase/org.eclipse.datatools.modelbase.sql.xml.query/pom.xml
+++ b/plugins/modelbase/org.eclipse.datatools.modelbase.sql.xml.query/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>modelbase</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.modelbase.sql.xml.query</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/modelbase/org.eclipse.datatools.modelbase.sql/pom.xml b/plugins/modelbase/org.eclipse.datatools.modelbase.sql/pom.xml
index afecb35..b5d6953 100644
--- a/plugins/modelbase/org.eclipse.datatools.modelbase.sql/pom.xml
+++ b/plugins/modelbase/org.eclipse.datatools.modelbase.sql/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>modelbase</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.modelbase.sql</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/org.eclipse.datatools.sdk/pom.xml b/plugins/org.eclipse.datatools.sdk/pom.xml
index 578d302..a4e8b25 100644
--- a/plugins/org.eclipse.datatools.sdk/pom.xml
+++ b/plugins/org.eclipse.datatools.sdk/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>plugins</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sdk</artifactId>
   <version>1.9.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui.nl/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui.nl/pom.xml
index c267620..9dd181a 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui.nl/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.common.ui.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/pom.xml
index 67906c2..dbcb6da 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.common.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.common.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.data.core/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.data.core/pom.xml
index 43141cb..35c3c5c 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.data.core/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.data.core/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.data.core</artifactId>
   <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.data.ui/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.data.ui/pom.xml
index a3304b6..ec383b6 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.data.ui/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.data.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.data.ui</artifactId>
   <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.db.derby.nl/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.db.derby.nl/pom.xml
index 1641bb5..7851b37 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.db.derby.nl/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.db.derby.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.db.derby.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.db.derby.ui/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.db.derby.ui/pom.xml
index c380cb8..ad8389a 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.db.derby.ui/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.db.derby.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.db.derby.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.db.derby/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.db.derby/pom.xml
index 430c21b..fa526ce 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.db.derby/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.db.derby/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.db.derby</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.db.generic.nl/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.db.generic.nl/pom.xml
index 261a385..7a796e3 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.db.generic.nl/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.db.generic.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.db.generic.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.db.generic.ui/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.db.generic.ui/pom.xml
index 01e2b5f..6c76dba 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.db.generic.ui/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.db.generic.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.db.generic.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.db.generic/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.db.generic/pom.xml
index 52ceb9e..71be5e7 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.db.generic/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.db.generic/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.db.generic</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.ddlgen.ui/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.ddlgen.ui/pom.xml
index 71f0a00..2eaf999 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.ddlgen.ui/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.ddlgen.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.ddlgen.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.debugger.core.ui/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.debugger.core.ui/pom.xml
index db835d7..b213255 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.debugger.core.ui/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.debugger.core.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.debugger.core.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.debugger.core/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.debugger.core/pom.xml
index 1946f0c..770f652 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.debugger.core/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.debugger.core/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.debugger.core</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core.nl/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core.nl/pom.xml
index 0aeeadd..660ee7d 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core.nl/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.editor.core.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core.ui/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core.ui/pom.xml
index 33079f1..96c5351 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core.ui/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.editor.core.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core/pom.xml
index 18eaa4c..b61aa78 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.editor.core/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.editor.core</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.lexer/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.lexer/pom.xml
index 15cdf9b..413f084 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.lexer/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.lexer/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.parsers.sql.lexer</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.nl/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.nl/pom.xml
index 00c6357..cf153cd 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.nl/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.parsers.sql.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.query.nl/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.query.nl/pom.xml
index ecaf5c9..87c4637 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.query.nl/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.query.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.parsers.sql.query.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.query/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.query/pom.xml
index ee48aaf..8ee4896 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.query/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.query/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.parsers.sql.query</artifactId>
   <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.xml.query/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.xml.query/pom.xml
index 58f6f38..4f75db5 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.xml.query/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql.xml.query/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.parsers.sql.xml.query</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql/pom.xml
index c096dc5..1370816 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.parsers.sql/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.parsers.sql</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.plan.nl/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.plan.nl/pom.xml
index 8ba6f69..8494623 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.plan.nl/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.plan.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.plan.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.plan/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.plan/pom.xml
index 79f8c7f..5cb2754 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.plan/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.plan/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.plan</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.result.nl/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.result.nl/pom.xml
index bd40c83..00f790f 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.result.nl/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.result.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.result.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.result.ui/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.result.ui/pom.xml
index b3d383f..ee25bc8 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.result.ui/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.result.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.result.ui</artifactId>
   <version>1.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.result/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.result/pom.xml
index 09ec801..3efbd0d 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.result/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.result/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.result</artifactId>
   <version>1.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.routineeditor.ui/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.routineeditor.ui/pom.xml
index 4b8f533..a5931ba 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.routineeditor.ui/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.routineeditor.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.routineeditor.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.routineeditor/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.routineeditor/pom.xml
index e5da717..f0e18fc 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.routineeditor/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.routineeditor/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.routineeditor</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.schemaobjecteditor.ui.pages/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.schemaobjecteditor.ui.pages/pom.xml
index 4f024ec..8410458 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.schemaobjecteditor.ui.pages/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.schemaobjecteditor.ui.pages/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.schemaobjecteditor.ui.pages</artifactId>
   <version>1.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.schemaobjecteditor.ui/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.schemaobjecteditor.ui/pom.xml
index 1d3b1a3..3a402d3 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.schemaobjecteditor.ui/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.schemaobjecteditor.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.schemaobjecteditor.ui</artifactId>
   <version>1.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.schemaobjecteditor/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.schemaobjecteditor/pom.xml
index 22f4c1c..81884ba 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.schemaobjecteditor/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.schemaobjecteditor/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.schemaobjecteditor</artifactId>
   <version>1.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sql.nl/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.sql.nl/pom.xml
index fe68e30..3a0872b 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sql.nl/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sql.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.sql.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sql.ui/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.sql.ui/pom.xml
index 4b55ba3..f2b0556 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sql.ui/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sql.ui/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.sql.ui</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sql/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.sql/pom.xml
index e1dc5a3..4218d4c 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sql/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sql/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.sql</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder.nl/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder.nl/pom.xml
index 64be0b1..7212829 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder.nl/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.sqlbuilder.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/pom.xml
index f5a536e..1db6a80 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlbuilder/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.sqlbuilder</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/pom.xml
index 7532a79..211b4de 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor.nl/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.sqleditor.nl1</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/pom.xml
index 8c72786..971e66e 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.sqleditor</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlscrapbook/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlscrapbook/pom.xml
index 635bb64..39aebf0 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqlscrapbook/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqlscrapbook/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.sqlscrapbook</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.tabledataeditor/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.tabledataeditor/pom.xml
index ed9242e..616d6c9 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.tabledataeditor/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.tabledataeditor/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>sqltools</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.tabledataeditor</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/pom.xml b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/pom.xml
index 10236c4..59a3bf3 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/pom.xml
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.consumer.testdriver</artifactId>
   <version>3.2.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/pom.xml b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/pom.xml
index 01137dc..0f73b10 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/pom.xml
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.consumer.tests</artifactId>
   <version>3.2.4-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.connectivity.oda.design.tests/pom.xml b/tests/org.eclipse.datatools.connectivity.oda.design.tests/pom.xml
index de8678b..9a7e0f6 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.design.tests/pom.xml
+++ b/tests/org.eclipse.datatools.connectivity.oda.design.tests/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.design.tests</artifactId>
   <version>3.2.3-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/pom.xml b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/pom.xml
index be2e0ed..85139cf 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/pom.xml
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.flatfile.tests</artifactId>
   <version>3.0.3.200702201</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.connectivity.oda.profile.tests/pom.xml b/tests/org.eclipse.datatools.connectivity.oda.profile.tests/pom.xml
index a54df91..8eed8eb 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.profile.tests/pom.xml
+++ b/tests/org.eclipse.datatools.connectivity.oda.profile.tests/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.profile.tests</artifactId>
   <version>3.0.6.200801141</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.connectivity.oda.tests/pom.xml b/tests/org.eclipse.datatools.connectivity.oda.tests/pom.xml
index e016826..f5ea30e 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.tests/pom.xml
+++ b/tests/org.eclipse.datatools.connectivity.oda.tests/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.connectivity.oda.tests</artifactId>
   <version>3.2.1-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.connectivity.test/pom.xml b/tests/org.eclipse.datatools.connectivity.test/pom.xml
index e6e3804..c0a585f 100644
--- a/tests/org.eclipse.datatools.connectivity.test/pom.xml
+++ b/tests/org.eclipse.datatools.connectivity.test/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.connectivity.test</artifactId>
   <version>1.0.1.200802251</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/pom.xml b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/pom.xml
index 9270222..acc2a63 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/pom.xml
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.enablement.dbdefinition.junittest</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.enablement.oda.ws.test/pom.xml b/tests/org.eclipse.datatools.enablement.oda.ws.test/pom.xml
index b94fbae..83a0105 100644
--- a/tests/org.eclipse.datatools.enablement.oda.ws.test/pom.xml
+++ b/tests/org.eclipse.datatools.enablement.oda.ws.test/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.ws.test</artifactId>
   <version>1.1.0.200801141</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/pom.xml b/tests/org.eclipse.datatools.enablement.oda.xml.tests/pom.xml
index c908a05..e481b66 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/pom.xml
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.enablement.oda.xml.tests</artifactId>
   <version>1.0.2-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.sqltools.db.generic.test/pom.xml b/tests/org.eclipse.datatools.sqltools.db.generic.test/pom.xml
index 235d707..f31737f 100644
--- a/tests/org.eclipse.datatools.sqltools.db.generic.test/pom.xml
+++ b/tests/org.eclipse.datatools.sqltools.db.generic.test/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.sqltools.db.generic.test</artifactId>
   <version>1.0.0.200706131</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/pom.xml b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/pom.xml
index f9aa111..4b8fd8d 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/pom.xml
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.sqltools.parsers.sql.query.test</artifactId>
   <version>1.0.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.test/pom.xml b/tests/org.eclipse.datatools.sqltools.parsers.sql.test/pom.xml
index cfc78b3..fd34640 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.test/pom.xml
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.test/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.sqltools.parsers.sql.test</artifactId>
   <version>1.0.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/pom.xml b/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/pom.xml
index 8c56285..41245e7 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/pom.xml
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.sqltools.parsers.sql.xml.query.test</artifactId>
   <version>1.0.0.200706151</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.sqltools.plan.junittest/pom.xml b/tests/org.eclipse.datatools.sqltools.plan.junittest/pom.xml
index 855bc0f..f6a7fa4 100644
--- a/tests/org.eclipse.datatools.sqltools.plan.junittest/pom.xml
+++ b/tests/org.eclipse.datatools.sqltools.plan.junittest/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.sqltools.plan.junittest</artifactId>
   <version>0.9.0.200605101</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/tests/org.eclipse.datatools.sqltools.result.junittest/pom.xml b/tests/org.eclipse.datatools.sqltools.result.junittest/pom.xml
index f61314d..06f3e69 100644
--- a/tests/org.eclipse.datatools.sqltools.result.junittest/pom.xml
+++ b/tests/org.eclipse.datatools.sqltools.result.junittest/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>tests</artifactId>
     <version>1.14.100-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.datatools</groupId>
+  <groupId>org.eclipse.datatools.tests</groupId>
   <artifactId>org.eclipse.datatools.sqltools.result.junittest</artifactId>
   <version>0.9.0.200605101</version>
   <packaging>eclipse-plugin</packaging>