From ec32ea30f7b3e5351e661786955d9fa0929047bd Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Tue, 6 Jan 2015 11:58:58 +0100
Subject: [PATCH] Housekeeping, properly declare required maven version and
 update build plugin versions to recent versions

---
 plugins/hypervisors/hyperv/pom.xml       |  3 --
 plugins/user-authenticators/ldap/pom.xml |  2 +-
 pom.xml                                  | 40 ++++++++++++++++--------
 tools/checkstyle/pom.xml                 |  8 ++++-
 4 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml
index 9e658f63f96..e09fb43f861 100644
--- a/plugins/hypervisors/hyperv/pom.xml
+++ b/plugins/hypervisors/hyperv/pom.xml
@@ -70,7 +70,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2.1</version>
         <configuration>
           <executable>java</executable>
           <mainClass>com.cloud.agent.AgentShell</mainClass>
@@ -124,7 +123,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2.1</version>
         <executions>
           <execution>
             <phase>compile</phase>
@@ -144,7 +142,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.12</version>
         <configuration>
             <excludes>
               <exclude>none</exclude>
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index 22cdeb722d6..d24a5be5ab3 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -24,7 +24,7 @@
       <plugin>
         <groupId>org.codehaus.gmaven</groupId>
         <artifactId>gmaven-plugin</artifactId>
-        <version>1.3</version>
+        <version>1.5</version>
         <configuration>
           <providerSelection>1.7</providerSelection>
         </configuration>
diff --git a/pom.xml b/pom.xml
index e63769e9428..d3694bcd9a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,10 @@
     <system>jira</system>
     <url>https://issues.apache.org/jira/browse/CLOUDSTACK</url>
   </issueManagement>
+  
+  <prerequisites>
+    <maven>3.0.4</maven>
+  </prerequisites>
 
   <properties>
     <cs.jdk.version>1.7</cs.jdk.version>
@@ -92,10 +96,10 @@
     <cs.target.dir>target</cs.target.dir>
     <cs.daemon.version>1.0.15</cs.daemon.version>
     <cs.jna.version>4.0.0</cs.jna.version>
-    <cs.checkstyle.version>2.11</cs.checkstyle.version>
-    <cs.mycila.license.version>2.5</cs.mycila.license.version>
-    <cs.findbugs.version>2.5.3</cs.findbugs.version>
-    <cs.javadoc.version>2.9.1</cs.javadoc.version>
+    <cs.checkstyle.version>2.13</cs.checkstyle.version>
+    <cs.mycila.license.version>2.7</cs.mycila.license.version>
+    <cs.findbugs.version>3.0.0</cs.findbugs.version>
+    <cs.javadoc.version>2.10.1</cs.javadoc.version>
     <cs.opensaml.version>2.6.1</cs.opensaml.version>
   </properties>
 
@@ -612,7 +616,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.2.1</version>
+          <version>2.5.1</version>
           <executions>
             <execution>
               <id>default</id>
@@ -695,12 +699,12 @@
         <plugin>
           <groupId>org.apache.tomcat.maven</groupId>
           <artifactId>tomcat7-maven-plugin</artifactId>
-          <version>2.0</version>
+          <version>2.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.7</version>
+          <version>1.8</version>
         </plugin>
         <plugin>
           <groupId>org.apache.rat</groupId>
@@ -837,7 +841,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.5.1</version>
+          <version>3.2</version>
           <configuration>
             <source>${cs.jdk.version}</source>
             <target>${cs.jdk.version}</target>
@@ -850,7 +854,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.4</version>
+          <version>2.5</version>
           <configuration>
             <archive>
               <manifest>
@@ -863,7 +867,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.7</version>
+          <version>1.9.1</version>
           <executions>
             <execution>
               <id>remove-old-installers</id>
@@ -879,7 +883,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.5.1</version>
+          <version>2.9</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -922,7 +926,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
-          <version>3.1</version>
+          <version>3.3</version>
           <dependencies>
             <dependency>
               <groupId>org.apache.cloudstack</groupId>
@@ -946,6 +950,16 @@
             </execution>
           </executions>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.18.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>2.18.1</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -983,7 +997,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.3</version>
+        <version>3.4</version>
       </plugin>
     </plugins>
   </reporting>
diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index a993237f212..afba4a5520e 100644
--- a/tools/checkstyle/pom.xml
+++ b/tools/checkstyle/pom.xml
@@ -25,12 +25,18 @@
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>checkstyle</artifactId>
     <version>4.6.0-SNAPSHOT</version>
+    
+    
+    <prerequisites>
+      <maven>3.0.4</maven>
+    </prerequisites>
+    
     <build>
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.11</version>
+          <version>2.13</version>
           <executions>
             <execution>
               <phase>none</phase>