Bug 578449 - Use same groupId in production pom than in consumer pom

PDE artifacts are published on Maven Central with org.eclipse.pde
groupId.
To facilitate further work which could allow deploying to p2 and Maven
as
part of the same build, let's use the target/expected buildId directly
so
we don't have to generate a new one later.
artifactId is already 1-1 mapping.
Only versions would then be different between Maven (-SNAPSHOT) and p2
metadata
(.yyyyMMddhhmm)

Change-Id: Iefbbac454d52f61a6805c46449ff75ffa2f63535
Reviewed-on: https://git.eclipse.org/r/c/pde/eclipse.pde.ui/+/190228
Tested-by: PDE Bot <pde-bot@eclipse.org>
Reviewed-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Reviewed-by: Mickael Istria <mistria@redhat.com>
diff --git a/apitools/org.eclipse.pde.api.tools.annotations/pom.xml b/apitools/org.eclipse.pde.api.tools.annotations/pom.xml
index aea83b2..89664ad 100644
--- a/apitools/org.eclipse.pde.api.tools.annotations/pom.xml
+++ b/apitools/org.eclipse.pde.api.tools.annotations/pom.xml
@@ -10,10 +10,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui.apitools</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.api.tools.annotations</artifactId>
   <version>1.1.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/apitools/org.eclipse.pde.api.tools.tests/pom.xml b/apitools/org.eclipse.pde.api.tools.tests/pom.xml
index 7237f1b..7d04219 100644
--- a/apitools/org.eclipse.pde.api.tools.tests/pom.xml
+++ b/apitools/org.eclipse.pde.api.tools.tests/pom.xml
@@ -13,11 +13,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>tests-pom</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../tests-pom/</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.api.tools.tests</artifactId>
   <version>1.2.500-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/apitools/org.eclipse.pde.api.tools/pom.xml b/apitools/org.eclipse.pde.api.tools/pom.xml
index 662b02a..872a444 100644
--- a/apitools/org.eclipse.pde.api.tools/pom.xml
+++ b/apitools/org.eclipse.pde.api.tools/pom.xml
@@ -13,10 +13,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui.apitools</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.api.tools</artifactId>
   <version>1.2.800-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/apitools/pom.xml b/apitools/pom.xml
index 5f75fbc..ea1bdc9 100644
--- a/apitools/pom.xml
+++ b/apitools/pom.xml
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
   </parent>
   <artifactId>eclipse.pde.ui.apitools</artifactId>
diff --git a/ds/org.eclipse.pde.ds.annotations.tests/pom.xml b/ds/org.eclipse.pde.ds.annotations.tests/pom.xml
index dd39b59..97c2859 100644
--- a/ds/org.eclipse.pde.ds.annotations.tests/pom.xml
+++ b/ds/org.eclipse.pde.ds.annotations.tests/pom.xml
@@ -13,11 +13,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>tests-pom</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../tests-pom/</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.ds.annotations.tests</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ds/org.eclipse.pde.ds.annotations/pom.xml b/ds/org.eclipse.pde.ds.annotations/pom.xml
index 7e095c6..d8e0ba5 100644
--- a/ds/org.eclipse.pde.ds.annotations/pom.xml
+++ b/ds/org.eclipse.pde.ds.annotations/pom.xml
@@ -15,11 +15,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.ds.annotations</artifactId>
   <version>1.2.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ds/org.eclipse.pde.ds.core/pom.xml b/ds/org.eclipse.pde.ds.core/pom.xml
index e30bd6f..b042a17 100644
--- a/ds/org.eclipse.pde.ds.core/pom.xml
+++ b/ds/org.eclipse.pde.ds.core/pom.xml
@@ -14,11 +14,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.ds.core</artifactId>
   <version>1.2.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ds/org.eclipse.pde.ds.lib/pom.xml b/ds/org.eclipse.pde.ds.lib/pom.xml
index b346ee8..9447ac0 100644
--- a/ds/org.eclipse.pde.ds.lib/pom.xml
+++ b/ds/org.eclipse.pde.ds.lib/pom.xml
@@ -15,11 +15,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.ds.lib</artifactId>
   <version>1.1.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ds/org.eclipse.pde.ds.tests/pom.xml b/ds/org.eclipse.pde.ds.tests/pom.xml
