From 11584b43acd40e1d03027953fb52d3f58045ddd5 Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@redhat.com>
Date: Thu, 6 Oct 2016 09:53:29 +0200
Subject: [PATCH] Drop Maven prerequisite

The Maven versions are enforced by odlparent, projects no longer need
to care about them (unless a particular project-specific plugin
requirement crops up).

Change-Id: Iffc2f96e29ce0b5e5a1b5f91ff7280895f15eb16
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---
 openstack/commons/it/pom.xml              | 4 ----
 openstack/commons/pom.xml                 | 3 ---
 openstack/karaf/pom.xml                   | 3 ---
 openstack/net-virt-sfc/features/pom.xml   | 3 ---
 openstack/net-virt-sfc/karaf/pom.xml      | 3 ---
 openstack/net-virt-sfc/pom.xml            | 3 ---
 openstack/netvirt2/pom.xml                | 3 ---
 openstack/netvirt2/renderers/pom.xml      | 3 ---
 openstack/pom.xml                         | 3 ---
 openstack/sfc-translator/features/pom.xml | 3 ---
 openstack/sfc-translator/karaf/pom.xml    | 3 ---
 openstack/sfc-translator/pom.xml          | 3 ---
 openstack/utils/pom.xml                   | 3 ---
 pom.xml                                   | 4 ----
 vpnservice/aclservice/pom.xml             | 3 ---
 vpnservice/bgpmanager/pom.xml             | 3 ---
 vpnservice/cloud-servicechain/pom.xml     | 3 ---
 vpnservice/commons/it-parent/pom.xml      | 4 ----
 vpnservice/dhcpservice/pom.xml            | 3 ---
 vpnservice/distribution/karaf/pom.xml     | 3 ---
 vpnservice/elanmanager/pom.xml            | 3 ---
 vpnservice/features/pom.xml               | 3 ---
 vpnservice/fibmanager/pom.xml             | 3 ---
 vpnservice/ipv6service/pom.xml            | 3 ---
 vpnservice/it/feature/pom.xml             | 3 ---
 vpnservice/it/pom.xml                     | 4 ----
 vpnservice/natservice/pom.xml             | 3 ---
 vpnservice/neutronvpn/pom.xml             | 3 ---
 vpnservice/pom.xml                        | 3 ---
 vpnservice/statemanager/pom.xml           | 3 ---
 vpnservice/vpnmanager/pom.xml             | 3 ---
 31 files changed, 97 deletions(-)

diff --git a/openstack/commons/it/pom.xml b/openstack/commons/it/pom.xml
index e3e455ea28..a4c9885baf 100644
--- a/openstack/commons/it/pom.xml
+++ b/openstack/commons/it/pom.xml
@@ -43,10 +43,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-
   <properties>
     <skip.surefire.tests>false</skip.surefire.tests>
   </properties>
diff --git a/openstack/commons/pom.xml b/openstack/commons/pom.xml
index 114f8ddc9b..4d68018e40 100644
--- a/openstack/commons/pom.xml
+++ b/openstack/commons/pom.xml
@@ -44,9 +44,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>it</module>
   </modules>
diff --git a/openstack/karaf/pom.xml b/openstack/karaf/pom.xml
index d6d5dd6d83..09f06222a6 100644
--- a/openstack/karaf/pom.xml
+++ b/openstack/karaf/pom.xml
@@ -21,9 +21,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <artifactId>karaf</artifactId>
   <version>1.4.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <properties>
     <!-- uncomment the next line if you want karaf to automatically load the feature -->
     <!-- <karaf.localFeature>odl-ovsdb-openstack</karaf.localFeature> -->
diff --git a/openstack/net-virt-sfc/features/pom.xml b/openstack/net-virt-sfc/features/pom.xml
index c94ef97694..76eb3537db 100644
--- a/openstack/net-virt-sfc/features/pom.xml
+++ b/openstack/net-virt-sfc/features/pom.xml
@@ -20,9 +20,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>1.4.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <properties>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
     <controller.mdsal.version>1.5.0-SNAPSHOT</controller.mdsal.version>
diff --git a/openstack/net-virt-sfc/karaf/pom.xml b/openstack/net-virt-sfc/karaf/pom.xml
index c3b5223d67..f9d26b3ee6 100644
--- a/openstack/net-virt-sfc/karaf/pom.xml
+++ b/openstack/net-virt-sfc/karaf/pom.xml
@@ -19,9 +19,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <artifactId>openstack.net-virt-sfc-karaf</artifactId>
   <version>1.4.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <properties>
     <karaf.localFeature>odl-ovsdb-sfc-test</karaf.localFeature>
   </properties>
diff --git a/openstack/net-virt-sfc/pom.xml b/openstack/net-virt-sfc/pom.xml
index fe6503ce76..36e8529c99 100644
--- a/openstack/net-virt-sfc/pom.xml
+++ b/openstack/net-virt-sfc/pom.xml
@@ -19,9 +19,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>1.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>api</module>
     <module>impl</module>
