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>

diff --git a/opendaylight/archetypes/odl-model-project/pom.xml b/opendaylight/archetypes/odl-model-project/pom.xml
index 29d1200108bf4ebc83c1d1a0071d4d904b7eb779..5c147181278ee0a340f98f6fe204d4ce4b156662 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 847ba838a7d991aec194202f106613397fee9593..d11ef7e410378b79cc6936706244f6ad7fd34a25 100644 (file)
--- a/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml
+++ b/opendaylight/archetypes/opendaylight-configfile-archetype/pom.xml
@@ -13,26 +13,6 @@
   <version>1.2.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 ff2384fb27e5c3f3c05521fcfd6dc3c1ab025190..e204857669b0ae3c820816a4b521eaf0d61f45b0 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 12861604e86d336f6fe0a8ec92887123c18028d9..0cd9d7741aff5c4ff64974408f5eeafb51d4b09a 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 4ebeb1cdae525af87f23ba5eb61603d62f2c4a2e..7f412ddbd74da1a61fe327dd255cd29755a040a1 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 d830fbe6d992d9b0b0d5dfc3057f0f0d759fec42..17a7b985fe73a04906cd60598185d6ee24bac8f3 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>