Unify declarations in archetype-parent

Instead of repeating extends/pluginManagement sections, make sure they
are inherited from the parent.

Change-Id: I49882c57221a5c5806d936ff3b94cf71aeef64e6
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit e2e553602698c475e7cf7fe73a8bfd7a2a045e35)

diff --git a/opendaylight/archetypes/odl-model-project/pom.xml b/opendaylight/archetypes/odl-model-project/pom.xml
index d6687175d7fb59ccaed912f3e2e57b9d47c5283e..e7ed4cffcc472db35c535d191a0c1c5a9e61fd66 100644 (file)
--- a/opendaylight/archetypes/odl-model-project/pom.xml
+++ b/opendaylight/archetypes/odl-model-project/pom.xml
@@ -27,16 +27,6 @@
     <tag>HEAD</tag>
   </scm>
 
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>2.2</version>
-      </extension>
-    </extensions>
-  </build>
-
   <distributionManagement>
     <repository>
       <id>opendaylight-release</id>

diff --git a/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml b/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml
index 60ad33d7a425b38efe7a2f4e68a2100228c75a9b..8c27dd0955257fb3610b235e308388593f9c1330 100644 (file)
--- a/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml
+++ b/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml
@@ -13,26 +13,6 @@
   <version>1.3.0-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
 
-
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>2.2</version>
-      </extension>
-    </extensions>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-archetype-plugin</artifactId>
-          <version>2.2</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
   <description>Configuration files for md-sal</description>
 
   <scm>

diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml
index 18e8ba13a453e4733f800799eddfb6524727a6d5..d0f582d75653b68cdda282211f4d7407e731db5e 100644 (file)
--- a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml
+++ b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/pom.xml
@@ -13,25 +13,6 @@
 
   <name>distribution-karaf-archetype</name>
 
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>2.2</version>
-      </extension>
-    </extensions>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-archetype-plugin</artifactId>
-          <version>2.2</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
   <url>https://wiki.opendaylight.org/view/CrossProject:Integration_Group/distribution-karaf</url>
 
   <scm>

diff --git a/opendaylight/archetypes/opendaylight-karaf-features/pom.xml b/opendaylight/archetypes/opendaylight-karaf-features/pom.xml
index 7403d692d1e5972bb08cc566501de7c40ab18038..cbc8a581fdf4280b546da0a600d85e9cdc73f487 100644 (file)
--- a/opendaylight/archetypes/opendaylight-karaf-features/pom.xml
+++ b/opendaylight/archetypes/opendaylight-karaf-features/pom.xml
@@ -14,25 +14,6 @@
 
   <name>opendaylight-karaf-features-archetype</name>
 
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>2.2</version>
-      </extension>
-    </extensions>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-archetype-plugin</artifactId>
-          <version>2.2</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git/</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git/</developerConnection>

diff --git a/opendaylight/archetypes/opendaylight-startup/pom.xml b/opendaylight/archetypes/opendaylight-startup/pom.xml
index 62b408401484f03e99b01890889738890ee3c1e0..d68d7dda97ec15a02c5486938dcedee0b853d0b3 100644 (file)
--- a/opendaylight/archetypes/opendaylight-startup/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/pom.xml
@@ -16,22 +16,6 @@
   <name>${project.artifactId}</name>
 
   <build>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.archetype</groupId>
-        <artifactId>archetype-packaging</artifactId>
-        <version>2.2</version>
-      </extension>
-    </extensions>
-
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-archetype-plugin</artifactId>
-          <version>2.2</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml
index a12abca7407ca31b16016458f8ad7c461939b0ff..23e15f694df90ec150909ab8436b8178524cc415 100644 (file)
--- a/opendaylight/archetypes/pom.xml
+++ b/opendaylight/archetypes/pom.xml
@@ -36,6 +36,13 @@
   </distributionManagement>
 
   <build>
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.archetype</groupId>
+        <artifactId>archetype-packaging</artifactId>
+        <version>2.2</version>
+      </extension>
+    </extensions>
     <pluginManagement>
       <plugins>
         <plugin>