From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 19 Jan 2015 03:22:56 +0000 (-0500)
Subject: Use Maven Enforcer plugin to require Maven version
X-Git-Tag: release/lithium~683^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=25d6d751e6e47970d6b0c521f984f9e302bce66f

Use Maven Enforcer plugin to require Maven version

Using the <prerequisites> configuration in pom files is deprecated and
it is recommended to use the maven-enforcer-plugin to enforce these
rules instead.

See:
http://jira.codehaus.org/browse/MNG-5297
http://jira.codehaus.org/browse/MNG-4840

Bug: 2605
Change-Id: Ia0be6681bfac19d3a49917e172e32a26ac8e5933
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 4d95b72ce7..32aa9a3efc 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -12,9 +12,6 @@
   <artifactId>commons.opendaylight</artifactId>
   <version>1.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
 
   <properties>
 
@@ -1720,7 +1717,7 @@
         <version>${enforcer.version}</version>
         <executions>
           <execution>
-            <id>enforce-java</id>
+            <id>enforce-requirements</id>
             <goals>
               <goal>enforce</goal>
             </goals>
@@ -1729,6 +1726,9 @@
                 <requireJavaVersion>
                   <version>1.7.0</version>
                 </requireJavaVersion>
+                <requireMavenVersion>
+                  <version>3.1.1</version>
+                </requireMavenVersion>
               </rules>
             </configuration>
           </execution>