From e8ca5b16aa0fa8055be3c766ddd4c51fe27790a5 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 25 Oct 2019 14:18:29 +0200
Subject: [PATCH] Make applications/pom.xml an aggregator

This really is just an aggregator, make sure it inherits from
odlparent-lite and adjust its users to inherit from ofp-parent.
Shaves ~29 seconds from build time.

Change-Id: Id2cd32ed36a1bf40ff279cef1d9efced1649047b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../arbitratorreconciliation/api/pom.xml      |  6 +--
 .../arbitratorreconciliation/impl/pom.xml     |  6 +--
 applications/arbitratorreconciliation/pom.xml | 39 +++++++------------
 applications/bulk-o-matic/pom.xml             | 17 ++------
 applications/device-ownership-service/pom.xml |  5 ++-
 applications/forwardingrules-manager/pom.xml  |  4 +-
 applications/forwardingrules-sync/pom.xml     | 15 ++-----
 applications/lldp-speaker/pom.xml             |  5 ++-
 applications/notification-supplier/pom.xml    | 17 ++------
 applications/of-switch-config-pusher/pom.xml  | 21 ++++------
 applications/pom.xml                          | 33 ++++++----------
 applications/reconciliation-framework/pom.xml |  4 +-
 applications/southbound-cli/pom.xml           |  4 +-
 applications/table-miss-enforcer/pom.xml      | 15 ++-----
 14 files changed, 68 insertions(+), 123 deletions(-)

diff --git a/applications/arbitratorreconciliation/api/pom.xml b/applications/arbitratorreconciliation/api/pom.xml
index f9b6760533..226e25972e 100644
--- a/applications/arbitratorreconciliation/api/pom.xml
+++ b/applications/arbitratorreconciliation/api/pom.xml
@@ -1,12 +1,12 @@
 <?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>
-        <artifactId>applications</artifactId>
         <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-parent</artifactId>
         <version>0.10.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+        <relativePath>../../../parent</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.opendaylight.openflowplugin.applications</groupId>
     <artifactId>arbitratorreconciliation-api</artifactId>
diff --git a/applications/arbitratorreconciliation/impl/pom.xml b/applications/arbitratorreconciliation/impl/pom.xml
index 536dc8b321..bd96f27934 100644
--- a/applications/arbitratorreconciliation/impl/pom.xml
+++ b/applications/arbitratorreconciliation/impl/pom.xml
@@ -1,12 +1,12 @@
 <?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>
-        <artifactId>applications</artifactId>
         <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-parent</artifactId>
         <version>0.10.0-SNAPSHOT</version>
-        <relativePath>../..</relativePath>
+        <relativePath>../../../parent</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.opendaylight.openflowplugin.applications</groupId>
     <artifactId>arbitratorreconciliation-impl</artifactId>
diff --git a/applications/arbitratorreconciliation/pom.xml b/applications/arbitratorreconciliation/pom.xml
index 45904c5f6f..178f6c9bbc 100644
--- a/applications/arbitratorreconciliation/pom.xml
+++ b/applications/arbitratorreconciliation/pom.xml
@@ -1,40 +1,27 @@
 <?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>
-        <artifactId>applications</artifactId>
-        <groupId>org.opendaylight.openflowplugin</groupId>
-        <version>0.10.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>6.0.0</version>
+        <relativePath/>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>arbitratorreconciliation-aggregator</artifactId>
     <groupId>org.opendaylight.openflowplugin.applications</groupId>
+    <artifactId>arbitratorreconciliation-aggregator</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: openflowplugin :: ${project.artifactId}</name>
 
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
     <modules>
         <module>api</module>
         <module>impl</module>
     </modules>
-
-    <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/applications/bulk-o-matic/pom.xml b/applications/bulk-o-matic/pom.xml
index f3ed66e794..6a8db74429 100644
--- a/applications/bulk-o-matic/pom.xml
+++ b/applications/bulk-o-matic/pom.xml
@@ -3,12 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.openflowplugin</groupId>
-    <artifactId>applications</artifactId>
+    <artifactId>openflowplugin-parent</artifactId>
     <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
   </parent>
