From 4897ebdde9ddb27824bac536e8dd378aaf7656bb Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 28 Apr 2020 09:20:20 +0200
Subject: [PATCH] Remove superfluous groupId declarations

When we are inherinting from a controller parent, there is no point
in specifying the groupId again, remove such declarations.

Change-Id: I95acd155bf8c63cb29f727b8e0af8d77ad2efca6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 benchmark/api/pom.xml                                       | 1 -
 benchmark/dsbenchmark/pom.xml                               | 1 -
 benchmark/ntfbenchmark/pom.xml                              | 1 -
 benchmark/rpcbenchmark/pom.xml                              | 1 -
 features/odl-clustering-test-app/pom.xml                    | 1 -
 features/odl-controller-blueprint/pom.xml                   | 1 -
 features/odl-controller-exp-messagebus/pom.xml              | 1 -
 features/odl-controller-exp-netty-config/pom.xml            | 1 -
 features/odl-controller-mdsal-common/pom.xml                | 1 -
 features/odl-controller-model-topology/pom.xml              | 1 -
 features/odl-jolokia/pom.xml                                | 1 -
 features/odl-mdsal-benchmark/pom.xml                        | 1 -
 features/odl-mdsal-broker-local/pom.xml                     | 1 -
 features/odl-mdsal-broker/pom.xml                           | 1 -
 features/odl-mdsal-clustering-commons/pom.xml               | 1 -
 features/odl-mdsal-distributed-datastore/pom.xml            | 1 -
 features/odl-mdsal-model-inventory/pom.xml                  | 1 -
 features/odl-mdsal-remoterpc-connector/pom.xml              | 1 -
 features/odl-toaster/pom.xml                                | 1 -
 opendaylight/md-sal/cds-access-api/pom.xml                  | 1 -
 opendaylight/md-sal/cds-access-client/pom.xml               | 1 -
 opendaylight/md-sal/cds-dom-api/pom.xml                     | 1 -
 opendaylight/md-sal/messagebus-api/pom.xml                  | 1 -
 opendaylight/md-sal/messagebus-impl/pom.xml                 | 1 -
 opendaylight/md-sal/messagebus-spi/pom.xml                  | 1 -
 opendaylight/md-sal/messagebus-util/pom.xml                 | 1 -
 opendaylight/md-sal/sal-akka-raft-example/pom.xml           | 1 -
 opendaylight/md-sal/sal-akka-raft/pom.xml                   | 1 -
 opendaylight/md-sal/sal-cluster-admin-api/pom.xml           | 1 -
 opendaylight/md-sal/sal-cluster-admin-impl/pom.xml          | 1 -
 opendaylight/md-sal/sal-common-util/pom.xml                 | 1 -
 opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml | 1 -
 opendaylight/md-sal/sal-remoterpc-connector/pom.xml         | 1 -
 opendaylight/md-sal/sal-test-model/pom.xml                  | 1 -
 34 files changed, 34 deletions(-)

diff --git a/benchmark/api/pom.xml b/benchmark/api/pom.xml
index 39b9cb2896..adf1249fa5 100644
--- a/benchmark/api/pom.xml
+++ b/benchmark/api/pom.xml
@@ -15,7 +15,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <relativePath>../../opendaylight/md-sal/parent</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>benchmark-api</artifactId>
   <packaging>bundle</packaging>
 
diff --git a/benchmark/dsbenchmark/pom.xml b/benchmark/dsbenchmark/pom.xml
index d76e366b96..fa7ed3c844 100644
--- a/benchmark/dsbenchmark/pom.xml
+++ b/benchmark/dsbenchmark/pom.xml
@@ -16,7 +16,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <relativePath>../../opendaylight/md-sal/parent</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>dsbenchmark</artifactId>
   <packaging>bundle</packaging>
 
diff --git a/benchmark/ntfbenchmark/pom.xml b/benchmark/ntfbenchmark/pom.xml
index 32c51d2d61..a1da878ca1 100644
--- a/benchmark/ntfbenchmark/pom.xml
+++ b/benchmark/ntfbenchmark/pom.xml
@@ -16,7 +16,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <relativePath>../../opendaylight/md-sal/parent</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>ntfbenchmark</artifactId>
   <packaging>bundle</packaging>
 
