From c7824e8e9e57ac007807afbf7e9ff5a6be68e254 Mon Sep 17 00:00:00 2001
From: Masatake Iwasaki <iwasakims@apache.org>
Date: Mon, 29 Feb 2016 18:20:14 +0900
Subject: [PATCH] HADOOP-12552. Fix undeclared/unused dependency to httpclient
 (iwasakims)

(cherry picked from commit 809ebc0b146135d86433e9c7bfa17e294b7928f2)
---
 hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
 hadoop-common-project/hadoop-common/pom.xml     | 4 ++--
 hadoop-tools/hadoop-openstack/pom.xml           | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 1fe62596eef..03a844f8438 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -9,6 +9,8 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12416. Trash messages should be handled by Logger instead of being
     delivered on System.out. (Mingliang Liu via aajisaka)
 
+    HADOOP-12552. Fix undeclared/unused dependency to httpclient (iwasakims)
+
   NEW FEATURES
 
     HADOOP-11226. Add a configuration to set ipc.Client's traffic class with
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index ccbe0d647e6..28fcdaf3e40 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -64,8 +64,8 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/hadoop-tools/hadoop-openstack/pom.xml b/hadoop-tools/hadoop-openstack/pom.xml
index 3e6ed6f4dad..18d754f6200 100644
--- a/hadoop-tools/hadoop-openstack/pom.xml
+++ b/hadoop-tools/hadoop-openstack/pom.xml
@@ -113,8 +113,8 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
       <scope>compile</scope>
     </dependency>