index 6c16cbb..a70db1d 100644
--- a/ds/org.eclipse.pde.ds.tests/pom.xml
+++ b/ds/org.eclipse.pde.ds.tests/pom.xml
@@ -14,11 +14,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>tests-pom</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../tests-pom/</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.ds.tests</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ds/org.eclipse.pde.ds.ui/pom.xml b/ds/org.eclipse.pde.ds.ui/pom.xml
index 6a00cfb..f86e7a9 100644
--- a/ds/org.eclipse.pde.ds.ui/pom.xml
+++ b/ds/org.eclipse.pde.ds.ui/pom.xml
@@ -14,11 +14,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.ds.ui</artifactId>
   <version>1.2.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ds/org.eclipse.pde.ds1_2.lib/pom.xml b/ds/org.eclipse.pde.ds1_2.lib/pom.xml
index 637757f..bfa2eea 100644
--- a/ds/org.eclipse.pde.ds1_2.lib/pom.xml
+++ b/ds/org.eclipse.pde.ds1_2.lib/pom.xml
@@ -16,11 +16,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.ds1_2.lib</artifactId>
   <version>1.0.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/features/org.eclipse.pde-feature/pom.xml b/features/org.eclipse.pde-feature/pom.xml
index e61ac6c..6e8e464 100644
--- a/features/org.eclipse.pde-feature/pom.xml
+++ b/features/org.eclipse.pde-feature/pom.xml
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
diff --git a/features/org.eclipse.pde.unittest.junit-feature/pom.xml b/features/org.eclipse.pde.unittest.junit-feature/pom.xml
index 070e516..29cb77c 100644
--- a/features/org.eclipse.pde.unittest.junit-feature/pom.xml
+++ b/features/org.eclipse.pde.unittest.junit-feature/pom.xml
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
diff --git a/pom.xml b/pom.xml
index 328f871..78e638b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <relativePath>../eclipse-platform-parent</relativePath>
   </parent>
 
-  <groupId>eclipse.pde.ui</groupId>
+  <groupId>org.eclipse.pde</groupId>
   <artifactId>eclipse.pde.ui</artifactId>
   <packaging>pom</packaging>
 
diff --git a/tests-pom/pom.xml b/tests-pom/pom.xml
index 58798f5..523763d 100644
--- a/tests-pom/pom.xml
+++ b/tests-pom/pom.xml
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
   </parent>
   <artifactId>tests-pom</artifactId>
diff --git a/ua/org.eclipse.pde.ua.core/pom.xml b/ua/org.eclipse.pde.ua.core/pom.xml
index 7de4be4..13ea3a8 100644
--- a/ua/org.eclipse.pde.ua.core/pom.xml
+++ b/ua/org.eclipse.pde.ua.core/pom.xml
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
diff --git a/ua/org.eclipse.pde.ua.tests/pom.xml b/ua/org.eclipse.pde.ua.tests/pom.xml
index feebc3c..4fc7a2a 100644
--- a/ua/org.eclipse.pde.ua.tests/pom.xml
+++ b/ua/org.eclipse.pde.ua.tests/pom.xml
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>tests-pom</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../tests-pom/</relativePath>
   </parent>
diff --git a/ua/org.eclipse.pde.ua.ui/pom.xml b/ua/org.eclipse.pde.ua.ui/pom.xml
index 8332706..1c1bd51 100644
--- a/ua/org.eclipse.pde.ua.ui/pom.xml
+++ b/ua/org.eclipse.pde.ua.ui/pom.xml
@@ -14,7 +14,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
diff --git a/ui/org.eclipse.pde.core/pom.xml b/ui/org.eclipse.pde.core/pom.xml
index 8d2039f..5f7f49f 100644
--- a/ui/org.eclipse.pde.core/pom.xml
+++ b/ui/org.eclipse.pde.core/pom.xml
@@ -14,11 +14,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.core</artifactId>
   <version>3.15.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.pde.genericeditor.extension.tests/pom.xml b/ui/org.eclipse.pde.genericeditor.extension.tests/pom.xml
index 18e0753..820ad28 100644
--- a/ui/org.eclipse.pde.genericeditor.extension.tests/pom.xml
+++ b/ui/org.eclipse.pde.genericeditor.extension.tests/pom.xml
@@ -13,11 +13,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>tests-pom</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../tests-pom/</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.genericeditor.extension.tests</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ui/org.eclipse.pde.genericeditor.extension/pom.xml b/ui/org.eclipse.pde.genericeditor.extension/pom.xml
index 800e0a9..dc41a8c 100644
--- a/ui/org.eclipse.pde.genericeditor.extension/pom.xml
+++ b/ui/org.eclipse.pde.genericeditor.extension/pom.xml
@@ -13,11 +13,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde.ui</groupId>
   <artifactId>org.eclipse.pde.genericeditor.extension</artifactId>
   <version>1.1.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.pde.junit.runtime.tests/pom.xml b/ui/org.eclipse.pde.junit.runtime.tests/pom.xml
