From 891e1b0e3650b6ad5ded7b83b91c5dfc68af19be Mon Sep 17 00:00:00 2001
From: Chris Nauroth <cnauroth@apache.org>
Date: Sat, 14 Sep 2013 05:23:24 +0000
Subject: [PATCH] HADOOP-9557. hadoop-client excludes commons-httpclient.
 Contributed by Lohit Vijayarenu.

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

diff --git a/hadoop-client/pom.xml b/hadoop-client/pom.xml
index 1e2c7367b2..9884480e34 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-httpclient</groupId>
-          <artifactId>commons-httpclient</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>tomcat</groupId>
           <artifactId>jasper-compiler</artifactId>
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 0fb77019d5..4dc61be9ae 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -465,6 +465,9 @@ Release 2.1.1-beta - UNRELEASED
 
     HADOOP-9960. Upgrade Jersey version to 1.9. (Karthik Kambatla via atm)
 
+    HADOOP-9557. hadoop-client excludes commons-httpclient. (Lohit Vijayarenu via
+    cnauroth)
+
 Release 2.1.0-beta - 2013-08-22
 
   INCOMPATIBLE CHANGES