Author: tucu
Date: Fri Oct 28 23:18:18 2011
New Revision: 1190668
URL: http://svn.apache.org/viewvc?rev=1190668&view=rev
Log:
Merge -r 1187061:1187062 from trunk to branch. FIXES: MAPREDUCE-3204
Modified:
hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
hadoop/common/branches/branch-0.23/pom.xml
Modified: hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project/pom.xml?rev=1190668&r1=1190667&r2=1190668&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-project/pom.xml Fri Oct 28
23:18:18 2011
@@ -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>
Modified: hadoop/common/branches/branch-0.23/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/pom.xml?rev=1190668&r1=1190667&r2=1190668&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/pom.xml Fri Oct 28 23:18:18 2011
@@ -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>
