From 220317c188657b91d8530ff7c78f1614ae1e161e Mon Sep 17 00:00:00 2001
From: Robert Joseph Evans <bobby@apache.org>
Date: Fri, 3 Feb 2012 16:33:18 +0000
Subject: [PATCH]  svn merge -c 1240232 fixes HADOOP-8018

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240236 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
 hadoop-project/pom.xml                          | 2 +-
 pom.xml                                         | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 2c8d36f2e3c..848e8706619 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -98,6 +98,9 @@ Release 0.23.1 - Unreleased
   OPTIMIZATIONS
 
   BUG FIXES
+   HADOOP-8018.  Hudson auto test for HDFS has started throwing javadoc
+   (Jon Eagles via bobby)
+
    HADOOP-8001  ChecksumFileSystem's rename doesn't correctly handle checksum
    files. (Daryn Sharp via bobby)
 
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index d391151403a..dbc0459a6c4 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -667,7 +667,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.7</version>
+          <version>2.8.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 3ecaf8832ba..1de33ae5391 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,7 +187,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8</version>
+        <version>2.8.1</version>
         <reportSets>
           <reportSet>
             <id>aggregate</id>