+
   <groupId>org.opendaylight.openflowplugin.applications</groupId>
   <artifactId>bulk-o-matic</artifactId>
   <packaging>bundle</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
@@ -30,18 +33,6 @@
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-util</artifactId>
       <version>${infrautils.version}</version>
-    </dependency>
-
-        <!-- Test dependencies -->
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 
diff --git a/applications/device-ownership-service/pom.xml b/applications/device-ownership-service/pom.xml
index 6b699e1ec4..21a8f81210 100644
--- a/applications/device-ownership-service/pom.xml
+++ b/applications/device-ownership-service/pom.xml
@@ -1,11 +1,12 @@
 <?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>
-        <artifactId>applications</artifactId>
         <groupId>org.opendaylight.openflowplugin</groupId>
+        <artifactId>openflowplugin-parent</artifactId>
         <version>0.10.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.opendaylight.openflowplugin.applications</groupId>
     <artifactId>device-ownership-service</artifactId>
diff --git a/applications/forwardingrules-manager/pom.xml b/applications/forwardingrules-manager/pom.xml
index 7dec34b697..c3f933127f 100644
--- a/applications/forwardingrules-manager/pom.xml
+++ b/applications/forwardingrules-manager/pom.xml
@@ -3,9 +3,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.openflowplugin</groupId>
-    <artifactId>applications</artifactId>
+    <artifactId>openflowplugin-parent</artifactId>
     <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
   </parent>
+
   <groupId>org.opendaylight.openflowplugin.applications</groupId>
   <artifactId>forwardingrules-manager</artifactId>
   <packaging>bundle</packaging>
diff --git a/applications/forwardingrules-sync/pom.xml b/applications/forwardingrules-sync/pom.xml
index cb768d82f3..832c429278 100644
--- a/applications/forwardingrules-sync/pom.xml
+++ b/applications/forwardingrules-sync/pom.xml
@@ -3,9 +3,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>applications</artifactId>
+        <artifactId>openflowplugin-parent</artifactId>
         <version>0.10.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
+
     <groupId>org.opendaylight.openflowplugin.applications</groupId>
     <artifactId>forwardingrules-sync</artifactId>
     <packaging>bundle</packaging>
@@ -76,17 +78,6 @@
             <type>test-jar</type>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
diff --git a/applications/lldp-speaker/pom.xml b/applications/lldp-speaker/pom.xml
index 972e3428dd..24aa3015b4 100644
--- a/applications/lldp-speaker/pom.xml
+++ b/applications/lldp-speaker/pom.xml
@@ -3,12 +3,15 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>applications</artifactId>
+        <artifactId>openflowplugin-parent</artifactId>
         <version>0.10.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
+
     <groupId>org.opendaylight.openflowplugin.applications</groupId>
     <artifactId>lldp-speaker</artifactId>
     <packaging>bundle</packaging>
+
     <dependencies>
         <dependency>
             <groupId>javax.annotation</groupId>
diff --git a/applications/notification-supplier/pom.xml b/applications/notification-supplier/pom.xml
index 45f41932df..5efc8fbcf3 100644
--- a/applications/notification-supplier/pom.xml
+++ b/applications/notification-supplier/pom.xml
@@ -3,12 +3,15 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>applications</artifactId>
+        <artifactId>openflowplugin-parent</artifactId>
         <version>0.10.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
+
     <groupId>org.opendaylight.openflowplugin.applications</groupId>
     <artifactId>notification-supplier</artifactId>
     <packaging>bundle</packaging>
+
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
@@ -30,17 +33,5 @@
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-common</artifactId>
         </dependency>
-
-        <!-- Test dependencies -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/applications/of-switch-config-pusher/pom.xml b/applications/of-switch-config-pusher/pom.xml
index e5dde522b4..c62925ffff 100644
--- a/applications/of-switch-config-pusher/pom.xml
+++ b/applications/of-switch-config-pusher/pom.xml
@@ -3,12 +3,15 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>applications</artifactId>
+        <artifactId>openflowplugin-parent</artifactId>
         <version>0.10.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
