From 52b1ccf778b346ef73e93474db7c57b7c079aad3 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Mon, 26 Aug 2019 22:33:08 +0200
Subject: [PATCH] Remove commons-httpclient

---
 extensions-contrib/cassandra-storage/pom.xml | 4 ----
 extensions-core/druid-kerberos/pom.xml       | 4 ----
 extensions-core/hdfs-storage/pom.xml         | 8 --------
 pom.xml                                      | 6 ------
 4 files changed, 22 deletions(-)

diff --git a/extensions-contrib/cassandra-storage/pom.xml b/extensions-contrib/cassandra-storage/pom.xml
index 5dde6547574b..8b04ce808990 100644
--- a/extensions-contrib/cassandra-storage/pom.xml
+++ b/extensions-contrib/cassandra-storage/pom.xml
@@ -69,10 +69,6 @@
                     <groupId>commons-cli</groupId>
                     <artifactId>commons-cli</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>commons-httpclient</groupId>
-                    <artifactId>commons-httpclient</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>log4j</groupId>
                     <artifactId>log4j</artifactId>
diff --git a/extensions-core/druid-kerberos/pom.xml b/extensions-core/druid-kerberos/pom.xml
index 8a449d059d98..4181546770a8 100644
--- a/extensions-core/druid-kerberos/pom.xml
+++ b/extensions-core/druid-kerberos/pom.xml
@@ -57,10 +57,6 @@
           <groupId>commons-cli</groupId>
           <artifactId>commons-cli</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>commons-httpclient</groupId>
-          <artifactId>commons-httpclient</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>commons-codec</groupId>
           <artifactId>commons-codec</artifactId>
diff --git a/extensions-core/hdfs-storage/pom.xml b/extensions-core/hdfs-storage/pom.xml
index 9fee70cdbc9f..8bf691556762 100644
--- a/extensions-core/hdfs-storage/pom.xml
+++ b/extensions-core/hdfs-storage/pom.xml
@@ -49,10 +49,6 @@
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
               </exclusion>
-              <exclusion>
-                <groupId>commons-httpclient</groupId>
-                <artifactId>commons-httpclient</artifactId>
-              </exclusion>
               <exclusion>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
@@ -161,10 +157,6 @@
               <groupId>commons-cli</groupId>
               <artifactId>commons-cli</artifactId>
             </exclusion>
-            <exclusion>
-              <groupId>commons-httpclient</groupId>
-              <artifactId>commons-httpclient</artifactId>
-            </exclusion>
             <exclusion>
               <groupId>log4j</groupId>
               <artifactId>log4j</artifactId>
diff --git a/pom.xml b/pom.xml
index e35c0783f6a2..496c82ad948a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,6 @@
         <!-- jackson 2.7.x causes injection error and 2.8.x can't be used because avatica is using 2.6.3 -->
         <jackson.version>2.6.7</jackson.version>
         <log4j.version>2.5</log4j.version>
-        <!-- HttpClient has not yet been ported to Netty 4.x -->
         <netty3.version>3.10.6.Final</netty3.version>
         <!-- Spark updated in https://github.com/apache/spark/pull/19884 -->
         <netty4.version>4.1.30.Final</netty4.version>
@@ -199,11 +198,6 @@
                 <artifactId>commons-codec</artifactId>
                 <version>1.12</version>
             </dependency>
-            <dependency>
-                <groupId>commons-httpclient</groupId>
-                <artifactId>commons-httpclient</artifactId>
-                <version>3.1</version>
-            </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>