From 9da626af410cf558d53bd7103a7651034f82fe5c Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Thu, 6 Sep 2012 19:03:37 +0000
Subject: [PATCH] HDFS-3895. hadoop-client must include commons-cli (tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1381719 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-client/pom.xml                          | 4 ----
 hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml | 4 ----
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt    | 2 ++
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/hadoop-client/pom.xml b/hadoop-client/pom.xml
index 2474652fac..0f6e56dd12 100644
--- a/hadoop-client/pom.xml
+++ b/hadoop-client/pom.xml
@@ -39,10 +39,6 @@
       <artifactId>hadoop-common</artifactId>
       <scope>compile</scope>
       <exclusions>
-        <exclusion>
-          <groupId>commons-cli</groupId>
-          <artifactId>commons-cli</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>commons-httpclient</groupId>
           <artifactId>commons-httpclient</artifactId>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
index 6588c4033b..004ac20821 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -103,10 +103,6 @@
           <groupId>javax.xml.stream</groupId>
           <artifactId>stax-api</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>commons-cli</groupId>
-          <artifactId>commons-cli</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>commons-httpclient</groupId>
           <artifactId>commons-httpclient</artifactId>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index aa13805c01..1fb5a83c67 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -730,6 +730,8 @@ Branch-2 ( Unreleased changes )
     (Andy Isaacson via eli)
 
     HDFS-3809. Make BKJM use protobufs for all serialization with ZK.(Ivan Kelly via umamahesh)
+
+    HDFS-3895. hadoop-client must include commons-cli (tucu)
     
   BREAKDOWN OF HDFS-3042 SUBTASKS