+
     <groupId>org.opendaylight.openflowplugin.applications</groupId>
     <artifactId>of-switch-config-pusher</artifactId>
     <packaging>bundle</packaging>
+
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
@@ -36,19 +39,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.infrautils</groupId>
-          <artifactId>infrautils-util</artifactId>
-          <version>${infrautils.version}</version>
-      </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
+            <groupId>org.opendaylight.infrautils</groupId>
+            <artifactId>infrautils-util</artifactId>
+            <version>${infrautils.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
diff --git a/applications/pom.xml b/applications/pom.xml
index aa06a0bd10..55a67da9d3 100644
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -3,32 +3,21 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>openflowplugin-parent</artifactId>
-        <version>0.10.0-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>6.0.0</version>
+        <relativePath/>
     </parent>
 
-    <artifactId>applications</artifactId>
-    <name>applications</name>
-    <url>http://maven.apache.org</url>
+    <groupId>org.opendaylight.openflowplugin</groupId>
+    <artifactId>applications-aggregator</artifactId>
+    <version>0.10.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-    <scm>
-      <connection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</connection>
-      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
-      <url>https://wiki.opendaylight.org/view/OpenDaylight_OpenFlow_Plugin:Main</url>
-      <tag>HEAD</tag>
-    </scm>
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
 
     <modules>
         <module>table-miss-enforcer</module>
diff --git a/applications/reconciliation-framework/pom.xml b/applications/reconciliation-framework/pom.xml
index 497405fe43..941ff4a1cd 100644
--- a/applications/reconciliation-framework/pom.xml
+++ b/applications/reconciliation-framework/pom.xml
@@ -3,9 +3,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>applications</artifactId>
+        <artifactId>openflowplugin-parent</artifactId>
         <version>0.10.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
+
     <groupId>org.opendaylight.openflowplugin.applications</groupId>
     <artifactId>reconciliation-framework</artifactId>
     <packaging>bundle</packaging>
diff --git a/applications/southbound-cli/pom.xml b/applications/southbound-cli/pom.xml
index 9b94f7d914..94cc92229b 100644
--- a/applications/southbound-cli/pom.xml
+++ b/applications/southbound-cli/pom.xml
@@ -3,9 +3,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.openflowplugin</groupId>
-        <artifactId>applications</artifactId>
+        <artifactId>openflowplugin-parent</artifactId>
         <version>0.10.0-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
     </parent>
+
     <groupId>org.opendaylight.openflowplugin.applications</groupId>
     <artifactId>southbound-cli</artifactId>
     <packaging>bundle</packaging>
diff --git a/applications/table-miss-enforcer/pom.xml b/applications/table-miss-enforcer/pom.xml
index c7d339c9b1..fc4af23d46 100644
--- a/applications/table-miss-enforcer/pom.xml
+++ b/applications/table-miss-enforcer/pom.xml
@@ -3,12 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.openflowplugin</groupId>
-    <artifactId>applications</artifactId>
+    <artifactId>openflowplugin-parent</artifactId>
     <version>0.10.0-SNAPSHOT</version>
+    <relativePath>../../parent</relativePath>
   </parent>
+
   <groupId>org.opendaylight.openflowplugin.applications</groupId>
   <artifactId>table-miss-enforcer</artifactId>
   <packaging>bundle</packaging>
+
   <dependencies>
       <dependency>
           <groupId>javax.annotation</groupId>
@@ -46,16 +49,6 @@
           <artifactId>device-ownership-service</artifactId>
           <version>${project.version}</version>
       </dependency>
-      <dependency>
-          <groupId>org.mockito</groupId>
-          <artifactId>mockito-core</artifactId>
-          <scope>test</scope>
-      </dependency>
-      <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <scope>test</scope>
-      </dependency>
   </dependencies>
 
 </project>
-- 
2.36.6