Bug 397850 - [CBI] use the correct group IDs for all artifacts
diff --git a/bundles/org.eclipse.equinox.app/pom.xml b/bundles/org.eclipse.equinox.app/pom.xml
index 18ca051..01f30f5 100644
--- a/bundles/org.eclipse.equinox.app/pom.xml
+++ b/bundles/org.eclipse.equinox.app/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.app</artifactId>
   <version>1.3.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.bidi.tests/pom.xml b/bundles/org.eclipse.equinox.bidi.tests/pom.xml
index bed9379..af486dd 100644
--- a/bundles/org.eclipse.equinox.bidi.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.bidi.tests/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.bidi.tests</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.bidi/pom.xml b/bundles/org.eclipse.equinox.bidi/pom.xml
index f2dc4f4..ae7869f 100644
--- a/bundles/org.eclipse.equinox.bidi/pom.xml
+++ b/bundles/org.eclipse.equinox.bidi/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.bidi</artifactId>
   <version>0.10.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.cm.test/pom.xml b/bundles/org.eclipse.equinox.cm.test/pom.xml
index 7f2e580..01bfb83 100644
--- a/bundles/org.eclipse.equinox.cm.test/pom.xml
+++ b/bundles/org.eclipse.equinox.cm.test/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.cm.test</artifactId>
   <version>1.0.0</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.cm/pom.xml b/bundles/org.eclipse.equinox.cm/pom.xml
index 25128ff..2dfcf51 100644
--- a/bundles/org.eclipse.equinox.cm/pom.xml
+++ b/bundles/org.eclipse.equinox.cm/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.cm</artifactId>
   <version>1.0.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.common/pom.xml b/bundles/org.eclipse.equinox.common/pom.xml
index 5273cff..b20484b 100644
--- a/bundles/org.eclipse.equinox.common/pom.xml
+++ b/bundles/org.eclipse.equinox.common/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.common</artifactId>
   <version>3.6.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.compendium.tests/pom.xml b/bundles/org.eclipse.equinox.compendium.tests/pom.xml
index b620462..3dac6d5 100644
--- a/bundles/org.eclipse.equinox.compendium.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.compendium.tests/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.compendium.tests</artifactId>
   <version>1.1.100</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.concurrent/pom.xml b/bundles/org.eclipse.equinox.concurrent/pom.xml
index ff2ce7f..e52ff7a 100644
--- a/bundles/org.eclipse.equinox.concurrent/pom.xml
+++ b/bundles/org.eclipse.equinox.concurrent/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.concurrent</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.console.jaas.fragment/pom.xml b/bundles/org.eclipse.equinox.console.jaas.fragment/pom.xml
index 7de034f..10c8c47 100644
--- a/bundles/org.eclipse.equinox.console.jaas.fragment/pom.xml
+++ b/bundles/org.eclipse.equinox.console.jaas.fragment/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.console.jaas.fragment</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.console.ssh.tests/pom.xml b/bundles/org.eclipse.equinox.console.ssh.tests/pom.xml
index 0111e7c..eeb38b3 100644
--- a/bundles/org.eclipse.equinox.console.ssh.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.console.ssh.tests/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.console.ssh.tests</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.console.ssh/pom.xml b/bundles/org.eclipse.equinox.console.ssh/pom.xml
index 67afed1..055c7aa 100644
--- a/bundles/org.eclipse.equinox.console.ssh/pom.xml
+++ b/bundles/org.eclipse.equinox.console.ssh/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.console.ssh</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.console.tests/pom.xml b/bundles/org.eclipse.equinox.console.tests/pom.xml
index cc77129..042b00d 100644
--- a/bundles/org.eclipse.equinox.console.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.console.tests/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.console.tests</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.console/pom.xml b/bundles/org.eclipse.equinox.console/pom.xml
index c80e983..235efdb 100644
--- a/bundles/org.eclipse.equinox.console/pom.xml
+++ b/bundles/org.eclipse.equinox.console/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.console</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.coordinator/pom.xml b/bundles/org.eclipse.equinox.coordinator/pom.xml
index 4ae46f6..9927f42 100644
--- a/bundles/org.eclipse.equinox.coordinator/pom.xml
+++ b/bundles/org.eclipse.equinox.coordinator/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.coordinator</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.device/pom.xml b/bundles/org.eclipse.equinox.device/pom.xml
index 9598722..94bf418 100644
--- a/bundles/org.eclipse.equinox.device/pom.xml
+++ b/bundles/org.eclipse.equinox.device/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.device</artifactId>
   <version>1.0.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.ds.tests/pom.xml b/bundles/org.eclipse.equinox.ds.tests/pom.xml
