From f885fdc98e35ee3f01ae517e158a2b4daf347bef Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Fri, 28 Oct 2011 23:18:18 +0000
Subject: [PATCH] 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 | 2 ++
 hadoop-project/pom.xml               | 2 +-
 pom.xml                              | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 470e5d66d69..a4450f267f4 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/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
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 55185d61c5e..37010918ef7 100644
--- a/hadoop-project/pom.xml
+++ b/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>
diff --git a/pom.xml b/pom.xml
index d99c723a1d6..d4a83689f9b 100644
--- a/pom.xml
+++ b/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>