Introduce new aggregator-parent POM

Just to avoid having that <skip>true for maven-deploy-plugin and
maven-install-plugin copy/pasted all over ODL for each *-aggregator.

This also makes changes as appropriate to use it in odlparent itself.

The intention is to start shifting to using this in other projects too.

Having a new parent artifact for all aggregators MAY also come in handy
when I start looking in earnest at our JavaDoc generation.

Q & TODO: Some, but not all, of the typical *-aggregator projects also
have a maven-site profile with maven-javadoc-plugin - should we move
that here as well? I'm hesitant because that sometimes has
<inherited>false .. which I'm not very familiar with - it would not do
anything with <inherited>false in a <parent>, would it? So do we include
it in aggregator-parent, but without <inherited>false ?  Or forget about
it and just start with a simple aggregator-parent as is proposed here
for now (and refine JavaDoc related stuff later) ?

Change-Id: I33fba54051b5d3e5fec145d8ae68785bb66c8725
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/aggregator-parent/pom.xml b/aggregator-parent/pom.xml
new file mode 100644 (file)
index 0000000..85c9121
--- /dev/null
+++ b/aggregator-parent/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ 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>1.9.0-SNAPSHOT</version>
+    <relativePath>odlparent-lite</relativePath>
+  </parent>
+
+  <artifactId>aggregator-parent</artifactId>
+  <name>ODL :: odlparent :: aggregator-parent</name>
+  <packaging>pom</packaging>
+
+  <!-- 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/features/pom.xml b/features/pom.xml
index 424bc6a8cf2c2ae386a9663ee86bf9ff8cf07c3f..183ed1172a694687c25c66ff12826b104ef467a0 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -13,9 +13,9 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
+        <artifactId>aggregator-parent</artifactId>
         <version>1.9.0-SNAPSHOT</version>
-        <relativePath>../odlparent-lite</relativePath>
+        <relativePath>../aggregator-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.odlparent</groupId>
@@ -43,20 +43,4 @@
         <module>odl-triemap-0.2</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

diff --git a/features4/pom.xml b/features4/pom.xml
index 145101d3bd6ff6793ce1bef5383d32b36ef623f7..4e5b6afa2eff583d445dea3bc7c45ca625ea7d92 100644 (file)
--- a/features4/pom.xml
+++ b/features4/pom.xml
@@ -13,9 +13,9 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
+        <artifactId>aggregator-parent</artifactId>
         <version>1.9.0-SNAPSHOT</version>
-        <relativePath>../odlparent-lite</relativePath>
+        <relativePath>../aggregator-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.odlparent</groupId>
@@ -50,21 +50,4 @@
 
         <!-- Test features -->
     </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-install-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 823114bc1279ee6225244c2767144bd1f7293dd7..0518996f42d1fdbeb838d9b897ec26b9da108ec4 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent-lite</artifactId>
+    <artifactId>aggregator-parent</artifactId>
     <version>1.9.0-SNAPSHOT</version>
-    <relativePath>../odlparent-lite</relativePath>
+    <relativePath>../aggregator-parent</relativePath>
   </parent>
   <artifactId>karaf-aggregator</artifactId>
   <packaging>pom</packaging>

diff --git a/pom.xml b/pom.xml
index 760571f7a36aa32d024964df37bac08b8802cd56..c90230f1e444335f7c20bc03d437ea4d8a4f63ee 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,9 +10,9 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
+        <artifactId>aggregator-parent</artifactId>
         <version>1.9.0-SNAPSHOT</version>
-        <relativePath>odlparent-lite</relativePath>
+        <relativePath>aggregator-parent</relativePath>
     </parent>
 
     <artifactId>odlparent-aggregator</artifactId>
@@ -42,6 +42,7 @@
         <module>karaf4-plugin</module>
 
         <!-- Parent POMs -->
+        <module>aggregator-parent</module>
         <module>bundle-parent</module>
         <module>features-parent</module>
         <module>single-feature3-parent</module>
@@ -60,17 +61,6 @@
         <module>odlparent-artifacts</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <profiles>
         <profile>
             <!--