index ba1e6bd..5e3cd5e 100644
--- a/bundles/org.eclipse.equinox.ds.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.ds.tests/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.ds.tests</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.ds/pom.xml b/bundles/org.eclipse.equinox.ds/pom.xml
index e84972c..01ff38f 100644
--- a/bundles/org.eclipse.equinox.ds/pom.xml
+++ b/bundles/org.eclipse.equinox.ds/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.ds</artifactId>
   <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.event/pom.xml b/bundles/org.eclipse.equinox.event/pom.xml
index a379bdc..0a5907c 100644
--- a/bundles/org.eclipse.equinox.event/pom.xml
+++ b/bundles/org.eclipse.equinox.event/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.event</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.http.jetty5/pom.xml b/bundles/org.eclipse.equinox.http.jetty5/pom.xml
index 63a5b72..f4d1235 100644
--- a/bundles/org.eclipse.equinox.http.jetty5/pom.xml
+++ b/bundles/org.eclipse.equinox.http.jetty5/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.http.jetty</artifactId>
   <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.http.jetty6/pom.xml b/bundles/org.eclipse.equinox.http.jetty6/pom.xml
index 38324c4..e4935dd 100644
--- a/bundles/org.eclipse.equinox.http.jetty6/pom.xml
+++ b/bundles/org.eclipse.equinox.http.jetty6/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.http.jetty</artifactId>
   <version>2.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.http.jetty8/pom.xml b/bundles/org.eclipse.equinox.http.jetty8/pom.xml
index b6bd02e..d1dcd42 100644
--- a/bundles/org.eclipse.equinox.http.jetty8/pom.xml
+++ b/bundles/org.eclipse.equinox.http.jetty8/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.http.jetty</artifactId>
   <version>3.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.http.registry/pom.xml b/bundles/org.eclipse.equinox.http.registry/pom.xml
index cf4b2c0..9f7a1df 100644
--- a/bundles/org.eclipse.equinox.http.registry/pom.xml
+++ b/bundles/org.eclipse.equinox.http.registry/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.http.registry</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.http.servlet/pom.xml b/bundles/org.eclipse.equinox.http.servlet/pom.xml
index 423f4b3..e826b1d 100644
--- a/bundles/org.eclipse.equinox.http.servlet/pom.xml
+++ b/bundles/org.eclipse.equinox.http.servlet/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.http.servlet</artifactId>
   <version>1.1.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.http.servletbridge/pom.xml b/bundles/org.eclipse.equinox.http.servletbridge/pom.xml
index 08a5501..c77ddac 100644
--- a/bundles/org.eclipse.equinox.http.servletbridge/pom.xml
+++ b/bundles/org.eclipse.equinox.http.servletbridge/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.http.servletbridge</artifactId>
   <version>1.0.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.http/pom.xml b/bundles/org.eclipse.equinox.http/pom.xml
index e80632d..ea4d49c 100644
--- a/bundles/org.eclipse.equinox.http/pom.xml
+++ b/bundles/org.eclipse.equinox.http/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.http</artifactId>
   <version>1.0.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.io/pom.xml b/bundles/org.eclipse.equinox.io/pom.xml
index 01e985a..559d8a1 100644
--- a/bundles/org.eclipse.equinox.io/pom.xml
+++ b/bundles/org.eclipse.equinox.io/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.io</artifactId>
   <version>1.0.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.ip/pom.xml b/bundles/org.eclipse.equinox.ip/pom.xml
index c25b9c2..403cf0a 100644
--- a/bundles/org.eclipse.equinox.ip/pom.xml
+++ b/bundles/org.eclipse.equinox.ip/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.ip</artifactId>
   <version>1.1.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml b/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml
index d4aa908..0b50247 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml
+++ b/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.jsp.jasper.registry</artifactId>
   <version>1.0.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.jsp.jasper/pom.xml b/bundles/org.eclipse.equinox.jsp.jasper/pom.xml