index 122cde5..42235b1 100644
--- a/ui/org.eclipse.pde.junit.runtime.tests/pom.xml
+++ b/ui/org.eclipse.pde.junit.runtime.tests/pom.xml
@@ -19,11 +19,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>tests-pom</artifactId>
-		<groupId>eclipse.pde.ui</groupId>
+		<groupId>org.eclipse.pde</groupId>
 		<version>4.23.0-SNAPSHOT</version>
 		<relativePath>../../tests-pom/</relativePath>
 	</parent>
-	<groupId>org.eclipse.pde</groupId>
 	<artifactId>org.eclipse.pde.junit.runtime.tests</artifactId>
 	<version>3.6.600-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
diff --git a/ui/org.eclipse.pde.junit.runtime/pom.xml b/ui/org.eclipse.pde.junit.runtime/pom.xml
index b5642e6..efbe618 100644
--- a/ui/org.eclipse.pde.junit.runtime/pom.xml
+++ b/ui/org.eclipse.pde.junit.runtime/pom.xml
@@ -13,11 +13,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.junit.runtime</artifactId>
   <version>3.6.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.pde.launching/pom.xml b/ui/org.eclipse.pde.launching/pom.xml
index fdff78f..597866c 100644
--- a/ui/org.eclipse.pde.launching/pom.xml
+++ b/ui/org.eclipse.pde.launching/pom.xml
@@ -13,11 +13,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.launching</artifactId>
   <version>3.9.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.pde.runtime/pom.xml b/ui/org.eclipse.pde.runtime/pom.xml
index 4370644..2c1a796 100644
--- a/ui/org.eclipse.pde.runtime/pom.xml
+++ b/ui/org.eclipse.pde.runtime/pom.xml
@@ -14,11 +14,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.runtime</artifactId>
   <version>3.7.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.pde.spy.bundle/pom.xml b/ui/org.eclipse.pde.spy.bundle/pom.xml
index ed10982..c2b96b6 100644
--- a/ui/org.eclipse.pde.spy.bundle/pom.xml
+++ b/ui/org.eclipse.pde.spy.bundle/pom.xml
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
@@ -22,8 +22,6 @@
     <skipAPIAnalysis>true</skipAPIAnalysis>
   </properties>
 
-
-  <groupId>org.pde.ui</groupId>
   <artifactId>org.eclipse.pde.spy.bundle</artifactId>
   <version>0.12.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.pde.spy.context/pom.xml b/ui/org.eclipse.pde.spy.context/pom.xml
index f6a5ee3..92f6b9a 100644
--- a/ui/org.eclipse.pde.spy.context/pom.xml
+++ b/ui/org.eclipse.pde.spy.context/pom.xml
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
@@ -22,8 +22,6 @@
     <skipAPIAnalysis>true</skipAPIAnalysis>
   </properties>
 
-
-  <groupId>eclipse.pde.ui</groupId>
   <artifactId>org.eclipse.pde.spy.context</artifactId>
   <version>1.0.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.pde.spy.core/pom.xml b/ui/org.eclipse.pde.spy.core/pom.xml
index 0db1a99..1ec4fe7 100644
--- a/ui/org.eclipse.pde.spy.core/pom.xml
+++ b/ui/org.eclipse.pde.spy.core/pom.xml
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
@@ -22,8 +22,6 @@
     <skipAPIAnalysis>true</skipAPIAnalysis>
   </properties>
 
-
-  <groupId>org.pde.ui</groupId>
   <artifactId>org.eclipse.pde.spy.core</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.pde.spy.css/pom.xml b/ui/org.eclipse.pde.spy.css/pom.xml
index b14c78b..b809c0e 100644
--- a/ui/org.eclipse.pde.spy.css/pom.xml
+++ b/ui/org.eclipse.pde.spy.css/pom.xml
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
@@ -22,8 +22,6 @@
     <skipAPIAnalysis>true</skipAPIAnalysis>
   </properties>
 
-
-  <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.pde.spy.css</artifactId>
   <version>0.12.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.pde.spy.model/pom.xml b/ui/org.eclipse.pde.spy.model/pom.xml
index 0fdde06..5dd2f2e 100644
--- a/ui/org.eclipse.pde.spy.model/pom.xml
+++ b/ui/org.eclipse.pde.spy.model/pom.xml
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
@@ -22,8 +22,6 @@
     <skipAPIAnalysis>true</skipAPIAnalysis>
   </properties>
 
-
-  <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.pde.spy.model</artifactId>
   <version>0.12.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.pde.spy.preferences/pom.xml b/ui/org.eclipse.pde.spy.preferences/pom.xml
index ee5fe31..59ea58c 100644
--- a/ui/org.eclipse.pde.spy.preferences/pom.xml
+++ b/ui/org.eclipse.pde.spy.preferences/pom.xml
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
@@ -22,8 +22,6 @@
     <skipAPIAnalysis>true</skipAPIAnalysis>
   </properties>
 