diff --git a/benchmark/rpcbenchmark/pom.xml b/benchmark/rpcbenchmark/pom.xml
index 69f051c159..bca10bfce2 100644
--- a/benchmark/rpcbenchmark/pom.xml
+++ b/benchmark/rpcbenchmark/pom.xml
@@ -16,7 +16,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <relativePath>../../opendaylight/md-sal/parent</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>rpcbenchmark</artifactId>
   <packaging>bundle</packaging>
 
diff --git a/features/odl-clustering-test-app/pom.xml b/features/odl-clustering-test-app/pom.xml
index ec7884d78f..f25be893cc 100644
--- a/features/odl-clustering-test-app/pom.xml
+++ b/features/odl-clustering-test-app/pom.xml
@@ -15,7 +15,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-clustering-test-app</artifactId>
     <packaging>feature</packaging>
 
diff --git a/features/odl-controller-blueprint/pom.xml b/features/odl-controller-blueprint/pom.xml
index 3d2d824e1a..80ee467d20 100644
--- a/features/odl-controller-blueprint/pom.xml
+++ b/features/odl-controller-blueprint/pom.xml
@@ -16,7 +16,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-controller-blueprint</artifactId>
     <packaging>feature</packaging>
 
diff --git a/features/odl-controller-exp-messagebus/pom.xml b/features/odl-controller-exp-messagebus/pom.xml
index 1d3299ef6a..b5a89f3641 100644
--- a/features/odl-controller-exp-messagebus/pom.xml
+++ b/features/odl-controller-exp-messagebus/pom.xml
@@ -15,7 +15,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-controller-exp-messagebus</artifactId>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Controller :: Experimental :: Message Bus</name>
diff --git a/features/odl-controller-exp-netty-config/pom.xml b/features/odl-controller-exp-netty-config/pom.xml
index a8dc875fc0..9d8c494a10 100644
--- a/features/odl-controller-exp-netty-config/pom.xml
+++ b/features/odl-controller-exp-netty-config/pom.xml
@@ -15,7 +15,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-controller-exp-netty-config</artifactId>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Controller :: Experimental :: Netty Configuration</name>
diff --git a/features/odl-controller-mdsal-common/pom.xml b/features/odl-controller-mdsal-common/pom.xml
index 1ccb9814a2..4b01f8c5f5 100644
--- a/features/odl-controller-mdsal-common/pom.xml
+++ b/features/odl-controller-mdsal-common/pom.xml
@@ -15,7 +15,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-controller-mdsal-common</artifactId>
     <packaging>feature</packaging>
     <name>OpenDaylight :: MDSAL :: Common</name>
diff --git a/features/odl-controller-model-topology/pom.xml b/features/odl-controller-model-topology/pom.xml
index a8a0f2cb8a..0d717e276d 100644
--- a/features/odl-controller-model-topology/pom.xml
+++ b/features/odl-controller-model-topology/pom.xml
@@ -14,7 +14,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-controller-model-topology</artifactId>
     <packaging>feature</packaging>
     <name>OpenDaylight :: MD-SAL :: Topology Model</name>
diff --git a/features/odl-jolokia/pom.xml b/features/odl-jolokia/pom.xml
index 27cb66475d..7b91fccc12 100644
--- a/features/odl-jolokia/pom.xml
+++ b/features/odl-jolokia/pom.xml
@@ -15,7 +15,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-jolokia</artifactId>
     <packaging>feature</packaging>
     <name>Jolokia JMX/HTTP bridge</name>
diff --git a/features/odl-mdsal-benchmark/pom.xml b/features/odl-mdsal-benchmark/pom.xml
index 6244bfc7d0..4564932ba3 100644
--- a/features/odl-mdsal-benchmark/pom.xml
+++ b/features/odl-mdsal-benchmark/pom.xml
@@ -15,7 +15,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-benchmark</artifactId>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Controller :: Benchmarks</name>
diff --git a/features/odl-mdsal-broker-local/pom.xml b/features/odl-mdsal-broker-local/pom.xml
index c530323e0a..e860078832 100644
--- a/features/odl-mdsal-broker-local/pom.xml
+++ b/features/odl-mdsal-broker-local/pom.xml
@@ -15,7 +15,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-broker-local</artifactId>
     <packaging>feature</packaging>
 