index 7c5e608..2e1f999 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper/pom.xml
+++ b/bundles/org.eclipse.equinox.jsp.jasper/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.jsp.jasper</artifactId>
   <version>1.0.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.log.test/pom.xml b/bundles/org.eclipse.equinox.log.test/pom.xml
index 2e51a12..f1152d7 100644
--- a/bundles/org.eclipse.equinox.log.test/pom.xml
+++ b/bundles/org.eclipse.equinox.log.test/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.log.test</artifactId>
   <version>1.0.0</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.log/pom.xml b/bundles/org.eclipse.equinox.log/pom.xml
index 1127dee..28e7c03 100644
--- a/bundles/org.eclipse.equinox.log/pom.xml
+++ b/bundles/org.eclipse.equinox.log/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.log</artifactId>
   <version>1.2.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.metatype/pom.xml b/bundles/org.eclipse.equinox.metatype/pom.xml
index c7d09e6..468ad00 100644
--- a/bundles/org.eclipse.equinox.metatype/pom.xml
+++ b/bundles/org.eclipse.equinox.metatype/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.metatype</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.preferences/pom.xml b/bundles/org.eclipse.equinox.preferences/pom.xml
index e5c2c80..07fa5ff 100644
--- a/bundles/org.eclipse.equinox.preferences/pom.xml
+++ b/bundles/org.eclipse.equinox.preferences/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.preferences</artifactId>
   <version>3.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.region.tests/pom.xml b/bundles/org.eclipse.equinox.region.tests/pom.xml
index 92fc6dc..77b7510 100644
--- a/bundles/org.eclipse.equinox.region.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.region.tests/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.region.tests</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.region/pom.xml b/bundles/org.eclipse.equinox.region/pom.xml
index 15ad148..328edcd 100644
--- a/bundles/org.eclipse.equinox.region/pom.xml
+++ b/bundles/org.eclipse.equinox.region/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.region</artifactId>
   <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.registry/pom.xml b/bundles/org.eclipse.equinox.registry/pom.xml
index 1942baa..9fd7d61 100644
--- a/bundles/org.eclipse.equinox.registry/pom.xml
+++ b/bundles/org.eclipse.equinox.registry/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.registry</artifactId>
   <version>3.5.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.security.macosx/pom.xml b/bundles/org.eclipse.equinox.security.macosx/pom.xml
index 3d40137..f41755e 100644
--- a/bundles/org.eclipse.equinox.security.macosx/pom.xml
+++ b/bundles/org.eclipse.equinox.security.macosx/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.security.macosx</artifactId>
   <version>1.100.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.security.tests/pom.xml b/bundles/org.eclipse.equinox.security.tests/pom.xml
index 07023e8..0f19ecd 100644
--- a/bundles/org.eclipse.equinox.security.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.security.tests/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.security.tests</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.security.ui/pom.xml b/bundles/org.eclipse.equinox.security.ui/pom.xml
index 4d4a2cd..318e0b0 100644
--- a/bundles/org.eclipse.equinox.security.ui/pom.xml
+++ b/bundles/org.eclipse.equinox.security.ui/pom.xml
@@ -22,7 +22,7 @@
     <relativePath>../../</relativePath>
   </parent>
 
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.security.ui</artifactId>
   <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.security.win32.x86/pom.xml b/bundles/org.eclipse.equinox.security.win32.x86/pom.xml
index 65e7698..0120697 100644
--- a/bundles/org.eclipse.equinox.security.win32.x86/pom.xml
+++ b/bundles/org.eclipse.equinox.security.win32.x86/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.security.win32.x86</artifactId>
   <version>1.0.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.security.win32.x86_64/pom.xml b/bundles/org.eclipse.equinox.security.win32.x86_64/pom.xml
index 15d49be..42de8a9 100644
--- a/bundles/org.eclipse.equinox.security.win32.x86_64/pom.xml
+++ b/bundles/org.eclipse.equinox.security.win32.x86_64/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.security.win32.x86_64</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.security/pom.xml b/bundles/org.eclipse.equinox.security/pom.xml
index bb08228..9762fe7 100644
--- a/bundles/org.eclipse.equinox.security/pom.xml
+++ b/bundles/org.eclipse.equinox.security/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.security</artifactId>
   <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.servletbridge.extensionbundle/pom.xml b/bundles/org.eclipse.equinox.servletbridge.extensionbundle/pom.xml