diff --git a/openstack/netvirt2/pom.xml b/openstack/netvirt2/pom.xml
index dbae4fd1a9..593f25f2e1 100644
--- a/openstack/netvirt2/pom.xml
+++ b/openstack/netvirt2/pom.xml
@@ -20,9 +20,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>netvirt</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>api</module>
     <module>renderers</module>
diff --git a/openstack/netvirt2/renderers/pom.xml b/openstack/netvirt2/renderers/pom.xml
index 8dd95d5e73..a6bcec1a63 100644
--- a/openstack/netvirt2/renderers/pom.xml
+++ b/openstack/netvirt2/renderers/pom.xml
@@ -19,9 +19,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>renderers</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>hwgw</module>
     <module>neutron</module>
diff --git a/openstack/pom.xml b/openstack/pom.xml
index 703a606031..f04a541d2f 100644
--- a/openstack/pom.xml
+++ b/openstack/pom.xml
@@ -44,9 +44,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>commons</module>
     <module>features</module>
diff --git a/openstack/sfc-translator/features/pom.xml b/openstack/sfc-translator/features/pom.xml
index e6538372d8..ff3109b0ac 100644
--- a/openstack/sfc-translator/features/pom.xml
+++ b/openstack/sfc-translator/features/pom.xml
@@ -20,9 +20,6 @@
   <version>1.4.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <properties>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
     <neutron.version>0.8.0-SNAPSHOT</neutron.version>
diff --git a/openstack/sfc-translator/karaf/pom.xml b/openstack/sfc-translator/karaf/pom.xml
index 14d037bdb6..c0951a4bbb 100644
--- a/openstack/sfc-translator/karaf/pom.xml
+++ b/openstack/sfc-translator/karaf/pom.xml
@@ -20,9 +20,6 @@
   <artifactId>openstack.sfc-translator-karaf</artifactId>
   <version>1.4.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <dependencyManagement>
     <dependencies>
       <dependency>
diff --git a/openstack/sfc-translator/pom.xml b/openstack/sfc-translator/pom.xml
index 8e195de94b..ac93bd5beb 100644
--- a/openstack/sfc-translator/pom.xml
+++ b/openstack/sfc-translator/pom.xml
@@ -19,9 +19,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>1.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>impl</module>
     <module>karaf</module>
diff --git a/openstack/utils/pom.xml b/openstack/utils/pom.xml
index 9c2db97541..4d06d8782a 100644
--- a/openstack/utils/pom.xml
+++ b/openstack/utils/pom.xml
@@ -44,9 +44,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>config</module>
     <module>mdsal-openflow</module>
diff --git a/pom.xml b/pom.xml
index 4759cec6b6..9b9b523951 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,10 +44,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-
   <modules>
     <module>openstack</module>
     <module>vpnservice</module>
diff --git a/vpnservice/aclservice/pom.xml b/vpnservice/aclservice/pom.xml
index fe1838689c..752fce2629 100644
--- a/vpnservice/aclservice/pom.xml
+++ b/vpnservice/aclservice/pom.xml
@@ -22,9 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>aclservice</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>api</module>
     <module>impl</module>
diff --git a/vpnservice/bgpmanager/pom.xml b/vpnservice/bgpmanager/pom.xml
index 0a5dd89268..6a4e1f2832 100644
--- a/vpnservice/bgpmanager/pom.xml
+++ b/vpnservice/bgpmanager/pom.xml
@@ -20,9 +20,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>bgpmanager</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
 
   <modules>
     <module>bgpmanager-api</module>
diff --git a/vpnservice/cloud-servicechain/pom.xml b/vpnservice/cloud-servicechain/pom.xml
index 5569393080..aae5c2fb10 100644
--- a/vpnservice/cloud-servicechain/pom.xml
+++ b/vpnservice/cloud-servicechain/pom.xml
@@ -20,9 +20,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>cloud-servicechain</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>cloud-servicechain-api</module>
     <module>cloud-servicechain-impl</module>
diff --git a/vpnservice/commons/it-parent/pom.xml b/vpnservice/commons/it-parent/pom.xml
index 193fbaf3bc..f727189f03 100644
--- a/vpnservice/commons/it-parent/pom.xml
+++ b/vpnservice/commons/it-parent/pom.xml
@@ -43,10 +43,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-
   <properties>
     <skip.surefire.tests>false</skip.surefire.tests>
   </properties>
diff --git a/vpnservice/dhcpservice/pom.xml b/vpnservice/dhcpservice/pom.xml
index 489109aaa4..b066e9f263 100644
--- a/vpnservice/dhcpservice/pom.xml
+++ b/vpnservice/dhcpservice/pom.xml
@@ -20,9 +20,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>dhcpservice</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>dhcpservice-api</module>
     <module>dhcpservice-impl</module>
