From: Michael Vorburger <vorburger@redhat.com>
Date: Thu, 6 Oct 2016 23:26:28 +0000 (+0200)
Subject: Remove <prerequisites><maven> from 4 archetype pom.xml
X-Git-Tag: release/carbon~448
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=bf5c6f0a0b509b9f366be15433780d8fb8be1b84

Remove <prerequisites><maven> from 4 archetype pom.xml

This is no longer required now that odlparent specified this
(and, more importantly, odlparent also specifies
the maven-enforcer-plugin).

https://git.opendaylight.org/gerrit/#/c/46597/ did a manual
clean up in netvirt related to this.  This change is to
make sure that this doesn't creep back in.

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

diff --git a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml
index 36508ca709..3762513553 100644
--- a/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml
@@ -13,10 +13,6 @@
   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-
   <properties>
     <!-- If you want a feature included with the featuresBoot in
          etc/org.apache.karaf.features.cfg, uncomment karaf.localFeature and set
diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
index 578a519c58..9a5dbbdf87 100644
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
@@ -24,10 +24,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>${version}</version>
   <name>${project.artifactId}</name>
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-
   <properties>
     <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
     <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
index cf30621f63..e0d18c96e6 100644
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
@@ -22,10 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>${version}</version>
   <name>${project.artifactId}</name>
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-
   <properties>
     <karaf.localFeature>odl-${artifactId}-ui</karaf.localFeature>
   </properties>
diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
index b868d47c6c..bccc1a02ea 100644
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml
@@ -21,10 +21,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>${artifactId}</name>
   <packaging>pom</packaging>
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/${artifactId}.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/${artifactId}.git</developerConnection>