-
-  <groupId>org.eclipse.e4</groupId>
   <artifactId>org.eclipse.pde.spy.preferences</artifactId>
   <version>0.12.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.pde.ui.templates.tests/pom.xml b/ui/org.eclipse.pde.ui.templates.tests/pom.xml
index 75316f9..7209c50 100644
--- a/ui/org.eclipse.pde.ui.templates.tests/pom.xml
+++ b/ui/org.eclipse.pde.ui.templates.tests/pom.xml
@@ -13,11 +13,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>tests-pom</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../tests-pom/</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.ui.templates.tests</artifactId>
   <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ui/org.eclipse.pde.ui.templates/pom.xml b/ui/org.eclipse.pde.ui.templates/pom.xml
index 5acb11a..2c5d8c4 100644
--- a/ui/org.eclipse.pde.ui.templates/pom.xml
+++ b/ui/org.eclipse.pde.ui.templates/pom.xml
@@ -13,11 +13,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.ui.templates</artifactId>
   <version>3.7.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/pom.xml b/ui/org.eclipse.pde.ui.tests.smartimport/pom.xml
index b3dc083..831c098 100644
--- a/ui/org.eclipse.pde.ui.tests.smartimport/pom.xml
+++ b/ui/org.eclipse.pde.ui.tests.smartimport/pom.xml
@@ -10,16 +10,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>tests-pom</artifactId>
-		<groupId>eclipse.pde.ui</groupId>
+		<groupId>org.eclipse.pde</groupId>
 		<version>4.23.0-SNAPSHOT</version>
 		<relativePath>../../tests-pom/</relativePath>
 	</parent>
-	<groupId>org.eclipse.pde</groupId>
 	<artifactId>org.eclipse.pde.ui.tests.smartimport</artifactId>
 	<version>1.1.100-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
-
 	<properties>
 		<systemProperties>-Dignored.errors.regexp=${ignored.errors.regexp}</systemProperties>
 		<tycho.test.jvmArgs>-Xmx512m</tycho.test.jvmArgs>
diff --git a/ui/org.eclipse.pde.ui.tests/pom.xml b/ui/org.eclipse.pde.ui.tests/pom.xml
index 7cece1d..5b48d9a 100644
--- a/ui/org.eclipse.pde.ui.tests/pom.xml
+++ b/ui/org.eclipse.pde.ui.tests/pom.xml
@@ -13,11 +13,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>tests-pom</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../tests-pom/</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.ui.tests</artifactId>
   <version>3.11.700-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/ui/org.eclipse.pde.ui/pom.xml b/ui/org.eclipse.pde.ui/pom.xml
index 977a28d..151d4a4 100644
--- a/ui/org.eclipse.pde.ui/pom.xml
+++ b/ui/org.eclipse.pde.ui/pom.xml
@@ -13,11 +13,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.ui</artifactId>
   <version>3.13.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.pde.unittest.junit/pom.xml b/ui/org.eclipse.pde.unittest.junit/pom.xml
index 959784e..a77f6b1 100644
--- a/ui/org.eclipse.pde.unittest.junit/pom.xml
+++ b/ui/org.eclipse.pde.unittest.junit/pom.xml
@@ -13,11 +13,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.unittest.junit</artifactId>
   <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.pde/pom.xml b/ui/org.eclipse.pde/pom.xml
index 00570ad..a9a8b0e 100644
--- a/ui/org.eclipse.pde/pom.xml
+++ b/ui/org.eclipse.pde/pom.xml
@@ -13,11 +13,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde</artifactId>
   <version>3.13.1800-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.tools.layout.spy/pom.xml b/ui/org.eclipse.tools.layout.spy/pom.xml
index b8a33e9..b4453f6 100644
--- a/ui/org.eclipse.tools.layout.spy/pom.xml
+++ b/ui/org.eclipse.tools.layout.spy/pom.xml
@@ -13,11 +13,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.tools.layout.spy</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
diff --git a/ui/org.eclipse.ui.trace/pom.xml b/ui/org.eclipse.ui.trace/pom.xml
index ab47958..a87d168 100644
--- a/ui/org.eclipse.ui.trace/pom.xml
+++ b/ui/org.eclipse.ui.trace/pom.xml
@@ -13,11 +13,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.pde.ui</artifactId>
-    <groupId>eclipse.pde.ui</groupId>
+    <groupId>org.eclipse.pde</groupId>
     <version>4.23.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
-  <groupId>org.eclipse.ui</groupId>
   <artifactId>org.eclipse.ui.trace</artifactId>
   <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>