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>

diff --git a/openstack/commons/it/pom.xml b/openstack/commons/it/pom.xml
index e3e455ea283cfdc6ba7db78099adb25bafc682f7..a4c9885bafc938eb7688d629d4b867cd94cc52f5 100644 (file)
--- 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 114f8ddc9bd1c7d5083dc74ed63ae40e59df372b..4d68018e40b86d77963a39db3f3660917955de1f 100644 (file)
--- 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 d6d5dd6d83b671efda48a722f13f3c9cced92ed2..09f06222a63f88723311356e6cfdb6390f117267 100644 (file)
--- 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 c94ef976940d3523a78acf26e28eab663592d0ed..76eb3537db5041e7d811889c96ff3c0cc9238c01 100644 (file)
--- 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 c3b5223d6773be77c585991042b5fd7954b8bec1..f9d26b3ee6fb90ff2a71cc82ff024fb699c99afc 100644 (file)
--- 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 fe6503ce76e695b8f7529dcc783df68cf4e1611d..36e8529c990e417549bd4027d8f204fd9995e2d2 100644 (file)
--- 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 dbae4fd1a930e130e93407cbeff7540720e56789..593f25f2e1c8a49ceeddf3aa8f82594661de8f79 100644 (file)
--- 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 8dd95d5e73dc1fc56d637d82d2a4b79ee63336da..a6bcec1a63670733f7a0ab19e32d1ae9674aa093 100644 (file)
--- 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 703a606031448cef80033c6c13bc11156b6a39f1..f04a541d2fca7693a8d5bb7ace0a0713231bdae1 100644 (file)
--- 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 e6538372d80b2f9d8366eb35ae32b2e27baf9d40..ff3109b0ac04061db88ebb38d9015d4a29b5a283 100644 (file)
--- 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 14d037bdb654d72579995defc4becb0bec06981d..c0951a4bbb2e3541e5aae0d6b1f07a69aaa789b8 100644 (file)
--- 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 8e195de94b20315b0c339f0a689d52086fda5cd4..ac93bd5beba35240a183ac8ad713078fe5284456 100644 (file)
--- 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 9c2db975414632face80f206c875637cb34bf529..4d06d8782ac2adf8e09606220c68314a23c30082 100644 (file)
--- 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 4759cec6b68896fe778f072fb28b7414d366c80b..9b9b523951da3ca2259b9fb8b239262dc79de192 100644 (file)
--- 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 fe1838689ce027eda1ca8f6bedc1224a6d947676..752fce26295098f0dbab61a5418b9077ecfd656d 100644 (file)
--- 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 0a5dd8926828e0a5d2ae4bcb65e747145868e162..6a4e1f2832be6eebc23810855c9edaf7e97a5a94 100644 (file)
--- 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 55693930803f089c0a668e917f437d07597cee24..aae5c2fb10ed7974cdaa73f2fec90661c300ab68 100644 (file)
--- 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 193fbaf3bc03baca776a81bff5fd04c65faf9659..f727189f034fecdca93dfadb04f6deab01a20af7 100644 (file)
--- 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 489109aaa477af9f48be52f7173da5dab3528091..b066e9f2639ee3720bb21a0c5d550797586f328b 100644 (file)
--- 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 e8b8d4641686271a1f7b26eda4114c426da4292c..01a2a319df54623d5d4ec0d37a8f9a6a146319e3 100644 (file)
--- 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 45bf69d099f6be70f770a164d970c53337cc362b..a18f6e63202f9a9a0e74605cbca4d64cd7cf2b75 100644 (file)
--- 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 226d5bc074217ce91329822dd36b85c3eb07d0e6..4f009682153c09cf9f960741c9a7d7f40cb8d27b 100644 (file)
--- 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 4e052c530ae14068ec04f2f522af68159d6667f3..cf82eba8e5b57a7f7e21d71940559c382baaf28d 100644 (file)
--- 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 08aba008ba9f85d88e7f87e384c9ce92bc7f7572..6e8b451d576ac76f83c9fff136bc6285e0393a13 100644 (file)
--- 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 f88ad54783df63afd69be9ac601b3ecae45de0be..049df61cfeaa03cca280c4387e1c3df3f0ecec80 100644 (file)
--- 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 26445cf4498712fae4578d69ab1c779bd51579e6..ec76cb15d9a094338e06d5ab17ccfc546740f0a9 100644 (file)
--- 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 667087331620be603835ee7a355883cafea00300..029db24513a28e233b0b79d414b2817b095728e2 100644 (file)
--- 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 f30fc5f0f38fa0fb118b4c87d67666f172ba836f..2071e99e03b723546124644a7c67a8edebbdb723 100644 (file)
--- 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 65b7d7778c190992e806c45c497c9d5e50325797..6ec8bf458398613eb266f5f1504a5fe4ae3c748e 100644 (file)
--- 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 c582b2976598e3085b253e7ab0c008d0eef25b6b..7eb0cf7fdfa033bdb2463a79c572d3bbd5aa138b 100644 (file)
--- 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 35335409bef6459c834875377de05cb118859367..a8602a093149d55bdac886ce0f59154d76b91b6b 100644 (file)
--- 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>