From bfdebc4f870121f188313e2b7175a29c885309f3 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 27 Apr 2020 11:34:31 +0200
Subject: [PATCH] Cleanup aggregator poms

We do not want expose our repository layout to outside world, hence
cleanup aggregators so they are just that and are not installed.

Change-Id: Ib9ec89e46ed4a966a0750778f6067096ebbb8a14
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 benchmark/pom.xml                             | 10 ++-
 .../netty-event-executor-config/pom.xml       | 11 ++-
 .../config/netty-threadgroup-config/pom.xml   | 13 ++--
 .../config/netty-timer-config/pom.xml         | 11 ++-
 opendaylight/config/pom.xml                   | 27 +++----
 .../config/threadpool-config-api/pom.xml      | 11 ++-
 .../config/threadpool-config-impl/pom.xml     | 23 +++++-
 opendaylight/md-sal/pom.xml                   | 14 ++--
 .../clustering-test-app/configuration/pom.xml | 78 ++++++++++---------
 .../samples/clustering-test-app/pom.xml       | 30 ++++---
 opendaylight/md-sal/samples/pom.xml           | 22 +++---
 opendaylight/model/pom.xml                    | 13 ++--
 pom.xml                                       | 11 +--
 13 files changed, 153 insertions(+), 121 deletions(-)

diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 7b92fd4c3d..860767b5ff 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -6,18 +6,24 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
     <version>7.0.1</version>
     <relativePath/>
   </parent>
+
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>benchmark-aggregator</artifactId>
   <version>1.10.0-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
   <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
+
+  <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <maven.install.skip>true</maven.install.skip>
+  </properties>
+
   <modules>
     <module>api</module>
     <module>dsbenchmark</module>
diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml
index f7ef225d88..0705912208 100644
--- a/opendaylight/config/netty-event-executor-config/pom.xml
+++ b/opendaylight/config/netty-event-executor-config/pom.xml
@@ -3,12 +3,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-subsystem</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>7.0.1</version>
+    <relativePath/>
   </parent>
+
+  <groupId>org.opendaylight.controller</groupId>
   <artifactId>netty-event-executor-config</artifactId>
+  <version>0.13.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
   <description>Configuration Wrapper around netty's event executor</description>
diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml
index 318b797caf..51c4bac3ae 100644
--- a/opendaylight/config/netty-threadgroup-config/pom.xml
+++ b/opendaylight/config/netty-threadgroup-config/pom.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
-
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-subsystem</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>7.0.1</version>
+    <relativePath/>
   </parent>
+
+  <groupId>org.opendaylight.controller</groupId>
   <artifactId>netty-threadgroup-config</artifactId>
+  <version>0.13.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
   <description>Configuration Wrapper around netty's event group</description>
diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml
index e94753a1b7..a8fd993313 100644
--- a/opendaylight/config/netty-timer-config/pom.xml
+++ b/opendaylight/config/netty-timer-config/pom.xml
@@ -3,12 +3,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-subsystem</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>7.0.1</version>
+    <relativePath/>
   </parent>
+
+  <groupId>org.opendaylight.controller</groupId>
   <artifactId>netty-timer-config</artifactId>
+  <version>0.13.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
   <description>Configuration Wrapper around netty's timer</description>
diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index c730ae6b82..28c8f3c98b 100644
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
   <parent>
-    <groupId>org.opendaylight.mdsal</groupId>
-    <artifactId>binding-parent</artifactId>
-    <version>6.0.0</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <version>7.0.1</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.controller</groupId>
-  <artifactId>config-subsystem</artifactId>
+  <artifactId>config-aggregator</artifactId>
   <version>0.13.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>${project.artifactId}</name>
+
+  <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <maven.install.skip>true</maven.install.skip>
+  </properties>
 
   <modules>
     <module>threadpool-config-api</module>
@@ -22,16 +25,4 @@
     <module>netty-event-executor-config</module>
     <module>netty-timer-config</module>
   </modules>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>controller-artifacts</artifactId>
-        <version>1.12.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
 </project>
diff --git a/opendaylight/config/threadpool-config-api/pom.xml b/opendaylight/config/threadpool-config-api/pom.xml
index ac204f8caf..0d6eb5ca0f 100644
--- a/opendaylight/config/threadpool-config-api/pom.xml
+++ b/opendaylight/config/threadpool-config-api/pom.xml
@@ -3,12 +3,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-subsystem</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>7.0.1</version>
+    <relativePath/>
   </parent>
+
+  <groupId>org.opendaylight.controller</groupId>
   <artifactId>threadpool-config-api</artifactId>
+  <version>0.13.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
 </project>
diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml
index c512f4071b..39f4e21604 100644
--- a/opendaylight/config/threadpool-config-impl/pom.xml
+++ b/opendaylight/config/threadpool-config-impl/pom.xml
@@ -3,15 +3,30 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-subsystem</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>7.0.1</version>
+    <relativePath/>
   </parent>
+
+  <groupId>org.opendaylight.controller</groupId>
   <artifactId>threadpool-config-impl</artifactId>
