Remove <prerequisites><maven> from 4 archetype pom.xml 42/46642/2
authorMichael Vorburger <vorburger@redhat.com>
Thu, 6 Oct 2016 23:26:28 +0000 (01:26 +0200)
committerTom Pantelis <tpanteli@brocade.com>
Fri, 7 Oct 2016 16:01:22 +0000 (16:01 +0000)
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>
opendaylight/archetypes/opendaylight-karaf-distro-archetype/src/main/resources/archetype-resources/pom.xml
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/pom.xml
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/karaf/pom.xml
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/pom.xml

index 36508ca..3762513 100644 (file)
   <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
index 578a519..9a5dbbd 100644 (file)
@@ -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>
index cf30621..e0d18c9 100644 (file)
@@ -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>
index b868d47..bccc1a0 100644 (file)
@@ -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>

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.