index afa3822..74c2611 100644
--- a/bundles/org.eclipse.equinox.servletbridge.extensionbundle/pom.xml
+++ b/bundles/org.eclipse.equinox.servletbridge.extensionbundle/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.servletbridge.extensionbundle</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.servletbridge.template/pom.xml b/bundles/org.eclipse.equinox.servletbridge.template/pom.xml
index 824c665..8b12a94 100644
--- a/bundles/org.eclipse.equinox.servletbridge.template/pom.xml
+++ b/bundles/org.eclipse.equinox.servletbridge.template/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.servletbridge.template</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.servletbridge/pom.xml b/bundles/org.eclipse.equinox.servletbridge/pom.xml
index 377b5ff..fd2237e 100644
--- a/bundles/org.eclipse.equinox.servletbridge/pom.xml
+++ b/bundles/org.eclipse.equinox.servletbridge/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.servletbridge</artifactId>
   <version>1.2.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.slf4j.stub/pom.xml b/bundles/org.eclipse.equinox.slf4j.stub/pom.xml
index 3f9116f..8a62b22 100644
--- a/bundles/org.eclipse.equinox.slf4j.stub/pom.xml
+++ b/bundles/org.eclipse.equinox.slf4j.stub/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.slf4j.stub</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.transforms.hook/pom.xml b/bundles/org.eclipse.equinox.transforms.hook/pom.xml
index 5c0b93c..f1e5028 100644
--- a/bundles/org.eclipse.equinox.transforms.hook/pom.xml
+++ b/bundles/org.eclipse.equinox.transforms.hook/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.transforms.hook</artifactId>
   <version>1.0.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.transforms.xslt/pom.xml b/bundles/org.eclipse.equinox.transforms.xslt/pom.xml
index b30220d..1139ab5 100644
--- a/bundles/org.eclipse.equinox.transforms.xslt/pom.xml
+++ b/bundles/org.eclipse.equinox.transforms.xslt/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.transforms.xslt</artifactId>
   <version>1.0.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.useradmin/pom.xml b/bundles/org.eclipse.equinox.useradmin/pom.xml
index c29a019..4744677 100644
--- a/bundles/org.eclipse.equinox.useradmin/pom.xml
+++ b/bundles/org.eclipse.equinox.useradmin/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.useradmin</artifactId>
   <version>1.1.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.util/pom.xml b/bundles/org.eclipse.equinox.util/pom.xml
index 18be69c..c6de158 100644
--- a/bundles/org.eclipse.equinox.util/pom.xml
+++ b/bundles/org.eclipse.equinox.util/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.util</artifactId>
   <version>1.0.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.weaving.aspectj/pom.xml b/bundles/org.eclipse.equinox.weaving.aspectj/pom.xml
index 01685fb..102ac14 100644
--- a/bundles/org.eclipse.equinox.weaving.aspectj/pom.xml
+++ b/bundles/org.eclipse.equinox.weaving.aspectj/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.weaving.aspectj</artifactId>
   <version>1.0.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.weaving.caching.j9/pom.xml b/bundles/org.eclipse.equinox.weaving.caching.j9/pom.xml
index 1554aa9..6590dab 100644
--- a/bundles/org.eclipse.equinox.weaving.caching.j9/pom.xml
+++ b/bundles/org.eclipse.equinox.weaving.caching.j9/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.weaving.caching.j9</artifactId>
   <version>1.0.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.weaving.caching/pom.xml b/bundles/org.eclipse.equinox.weaving.caching/pom.xml
index a83342c..0c240b7 100644
--- a/bundles/org.eclipse.equinox.weaving.caching/pom.xml
+++ b/bundles/org.eclipse.equinox.weaving.caching/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.weaving.caching</artifactId>
   <version>1.0.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.weaving.hook/pom.xml b/bundles/org.eclipse.equinox.weaving.hook/pom.xml
index 2d10875..9b7a0b3 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/pom.xml
+++ b/bundles/org.eclipse.equinox.weaving.hook/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.weaving.hook</artifactId>
   <version>1.0.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/bundles/org.eclipse.equinox.wireadmin/pom.xml b/bundles/org.eclipse.equinox.wireadmin/pom.xml
