From 9b7617a909cce724792e6c9e4522d71ebc89168d Mon Sep 17 00:00:00 2001
From: Thomas White <tomwhite@apache.org>
Date: Sat, 17 Dec 2011 00:09:04 +0000
Subject: [PATCH] HDFS-2640. Javadoc generation hangs.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1215354 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++
 hadoop-hdfs-project/hadoop-hdfs/pom.xml     | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 86d1b32efec..ac1c8ffce96 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -265,6 +265,8 @@ Release 0.23.1 - UNRELEASED
     HDFS-2649. eclipse:eclipse build fails for hadoop-hdfs-httpfs.
     (Jason Lowe via eli)
 
+    HDFS-2640. Javadoc generation hangs. (tomwhite)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 835b15a465d..83c519cc4a1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -320,6 +320,13 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <excludePackageNames>org.apache.hadoop.hdfs.protocol.proto</excludePackageNames>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>