From 6dfff89f7a31087c03f62de03ac952974ec30505 Mon Sep 17 00:00:00 2001
From: Mark Grover <mgrover@cloudera.com>
Date: Fri, 20 Nov 2015 15:46:24 -0800
Subject: [PATCH 1/2] Fixing httpclient and httpcore depedency issues related
 to docker-client

---
 docker-integration-tests/pom.xml | 12 ++++++++++++
 pom.xml                          | 16 ++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/docker-integration-tests/pom.xml b/docker-integration-tests/pom.xml
index dee0c4aa37ae8..5552602766547 100644
--- a/docker-integration-tests/pom.xml
+++ b/docker-integration-tests/pom.xml
@@ -71,6 +71,18 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>4.4.1</version>
+      <scope>test</scope>
+    </dependency>
     <!-- Necessary in order to avoid errors in log messages: -->
     <dependency>
       <groupId>com.google.guava</groupId>
diff --git a/pom.xml b/pom.xml
index ad849112ce76c..a807bf84922c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -810,6 +810,22 @@
             <artifactId>guava</artifactId>
             <groupId>com.google.guava</groupId>
           </exclusion>
+          <exclusion>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>httpclient</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>

From 73a3182e2e723bd69c64498ef260aac96f419af0 Mon Sep 17 00:00:00 2001
From: Mark Grover <mgrover@cloudera.com>
Date: Tue, 8 Dec 2015 19:00:07 -0800
Subject: [PATCH 2/2] Adding MySQL and PostgreSQL drivers as dependencies for
 use in docker tests. Also, adding the same driver depedencies in dependency
 management section of root pom so they can be shared amongst various modules
 (e.g. sql)

---
 docker-integration-tests/pom.xml | 10 ++++++++++
 pom.xml                          | 12 ++++++++++++
 sql/core/pom.xml                 |  2 --
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/docker-integration-tests/pom.xml b/docker-integration-tests/pom.xml
index 5552602766547..39d3f344615e1 100644
--- a/docker-integration-tests/pom.xml
+++ b/docker-integration-tests/pom.xml
@@ -121,6 +121,16 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <scope>test</scope>
+    </dependency>
     <!-- Jersey dependencies, used to override version.
      See https://github.com/apache/spark/pull/9503#issuecomment-154369560 for
      background on why we need to use a newer Jersey only in this test module;
diff --git a/pom.xml b/pom.xml
index f5abe8468af4d..c560e13641c6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -828,6 +828,18 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>mysql</groupId>
+        <artifactId>mysql-connector-java</artifactId>
+        <version>5.1.34</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.postgresql</groupId>
+        <artifactId>postgresql</artifactId>
+        <version>9.3-1102-jdbc41</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.curator</groupId>
         <artifactId>curator-recipes</artifactId>
diff --git a/sql/core/pom.xml b/sql/core/pom.xml
index 9fd6b5a07ec86..06841b0945624 100644
--- a/sql/core/pom.xml
+++ b/sql/core/pom.xml
@@ -91,13 +91,11 @@
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <version>5.1.34</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>9.3-1102-jdbc41</version>
       <scope>test</scope>
     </dependency>
     <dependency>