Merge -r 1187061:1187062 from trunk to branch. FIXES: MAPREDUCE-3204

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190668 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -1811,6 +1811,8 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-3199. Fixed pom files to include correct log4j configuration for
     tests. (vinodkv)
 
+    MAPREDUCE-3204. mvn site:site fails on MapReduce. (tucu)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

hadoop-project/pom.xml

@@ -469,7 +469,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>2.1.1</version>
+          <version>2.2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>

pom.xml

@@ -100,6 +100,11 @@
           <artifactId>maven-antrun-plugin</artifactId>
           <version>1.6</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
       </plugins>
     </pluginManagement>