From c716a75416b8ef01f2c4e233f1340f3dbf33198e Mon Sep 17 00:00:00 2001
From: tedyu <yuzhihong@gmail.com>
Date: Thu, 5 May 2016 15:41:26 -0500
Subject: [PATCH] HBASE-15767 upgrade httpclient to 4.3.6

Signed-off-by: Sean Busbey <busbey@apache.org>
---
 hbase-rest/pom.xml   | 4 ++--
 hbase-server/pom.xml | 4 ++--
 pom.xml              | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index 7bacf95062b..a66be01eebc 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -270,8 +270,8 @@
       <artifactId>commons-cli</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 26314173622..9532d1e6ac7 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -395,8 +395,8 @@
        <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
     </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
diff --git a/pom.xml b/pom.xml
index cf6501c6f3c..0b3c61a0dc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1213,7 +1213,7 @@
     <disruptor.version>3.3.0</disruptor.version>
     <!-- Do not use versions earlier than 3.2.2 due to a security vulnerability -->
     <collections.version>3.2.2</collections.version>
-    <httpclient.version>3.1</httpclient.version>
+    <httpclient.version>4.3.6</httpclient.version>
     <metrics-core.version>3.1.2</metrics-core.version>
     <guava.version>12.0.1</guava.version>
     <jsr305.version>1.3.9</jsr305.version>
@@ -1502,8 +1502,8 @@
         <version>${collections.version}</version>
       </dependency>
       <dependency>
-        <groupId>commons-httpclient</groupId>
-        <artifactId>commons-httpclient</artifactId>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
         <version>${httpclient.version}</version>
       </dependency>
       <dependency>