index acf21f2..83afd5c 100644
--- a/bundles/org.eclipse.equinox.wireadmin/pom.xml
+++ b/bundles/org.eclipse.equinox.wireadmin/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox</groupId>
   <artifactId>org.eclipse.equinox.wireadmin</artifactId>
   <version>1.0.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/features/org.eclipse.equinox.compendium.sdk/pom.xml b/features/org.eclipse.equinox.compendium.sdk/pom.xml
index 6786fb5..9834077 100644
--- a/features/org.eclipse.equinox.compendium.sdk/pom.xml
+++ b/features/org.eclipse.equinox.compendium.sdk/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.compendium.sdk</artifactId>
   <version>3.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.equinox.core.feature/pom.xml b/features/org.eclipse.equinox.core.feature/pom.xml
index 7ab076d..cf9f679 100644
--- a/features/org.eclipse.equinox.core.feature/pom.xml
+++ b/features/org.eclipse.equinox.core.feature/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.core.feature</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.equinox.sdk/pom.xml b/features/org.eclipse.equinox.sdk/pom.xml
index 47bf23f..855d297 100644
--- a/features/org.eclipse.equinox.sdk/pom.xml
+++ b/features/org.eclipse.equinox.sdk/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.sdk</artifactId>
   <version>3.9.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.equinox.server.core/pom.xml b/features/org.eclipse.equinox.server.core/pom.xml
index ffc12b2..25ef247 100644
--- a/features/org.eclipse.equinox.server.core/pom.xml
+++ b/features/org.eclipse.equinox.server.core/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.server.core</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.equinox.server.jetty/pom.xml b/features/org.eclipse.equinox.server.jetty/pom.xml
index ed98115..f7461ef 100644
--- a/features/org.eclipse.equinox.server.jetty/pom.xml
+++ b/features/org.eclipse.equinox.server.jetty/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.server.jetty</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.equinox.server.p2/pom.xml b/features/org.eclipse.equinox.server.p2/pom.xml
index d1d9eb3..48ad485 100644
--- a/features/org.eclipse.equinox.server.p2/pom.xml
+++ b/features/org.eclipse.equinox.server.p2/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.server.p2</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.equinox.server.servletbridge/pom.xml b/features/org.eclipse.equinox.server.servletbridge/pom.xml
index c36095f..c078c60 100644
--- a/features/org.eclipse.equinox.server.servletbridge/pom.xml
+++ b/features/org.eclipse.equinox.server.servletbridge/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.server.servletbridge</artifactId>
   <version>1.0.101-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.equinox.server.simple/pom.xml b/features/org.eclipse.equinox.server.simple/pom.xml
index b8a349d..6643f6a 100644
--- a/features/org.eclipse.equinox.server.simple/pom.xml
+++ b/features/org.eclipse.equinox.server.simple/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.server.simple</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.equinox.serverside.sdk/pom.xml b/features/org.eclipse.equinox.serverside.sdk/pom.xml
index 226e6c4..5f7cbdc 100644
--- a/features/org.eclipse.equinox.serverside.sdk/pom.xml
+++ b/features/org.eclipse.equinox.serverside.sdk/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.serverside.sdk</artifactId>
   <version>3.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.equinox.starterkit.product.feature/pom.xml b/features/org.eclipse.equinox.starterkit.product.feature/pom.xml
index cf5ffa0..82b0062 100644
--- a/features/org.eclipse.equinox.starterkit.product.feature/pom.xml
+++ b/features/org.eclipse.equinox.starterkit.product.feature/pom.xml
@@ -20,7 +20,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.starterkit.product.feature</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.equinox.weaving.sdk/pom.xml b/features/org.eclipse.equinox.weaving.sdk/pom.xml
index e210e0c..6636142 100644
--- a/features/org.eclipse.equinox.weaving.sdk/pom.xml
+++ b/features/org.eclipse.equinox.weaving.sdk/pom.xml
@@ -19,7 +19,7 @@
     <version>3.8.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.equinox.bundles</groupId>
+  <groupId>org.eclipse.equinox.feature</groupId>
   <artifactId>org.eclipse.equinox.weaving.sdk</artifactId>
   <version>1.0.200-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>