+  <version>0.13.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>controller-artifacts</artifactId>
+        <version>1.12.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index fedde47ff3..ac63c3ef45 100644
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -10,10 +10,15 @@
   </parent>
 
   <groupId>org.opendaylight.controller</groupId>
-  <artifactId>sal-parent</artifactId>
+  <artifactId>mdsal-aggregator</artifactId>
   <version>1.12.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <maven.install.skip>true</maven.install.skip>
+  </properties>
+
   <modules>
     <module>parent</module>
 
@@ -62,13 +67,6 @@
     <module>mdsal-it-parent</module>
   </modules>
 
-  <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-  </scm>
-
   <profiles>
     <profile>
       <id>benchmarks</id>
diff --git a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
index 4810923796..bf063e361f 100644
--- a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
@@ -7,44 +7,48 @@
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>clustering-it</artifactId>
-        <groupId>org.opendaylight.controller.samples</groupId>
-        <version>1.12.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>7.0.1</version>
+        <relativePath/>
     </parent>
+
+    <groupId>org.opendaylight.controller.samples</groupId>
     <artifactId>clustering-it-config</artifactId>
-  <packaging>jar</packaging>
-  <build>
-    <plugins>
-        <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <artifacts>
-                  <artifact>
-                      <file>${project.build.directory}/classes/initial/module-shards.conf</file>
-                      <type>xml</type>
-                      <classifier>testmoduleshardconf</classifier>
-                  </artifact>
-                  <artifact>
-                      <file>${project.build.directory}/classes/initial/modules.conf</file>
-                      <type>xml</type>
-                      <classifier>testmoduleconf</classifier>
-                  </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <version>1.12.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${project.build.directory}/classes/initial/module-shards.conf</file>
+                                    <type>xml</type>
+                                    <classifier>testmoduleshardconf</classifier>
+                                </artifact>
+                                <artifact>
+                                    <file>${project.build.directory}/classes/initial/modules.conf</file>
+                                    <type>xml</type>
+                                    <classifier>testmoduleconf</classifier>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/opendaylight/md-sal/samples/clustering-test-app/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/pom.xml
index c960ea5721..2f903dbea6 100644
--- a/opendaylight/md-sal/samples/clustering-test-app/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/pom.xml
@@ -1,16 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.opendaylight.controller.samples</groupId>
-        <artifactId>sal-samples</artifactId>
-        <version>1.12.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>7.0.1</version>
+        <relativePath/>
     </parent>
-    <artifactId>clustering-it</artifactId>
+
+    <groupId>org.opendaylight.controller.samples</groupId>
+    <artifactId>clustering-test-app</artifactId>
+    <version>1.12.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-  <modules>
-    <module>configuration</module>
-    <module>model</module>
-    <module>provider</module>
-  </modules>
+
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
+    <modules>
+        <module>configuration</module>
+        <module>model</module>
+        <module>provider</module>
+    </modules>
 </project>
diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml
index 07ae31fdbb..3b896e9a26 100644
--- a/opendaylight/md-sal/samples/pom.xml
+++ b/opendaylight/md-sal/samples/pom.xml
@@ -2,15 +2,22 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>sal-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <version>7.0.1</version>
+    <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.controller.samples</groupId>
-  <artifactId>sal-samples</artifactId>
+  <artifactId>samples-aggregator</artifactId>
+  <version>1.12.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <maven.install.skip>true</maven.install.skip>
+  </properties>
+
   <modules>
     <module>toaster</module>
     <module>toaster-consumer</module>
@@ -18,11 +25,4 @@
     <module>clustering-test-app</module>
     <module>toaster-it</module>
   </modules>
-  <scm>
-    <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-  </scm>
-
 </project>
diff --git a/opendaylight/model/pom.xml b/opendaylight/model/pom.xml
index df8f0c78f5..3fb23ced22 100644
--- a/opendaylight/model/pom.xml
+++ b/opendaylight/model/pom.xml
@@ -8,7 +8,6 @@
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
@@ -22,15 +21,13 @@
     <version>1.12.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
     <modules>
         <module>model-inventory</module>
         <module>model-topology</module>
     </modules>
-
-    <scm>
-        <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-    </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index f7b8a4489f..73d519fc28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,7 @@
     <version>7.0.1</version>
     <relativePath/>
   </parent>
+
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>releasepom</artifactId>
   <version>0.12.0-SNAPSHOT</version>
@@ -14,6 +15,11 @@
   <name>controller</name>
   <!-- Used by Sonar to set project name -->
 
+  <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <maven.install.skip>true</maven.install.skip>
+  </properties>
+
   <modules>
     <module>artifacts</module>
 
@@ -38,11 +44,6 @@
     <module>docs</module>
   </modules>
 
-  <properties>
-    <maven.deploy.skip>true</maven.deploy.skip>
-    <maven.install.skip>true</maven.install.skip>
-  </properties>
-
   <profiles>
     <profile>
       <id>sonar-jacoco-aggregate</id>
-- 
2.36.6