diff --git a/features/odl-mdsal-broker/pom.xml b/features/odl-mdsal-broker/pom.xml
index 220266cb88..3ee83645c9 100644
--- a/features/odl-mdsal-broker/pom.xml
+++ b/features/odl-mdsal-broker/pom.xml
@@ -15,7 +15,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-broker</artifactId>
     <packaging>feature</packaging>
 
diff --git a/features/odl-mdsal-clustering-commons/pom.xml b/features/odl-mdsal-clustering-commons/pom.xml
index 06a7ee79ed..f0d507d834 100644
--- a/features/odl-mdsal-clustering-commons/pom.xml
+++ b/features/odl-mdsal-clustering-commons/pom.xml
@@ -15,7 +15,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-clustering-commons</artifactId>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Controller :: Clustering Commons</name>
diff --git a/features/odl-mdsal-distributed-datastore/pom.xml b/features/odl-mdsal-distributed-datastore/pom.xml
index ebb1e48417..374b220c0a 100644
--- a/features/odl-mdsal-distributed-datastore/pom.xml
+++ b/features/odl-mdsal-distributed-datastore/pom.xml
@@ -15,7 +15,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-distributed-datastore</artifactId>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Controller :: Clustered Datastore</name>
diff --git a/features/odl-mdsal-model-inventory/pom.xml b/features/odl-mdsal-model-inventory/pom.xml
index 8dd7b2f6aa..2e12766ad9 100644
--- a/features/odl-mdsal-model-inventory/pom.xml
+++ b/features/odl-mdsal-model-inventory/pom.xml
@@ -15,7 +15,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-model-inventory</artifactId>
     <packaging>feature</packaging>
     <name>OpenDaylight :: MD-SAL :: Inventory Model</name>
diff --git a/features/odl-mdsal-remoterpc-connector/pom.xml b/features/odl-mdsal-remoterpc-connector/pom.xml
index 51ba584d38..049dadbe72 100644
--- a/features/odl-mdsal-remoterpc-connector/pom.xml
+++ b/features/odl-mdsal-remoterpc-connector/pom.xml
@@ -15,7 +15,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-mdsal-remoterpc-connector</artifactId>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Controller :: Remote RPC Connector</name>
diff --git a/features/odl-toaster/pom.xml b/features/odl-toaster/pom.xml
index 7b15c6e5c9..881a57f286 100644
--- a/features/odl-toaster/pom.xml
+++ b/features/odl-toaster/pom.xml
@@ -15,7 +15,6 @@
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-toaster</artifactId>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Toaster</name>
diff --git a/opendaylight/md-sal/cds-access-api/pom.xml b/opendaylight/md-sal/cds-access-api/pom.xml
index 95def93256..1befe7a792 100644
--- a/opendaylight/md-sal/cds-access-api/pom.xml
+++ b/opendaylight/md-sal/cds-access-api/pom.xml
@@ -8,7 +8,6 @@
         <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>cds-access-api</artifactId>
     <packaging>bundle</packaging>
 
diff --git a/opendaylight/md-sal/cds-access-client/pom.xml b/opendaylight/md-sal/cds-access-client/pom.xml
index 896b444adb..a536353db1 100644
--- a/opendaylight/md-sal/cds-access-client/pom.xml
+++ b/opendaylight/md-sal/cds-access-client/pom.xml
@@ -8,7 +8,6 @@
         <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>cds-access-client</artifactId>
     <packaging>bundle</packaging>
 
diff --git a/opendaylight/md-sal/cds-dom-api/pom.xml b/opendaylight/md-sal/cds-dom-api/pom.xml
index 8d5340dc31..8f6e0c0f7b 100644
--- a/opendaylight/md-sal/cds-dom-api/pom.xml
+++ b/opendaylight/md-sal/cds-dom-api/pom.xml
@@ -8,7 +8,6 @@
         <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>cds-dom-api</artifactId>
     <packaging>bundle</packaging>
 
