Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Alejandro Abdelnur 2011-10-28 23:18:18 +00:00
parent 073139bb57
commit f885fdc98e
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/CHANGES.txt
View File

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

2
hadoop-project/pom.xml
View File

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

5
pom.xml
View File

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