diff --git a/vpnservice/distribution/karaf/pom.xml b/vpnservice/distribution/karaf/pom.xml
index e8b8d46416..01a2a319df 100644
--- a/vpnservice/distribution/karaf/pom.xml
+++ b/vpnservice/distribution/karaf/pom.xml
@@ -18,9 +18,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <artifactId>vpnservice-karaf</artifactId>
   <version>0.4.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <properties>
     <!-- <karaf.localFeature>odl-vpnservice-core</karaf.localFeature> -->
   </properties>
diff --git a/vpnservice/elanmanager/pom.xml b/vpnservice/elanmanager/pom.xml
index 45bf69d099..a18f6e6320 100644
--- a/vpnservice/elanmanager/pom.xml
+++ b/vpnservice/elanmanager/pom.xml
@@ -20,9 +20,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>elanmanager</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>elanmanager-api</module>
     <module>elanmanager-impl</module>
diff --git a/vpnservice/features/pom.xml b/vpnservice/features/pom.xml
index 226d5bc074..4f00968215 100644
--- a/vpnservice/features/pom.xml
+++ b/vpnservice/features/pom.xml
@@ -17,9 +17,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.4.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <properties>
     <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
     <openflowplugin.version>0.4.0-SNAPSHOT</openflowplugin.version>
diff --git a/vpnservice/fibmanager/pom.xml b/vpnservice/fibmanager/pom.xml
index 4e052c530a..cf82eba8e5 100644
--- a/vpnservice/fibmanager/pom.xml
+++ b/vpnservice/fibmanager/pom.xml
@@ -21,9 +21,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>fibmanager</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>fibmanager-api</module>
     <module>fibmanager-impl</module>
diff --git a/vpnservice/ipv6service/pom.xml b/vpnservice/ipv6service/pom.xml
index 08aba008ba..6e8b451d57 100644
--- a/vpnservice/ipv6service/pom.xml
+++ b/vpnservice/ipv6service/pom.xml
@@ -22,9 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>ipv6service</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>api</module>
     <module>impl</module>
diff --git a/vpnservice/it/feature/pom.xml b/vpnservice/it/feature/pom.xml
index f88ad54783..049df61cfe 100644
--- a/vpnservice/it/feature/pom.xml
+++ b/vpnservice/it/feature/pom.xml
@@ -17,9 +17,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <version>0.4.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <properties>
     <ovsdb.version>1.4.0-SNAPSHOT</ovsdb.version>
     <skip.karaf.featureTest>true</skip.karaf.featureTest>
diff --git a/vpnservice/it/pom.xml b/vpnservice/it/pom.xml
index 26445cf449..ec76cb15d9 100644
--- a/vpnservice/it/pom.xml
+++ b/vpnservice/it/pom.xml
@@ -44,10 +44,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
   </scm>
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-
   <modules>
     <module>feature</module>
     <module>impl</module>
diff --git a/vpnservice/natservice/pom.xml b/vpnservice/natservice/pom.xml
index 6670873316..029db24513 100644
--- a/vpnservice/natservice/pom.xml
+++ b/vpnservice/natservice/pom.xml
@@ -20,9 +20,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>natservice</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>natservice-api</module>
     <module>natservice-impl</module>
diff --git a/vpnservice/neutronvpn/pom.xml b/vpnservice/neutronvpn/pom.xml
index f30fc5f0f3..2071e99e03 100644
--- a/vpnservice/neutronvpn/pom.xml
+++ b/vpnservice/neutronvpn/pom.xml
@@ -22,9 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>neutronvpn</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>neutronvpn-api</module>
     <module>neutronvpn-impl</module>
diff --git a/vpnservice/pom.xml b/vpnservice/pom.xml
index 65b7d7778c..6ec8bf4583 100644
--- a/vpnservice/pom.xml
+++ b/vpnservice/pom.xml
@@ -16,9 +16,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>commons/binding-parent</module>
     <module>commons/config-parent</module>
diff --git a/vpnservice/statemanager/pom.xml b/vpnservice/statemanager/pom.xml
index c582b29765..7eb0cf7fdf 100644
--- a/vpnservice/statemanager/pom.xml
+++ b/vpnservice/statemanager/pom.xml
@@ -22,9 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>${project.artifactId}</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>impl</module>
   </modules>
diff --git a/vpnservice/vpnmanager/pom.xml b/vpnservice/vpnmanager/pom.xml
index 35335409be..a8602a0931 100644
--- a/vpnservice/vpnmanager/pom.xml
+++ b/vpnservice/vpnmanager/pom.xml
@@ -20,9 +20,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>vpnmanager</name>
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <modules>
     <module>vpnmanager-api</module>
     <module>vpnmanager-impl</module>
-- 
2.36.6