diff --git a/opendaylight/md-sal/messagebus-api/pom.xml b/opendaylight/md-sal/messagebus-api/pom.xml
index 4549ecc979..d9351b8293 100644
--- a/opendaylight/md-sal/messagebus-api/pom.xml
+++ b/opendaylight/md-sal/messagebus-api/pom.xml
@@ -17,7 +17,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>messagebus-api</artifactId>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
diff --git a/opendaylight/md-sal/messagebus-impl/pom.xml b/opendaylight/md-sal/messagebus-impl/pom.xml
index aa4f016e29..7c0573579b 100644
--- a/opendaylight/md-sal/messagebus-impl/pom.xml
+++ b/opendaylight/md-sal/messagebus-impl/pom.xml
@@ -17,7 +17,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>messagebus-impl</artifactId>
     <name>${project.artifactId}</name>
     <packaging>bundle</packaging>
diff --git a/opendaylight/md-sal/messagebus-spi/pom.xml b/opendaylight/md-sal/messagebus-spi/pom.xml
index 808b1491d5..4db75faaa9 100644
--- a/opendaylight/md-sal/messagebus-spi/pom.xml
+++ b/opendaylight/md-sal/messagebus-spi/pom.xml
@@ -15,7 +15,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <relativePath>../parent</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>messagebus-spi</artifactId>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
diff --git a/opendaylight/md-sal/messagebus-util/pom.xml b/opendaylight/md-sal/messagebus-util/pom.xml
index 60c430e257..dd4643caea 100644
--- a/opendaylight/md-sal/messagebus-util/pom.xml
+++ b/opendaylight/md-sal/messagebus-util/pom.xml
@@ -18,7 +18,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>messagebus-util</artifactId>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
diff --git a/opendaylight/md-sal/sal-akka-raft-example/pom.xml b/opendaylight/md-sal/sal-akka-raft-example/pom.xml
index df712f505e..8e1c56d031 100644
--- a/opendaylight/md-sal/sal-akka-raft-example/pom.xml
+++ b/opendaylight/md-sal/sal-akka-raft-example/pom.xml
@@ -15,7 +15,6 @@
     <relativePath>../parent</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>sal-akka-raft-example</artifactId>
   <packaging>bundle</packaging>
 
diff --git a/opendaylight/md-sal/sal-akka-raft/pom.xml b/opendaylight/md-sal/sal-akka-raft/pom.xml
index 1639fbfe13..3b21040b0d 100644
--- a/opendaylight/md-sal/sal-akka-raft/pom.xml
+++ b/opendaylight/md-sal/sal-akka-raft/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../parent</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>sal-akka-raft</artifactId>
   <packaging>bundle</packaging>
 
diff --git a/opendaylight/md-sal/sal-cluster-admin-api/pom.xml b/opendaylight/md-sal/sal-cluster-admin-api/pom.xml
index 1f833fbdb2..fa503d5746 100644
--- a/opendaylight/md-sal/sal-cluster-admin-api/pom.xml
+++ b/opendaylight/md-sal/sal-cluster-admin-api/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../parent</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>sal-cluster-admin-api</artifactId>
   <packaging>bundle</packaging>
 
diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
index 15c54bd159..26ee6274dc 100644
--- a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
+++ b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../parent</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>sal-cluster-admin-impl</artifactId>
   <packaging>bundle</packaging>
 
diff --git a/opendaylight/md-sal/sal-common-util/pom.xml b/opendaylight/md-sal/sal-common-util/pom.xml
index c0c0c7f7c6..91449f8cf4 100644
--- a/opendaylight/md-sal/sal-common-util/pom.xml
+++ b/opendaylight/md-sal/sal-common-util/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../parent</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>sal-common-util</artifactId>
   <packaging>bundle</packaging>
 
diff --git a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
index 229ab3ef44..74243eb13b 100644
--- a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
@@ -8,7 +8,6 @@
     <relativePath>../parent</relativePath>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
   <artifactId>sal-dummy-distributed-datastore</artifactId>
   <packaging>bundle</packaging>
 
diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
index b9b90ffa3f..9242d4bdd9 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
@@ -8,7 +8,6 @@
         <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-remoterpc-connector</artifactId>
     <packaging>bundle</packaging>
 
diff --git a/opendaylight/md-sal/sal-test-model/pom.xml b/opendaylight/md-sal/sal-test-model/pom.xml
index d335cc2b6f..44051d2b05 100644
--- a/opendaylight/md-sal/sal-test-model/pom.xml
+++ b/opendaylight/md-sal/sal-test-model/pom.xml
@@ -10,7 +10,6 @@
         <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-test-model</artifactId>
     <packaging>bundle</packaging>
 
-- 
2.36.6