From ca2aef540954d2a2b29c00fd792e1f73c8600e6d Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 16:42:25 -0700
Subject: [PATCH 01/35] Update test-dependeices script to not accidentally
 filter out Spark hive deps.

---
 dev/deps/spark-deps-hadoop-2.2 | 6 ++++++
 dev/deps/spark-deps-hadoop-2.3 | 6 ++++++
 dev/deps/spark-deps-hadoop-2.4 | 6 ++++++
 dev/deps/spark-deps-hadoop-2.6 | 6 ++++++
 dev/deps/spark-deps-hadoop-2.7 | 6 ++++++
 dev/test-dependencies.sh       | 2 +-
 6 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2
index 2c24366cc3a15..a382871ea7462 100644
--- a/dev/deps/spark-deps-hadoop-2.2
+++ b/dev/deps/spark-deps-hadoop-2.2
@@ -78,6 +78,12 @@ hadoop-yarn-client-2.2.0.jar
 hadoop-yarn-common-2.2.0.jar
 hadoop-yarn-server-common-2.2.0.jar
 hadoop-yarn-server-web-proxy-2.2.0.jar
+hive-beeline-1.2.1.spark.jar
+hive-cli-1.2.1.spark.jar
+hive-exec-1.2.1.spark.jar
+hive-jdbc-1.2.1.spark.jar
+hive-metastore-1.2.1.spark.jar
+hive-service-1.2.1.spark.jar
 httpclient-4.3.2.jar
 httpcore-4.3.2.jar
 ivy-2.4.0.jar
diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3
index e9cb0d8f3eac2..a56b16a81247f 100644
--- a/dev/deps/spark-deps-hadoop-2.3
+++ b/dev/deps/spark-deps-hadoop-2.3
@@ -73,6 +73,12 @@ hadoop-yarn-client-2.3.0.jar
 hadoop-yarn-common-2.3.0.jar
 hadoop-yarn-server-common-2.3.0.jar
 hadoop-yarn-server-web-proxy-2.3.0.jar
+hive-beeline-1.2.1.spark.jar
+hive-cli-1.2.1.spark.jar
+hive-exec-1.2.1.spark.jar
+hive-jdbc-1.2.1.spark.jar
+hive-metastore-1.2.1.spark.jar
+hive-service-1.2.1.spark.jar
 httpclient-4.3.2.jar
 httpcore-4.3.2.jar
 ivy-2.4.0.jar
diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4
index d8d1840da5531..be0665a1b1325 100644
--- a/dev/deps/spark-deps-hadoop-2.4
+++ b/dev/deps/spark-deps-hadoop-2.4
@@ -73,6 +73,12 @@ hadoop-yarn-client-2.4.0.jar
 hadoop-yarn-common-2.4.0.jar
 hadoop-yarn-server-common-2.4.0.jar
 hadoop-yarn-server-web-proxy-2.4.0.jar
+hive-beeline-1.2.1.spark.jar
+hive-cli-1.2.1.spark.jar
+hive-exec-1.2.1.spark.jar
+hive-jdbc-1.2.1.spark.jar
+hive-metastore-1.2.1.spark.jar
+hive-service-1.2.1.spark.jar
 httpclient-4.3.2.jar
 httpcore-4.3.2.jar
 ivy-2.4.0.jar
diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6
index 8beede1e38d28..e682645360d22 100644
--- a/dev/deps/spark-deps-hadoop-2.6
+++ b/dev/deps/spark-deps-hadoop-2.6
@@ -78,6 +78,12 @@ hadoop-yarn-client-2.6.0.jar
 hadoop-yarn-common-2.6.0.jar
 hadoop-yarn-server-common-2.6.0.jar
 hadoop-yarn-server-web-proxy-2.6.0.jar
+hive-beeline-1.2.1.spark.jar
+hive-cli-1.2.1.spark.jar
+hive-exec-1.2.1.spark.jar
+hive-jdbc-1.2.1.spark.jar
+hive-metastore-1.2.1.spark.jar
+hive-service-1.2.1.spark.jar
 htrace-core-3.0.4.jar
 httpclient-4.3.2.jar
 httpcore-4.3.2.jar
diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7
index a9d814f944872..28c8f0630bf99 100644
--- a/dev/deps/spark-deps-hadoop-2.7
+++ b/dev/deps/spark-deps-hadoop-2.7
@@ -78,6 +78,12 @@ hadoop-yarn-client-2.7.0.jar
 hadoop-yarn-common-2.7.0.jar
 hadoop-yarn-server-common-2.7.0.jar
 hadoop-yarn-server-web-proxy-2.7.0.jar
+hive-beeline-1.2.1.spark.jar
+hive-cli-1.2.1.spark.jar
+hive-exec-1.2.1.spark.jar
+hive-jdbc-1.2.1.spark.jar
+hive-metastore-1.2.1.spark.jar
+hive-service-1.2.1.spark.jar
 htrace-core-3.1.0-incubating.jar
 httpclient-4.3.2.jar
 httpcore-4.3.2.jar
diff --git a/dev/test-dependencies.sh b/dev/test-dependencies.sh
index 924b55287c2dc..3a37b72ec44f7 100755
--- a/dev/test-dependencies.sh
+++ b/dev/test-dependencies.sh
@@ -81,7 +81,7 @@ for HADOOP_PROFILE in "${HADOOP_PROFILES[@]}"; do
   $MVN $HADOOP2_MODULE_PROFILES -P$HADOOP_PROFILE dependency:build-classpath -pl assembly \
     | grep "Building Spark Project Assembly" -A 5 \
     | tail -n 1 | tr ":" "\n" | rev | cut -d "/" -f 1 | rev | sort \
-    | grep -v spark > dev/pr-deps/spark-deps-$HADOOP_PROFILE
+    | grep -v ^spark > dev/pr-deps/spark-deps-$HADOOP_PROFILE
 done
 
 if [[ $@ == **replace-manifest** ]]; then

From 87dd382710af1b2d9e89025590f66d9192154a1e Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 17:21:34 -0700
Subject: [PATCH 02/35] Remove explicit jodd dependency

---
 pom.xml          | 6 ------
 sql/hive/pom.xml | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 984b2859efbec..b14d217d6ad30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,7 +174,6 @@
     <janino.version>2.7.8</janino.version>
     <jersey.version>1.9</jersey.version>
     <joda.version>2.9</joda.version>
-    <jodd.version>3.5.2</jodd.version>
     <jsr305.version>1.3.9</jsr305.version>
     <libthrift.version>0.9.2</libthrift.version>
     <antlr4.version>4.5.2-1</antlr4.version>
@@ -1717,11 +1716,6 @@
         <artifactId>joda-time</artifactId>
         <version>${joda.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.jodd</groupId>
-        <artifactId>jodd-core</artifactId>
-        <version>${jodd.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.datanucleus</groupId>
         <artifactId>datanucleus-core</artifactId>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index 61504becf1f38..f77c54283f8b1 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -145,10 +145,6 @@
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jodd</groupId>
-      <artifactId>jodd-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>

From ed40fa3d11a896ef08dcfb484488b1ad3628117a Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 17:25:22 -0700
Subject: [PATCH 03/35] Remove explicit Datanucleus dependency.

---
 pom.xml          | 6 ------
 sql/hive/pom.xml | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index b14d217d6ad30..6dbb9e1f19ff1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,7 +170,6 @@
     <commons-lang2.version>2.6</commons-lang2.version>
     <!-- org.apache.commons/commons-lang3/-->
     <commons-lang3.version>3.3.2</commons-lang3.version>
-    <datanucleus-core.version>3.2.10</datanucleus-core.version>
     <janino.version>2.7.8</janino.version>
     <jersey.version>1.9</jersey.version>
     <joda.version>2.9</joda.version>
@@ -1716,11 +1715,6 @@
         <artifactId>joda-time</artifactId>
         <version>${joda.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.datanucleus</groupId>
-        <artifactId>datanucleus-core</artifactId>
-        <version>${datanucleus-core.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.thrift</groupId>
         <artifactId>libthrift</artifactId>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index f77c54283f8b1..72d224afc069f 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -149,10 +149,6 @@
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.datanucleus</groupId>
-      <artifactId>datanucleus-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>

From 38ed734c787692c59ff67e363e0d57e9b7348972 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 17:46:29 -0700
Subject: [PATCH 04/35] Add Maven Enforcer rule to document org.hsqldb:hsqldb
 exclusion

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6dbb9e1f19ff1..0dafa9c311b95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1673,9 +1673,6 @@
             <groupId>org.codehaus.janino</groupId>
             <artifactId>janino</artifactId>
           </exclusion>
-          <!-- hsqldb interferes with the use of derby as the default db
-            in hive's use of datanucleus.
-          -->
           <exclusion>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
@@ -1793,6 +1790,9 @@
                       -->
                       <exclude>org.jboss.netty</exclude>
                       <exclude>org.codehaus.groovy</exclude>
+                      <!-- hsqldb interferes with the use of Derby as the default db
+                           in Hive's use of Datanucleus. -->
+                      <exclude>org.hsqldb:hsqldb</exclude>
                     </excludes>
                     <searchTransitive>true</searchTransitive>
                   </bannedDependencies>

From aec2f209abc6aa358564bf6669b6c86a2c16b3dc Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 18:07:02 -0700
Subject: [PATCH 05/35] Remove seemingly-unnecessary Calcite exclude.

---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0dafa9c311b95..22fc372af3f5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1251,11 +1251,6 @@
             <groupId>org.apache.avro</groupId>
             <artifactId>avro-mapred</artifactId>
           </exclusion>
-          <!--  this is needed and must be explicitly included later-->
-          <exclusion>
-            <groupId>org.apache.calcite</groupId>
-            <artifactId>calcite-core</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.curator</groupId>
             <artifactId>apache-curator</artifactId>

From 02dec1be34e7bfbe7079d6bb35ea55ea6d9a5467 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 18:18:13 -0700
Subject: [PATCH 06/35] Remove explicit Calcite dependency.

It seems that the explicit dep. was pulling our version of Janino's commons-compiler
a bit lower than it should have been.
---
 dev/deps/spark-deps-hadoop-2.2 | 2 +-
 dev/deps/spark-deps-hadoop-2.3 | 2 +-
 dev/deps/spark-deps-hadoop-2.4 | 2 +-
 dev/deps/spark-deps-hadoop-2.6 | 2 +-
 dev/deps/spark-deps-hadoop-2.7 | 2 +-
 pom.xml                        | 3 ---
 sql/hive/pom.xml               | 8 --------
 7 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2
index a382871ea7462..0e2b94553bb72 100644
--- a/dev/deps/spark-deps-hadoop-2.2
+++ b/dev/deps/spark-deps-hadoop-2.2
@@ -27,7 +27,7 @@ commons-beanutils-core-1.8.0.jar
 commons-cli-1.2.jar
 commons-codec-1.10.jar
 commons-collections-3.2.2.jar
-commons-compiler-2.7.6.jar
+commons-compiler-2.7.8.jar
 commons-compress-1.4.1.jar
 commons-configuration-1.6.jar
 commons-dbcp-1.4.jar
diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3
index a56b16a81247f..71efbdba68d4d 100644
--- a/dev/deps/spark-deps-hadoop-2.3
+++ b/dev/deps/spark-deps-hadoop-2.3
@@ -29,7 +29,7 @@ commons-beanutils-core-1.8.0.jar
 commons-cli-1.2.jar
 commons-codec-1.10.jar
 commons-collections-3.2.2.jar
-commons-compiler-2.7.6.jar
+commons-compiler-2.7.8.jar
 commons-compress-1.4.1.jar
 commons-configuration-1.6.jar
 commons-dbcp-1.4.jar
diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4
index be0665a1b1325..800d78f1de008 100644
--- a/dev/deps/spark-deps-hadoop-2.4
+++ b/dev/deps/spark-deps-hadoop-2.4
@@ -29,7 +29,7 @@ commons-beanutils-core-1.8.0.jar
 commons-cli-1.2.jar
 commons-codec-1.10.jar
 commons-collections-3.2.2.jar
-commons-compiler-2.7.6.jar
+commons-compiler-2.7.8.jar
 commons-compress-1.4.1.jar
 commons-configuration-1.6.jar
 commons-dbcp-1.4.jar
diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6
index e682645360d22..f41f92aea1ab5 100644
--- a/dev/deps/spark-deps-hadoop-2.6
+++ b/dev/deps/spark-deps-hadoop-2.6
@@ -33,7 +33,7 @@ commons-beanutils-core-1.8.0.jar
 commons-cli-1.2.jar
 commons-codec-1.10.jar
 commons-collections-3.2.2.jar
-commons-compiler-2.7.6.jar
+commons-compiler-2.7.8.jar
 commons-compress-1.4.1.jar
 commons-configuration-1.6.jar
 commons-dbcp-1.4.jar
diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7
index 28c8f0630bf99..6b074f67b3a44 100644
--- a/dev/deps/spark-deps-hadoop-2.7
+++ b/dev/deps/spark-deps-hadoop-2.7
@@ -33,7 +33,7 @@ commons-beanutils-core-1.8.0.jar
 commons-cli-1.2.jar
 commons-codec-1.10.jar
 commons-collections-3.2.2.jar
-commons-compiler-2.7.6.jar
+commons-compiler-2.7.8.jar
 commons-compress-1.4.1.jar
 commons-configuration-1.6.jar
 commons-dbcp-1.4.jar
diff --git a/pom.xml b/pom.xml
index 22fc372af3f5e..8ea95811220fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,6 @@
     <fasterxml.jackson.version>2.5.3</fasterxml.jackson.version>
     <snappy.version>1.1.2.4</snappy.version>
     <netlib.java.version>1.1.2</netlib.java.version>
-    <calcite.version>1.2.0-incubating</calcite.version>
     <commons-codec.version>1.10</commons-codec.version>
     <!-- org.apache.commons/commons-lang/-->
     <commons-lang2.version>2.6</commons-lang2.version>
@@ -1642,7 +1641,6 @@
       <dependency>
         <groupId>org.apache.calcite</groupId>
         <artifactId>calcite-core</artifactId>
-        <version>${calcite.version}</version>
         <exclusions>
           <exclusion>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -1681,7 +1679,6 @@
       <dependency>
         <groupId>org.apache.calcite</groupId>
         <artifactId>calcite-avatica</artifactId>
-        <version>${calcite.version}</version>
         <exclusions>
           <exclusion>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index 72d224afc069f..457b19ea3b583 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -120,14 +120,6 @@
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.calcite</groupId>
-      <artifactId>calcite-avatica</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.calcite</groupId>
-      <artifactId>calcite-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>

From 1cf73d4894be4ab6c7f75e417761307b1693c46c Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 18:25:27 -0700
Subject: [PATCH 07/35] Remove unused Joda dependency.

---
 dev/deps/spark-deps-hadoop-2.2 | 1 -
 dev/deps/spark-deps-hadoop-2.3 | 1 -
 dev/deps/spark-deps-hadoop-2.4 | 1 -
 dev/deps/spark-deps-hadoop-2.6 | 1 -
 dev/deps/spark-deps-hadoop-2.7 | 1 -
 pom.xml                        | 6 ------
 sql/hive/pom.xml               | 4 ----
 7 files changed, 15 deletions(-)

diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2
index 0e2b94553bb72..56bee436011aa 100644
--- a/dev/deps/spark-deps-hadoop-2.2
+++ b/dev/deps/spark-deps-hadoop-2.2
@@ -118,7 +118,6 @@ jettison-1.1.jar
 jetty-all-7.6.0.v20120127.jar
 jetty-util-6.1.26.jar
 jline-2.12.jar
-joda-time-2.9.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar
 json-20090211.jar
diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3
index 71efbdba68d4d..3eea9fc101e51 100644
--- a/dev/deps/spark-deps-hadoop-2.3
+++ b/dev/deps/spark-deps-hadoop-2.3
@@ -109,7 +109,6 @@ jetty-6.1.26.jar
 jetty-all-7.6.0.v20120127.jar
 jetty-util-6.1.26.jar
 jline-2.12.jar
-joda-time-2.9.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar
 json-20090211.jar
diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4
index 800d78f1de008..22d6e285d01df 100644
--- a/dev/deps/spark-deps-hadoop-2.4
+++ b/dev/deps/spark-deps-hadoop-2.4
@@ -110,7 +110,6 @@ jetty-6.1.26.jar
 jetty-all-7.6.0.v20120127.jar
 jetty-util-6.1.26.jar
 jline-2.12.jar
-joda-time-2.9.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar
 json-20090211.jar
diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6
index f41f92aea1ab5..9635a1952e93d 100644
--- a/dev/deps/spark-deps-hadoop-2.6
+++ b/dev/deps/spark-deps-hadoop-2.6
@@ -116,7 +116,6 @@ jetty-6.1.26.jar
 jetty-all-7.6.0.v20120127.jar
 jetty-util-6.1.26.jar
 jline-2.12.jar
-joda-time-2.9.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar
 json-20090211.jar
diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7
index 6b074f67b3a44..7c75c2e7c4660 100644
--- a/dev/deps/spark-deps-hadoop-2.7
+++ b/dev/deps/spark-deps-hadoop-2.7
@@ -116,7 +116,6 @@ jetty-6.1.26.jar
 jetty-all-7.6.0.v20120127.jar
 jetty-util-6.1.26.jar
 jline-2.12.jar
-joda-time-2.9.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar
 json-20090211.jar
diff --git a/pom.xml b/pom.xml
index 8ea95811220fb..d477063b84897 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,7 +171,6 @@
     <commons-lang3.version>3.3.2</commons-lang3.version>
     <janino.version>2.7.8</janino.version>
     <jersey.version>1.9</jersey.version>
-    <joda.version>2.9</joda.version>
     <jsr305.version>1.3.9</jsr305.version>
     <libthrift.version>0.9.2</libthrift.version>
     <antlr4.version>4.5.2-1</antlr4.version>
@@ -1699,11 +1698,6 @@
         <artifactId>janino</artifactId>
         <version>${janino.version}</version>
       </dependency>
-      <dependency>
-        <groupId>joda-time</groupId>
-        <artifactId>joda-time</artifactId>
-        <version>${joda.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.thrift</groupId>
         <artifactId>libthrift</artifactId>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index 457b19ea3b583..058db0c7722c3 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -133,10 +133,6 @@
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
     </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>

From e8409d02b67523806b81b5298cb74f53f982c4a1 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 18:34:50 -0700
Subject: [PATCH 08/35] Remove unnecessary Jackson excludes:

See https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Management

> "dependency management takes precedence over dependency mediation"
---
 pom.xml | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index d477063b84897..cfcbbba6dc228 100644
--- a/pom.xml
+++ b/pom.xml
@@ -756,10 +756,6 @@
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
@@ -1641,18 +1637,10 @@
         <groupId>org.apache.calcite</groupId>
         <artifactId>calcite-core</artifactId>
         <exclusions>
-          <exclusion>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -1679,18 +1667,10 @@
         <groupId>org.apache.calcite</groupId>
         <artifactId>calcite-avatica</artifactId>
         <exclusions>
-          <exclusion>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
       <dependency>

From bcd486792e33c6a2703de5d94d52db94f0484c4d Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 18:40:47 -0700
Subject: [PATCH 09/35] Remove unnecessary Jackson excludes.

---
 pom.xml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index cfcbbba6dc228..1ec70c703e0c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -560,6 +560,11 @@
         <artifactId>metrics-graphite</artifactId>
         <version>${codahale.metrics.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-core</artifactId>
+        <version>${fasterxml.jackson.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
@@ -1637,10 +1642,6 @@
         <groupId>org.apache.calcite</groupId>
         <artifactId>calcite-core</artifactId>
         <exclusions>
-          <exclusion>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -1663,16 +1664,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>org.apache.calcite</groupId>
-        <artifactId>calcite-avatica</artifactId>
-        <exclusions>
-          <exclusion>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
       <dependency>
         <groupId>org.codehaus.janino</groupId>
         <artifactId>janino</artifactId>

From 44ae3e07420a5164676d893ec96f083e01b9ae7a Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 18:42:55 -0700
Subject: [PATCH 10/35] Remove unnecessary jackson-mapper-asl direct dependency
 in Hive

---
 sql/hive/pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index 058db0c7722c3..b07cb3e0e67c3 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -124,10 +124,6 @@
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-    </dependency>
     <!-- transitive dependencies of hive-exec-core doesn't declare -->
     <dependency>
       <groupId>commons-codec</groupId>

From e5c221e6e1626c15ef53b9a3918569796adac465 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 18:49:20 -0700
Subject: [PATCH 11/35] Remove unnecessary httpclient exclusions.

---
 pom.xml          | 36 ------------------------------------
 sql/hive/pom.xml |  8 --------
 2 files changed, 44 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1ec70c703e0c8..e49d3ab32f9af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -689,18 +689,6 @@
             <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>
@@ -1325,14 +1313,6 @@
             <groupId>${hive.group}</groupId>
             <artifactId>hive-shims</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
@@ -1674,14 +1654,6 @@
         <artifactId>libthrift</artifactId>
         <version>${libthrift.version}</version>
         <exclusions>
-          <exclusion>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -1693,14 +1665,6 @@
         <artifactId>libfb303</artifactId>
         <version>${libthrift.version}</version>
         <exclusions>
-          <exclusion>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index b07cb3e0e67c3..2acfafebfc848 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -116,14 +116,6 @@
       <artifactId>avro-mapred</artifactId>
       <classifier>${avro.mapred.classifier}</classifier>
     </dependency>
-    <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
     <!-- transitive dependencies of hive-exec-core doesn't declare -->
     <dependency>
       <groupId>commons-codec</groupId>

From 3deb2c2af9cc6530d1c970480e725d710c02f782 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 19:15:06 -0700
Subject: [PATCH 12/35] Remove unnecessary jsr305 excludes.

---
 pom.xml          | 8 --------
 sql/hive/pom.xml | 4 ----
 2 files changed, 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index e49d3ab32f9af..ece0ff77e8e84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1411,10 +1411,6 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.avro</groupId>
             <artifactId>avro</artifactId>
@@ -1626,10 +1622,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.codehaus.janino</groupId>
             <artifactId>janino</artifactId>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index 2acfafebfc848..eb51855eed584 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -121,10 +121,6 @@
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>

From 7a24ae86d08f420b5a17a3ab52e2a2e6ae37008f Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 19:19:08 -0700
Subject: [PATCH 13/35] Clean up commons-codec excludes.

---
 pom.xml          | 12 ------------
 sql/hive/pom.xml |  4 ----
 2 files changed, 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index ece0ff77e8e84..db2afbce3c386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1226,10 +1226,6 @@
             <groupId>com.esotericsoftware.kryo</groupId>
             <artifactId>kryo</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
@@ -1407,10 +1403,6 @@
             <groupId>${hive.group}</groupId>
             <artifactId>hive-shims</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.avro</groupId>
             <artifactId>avro</artifactId>
@@ -1468,10 +1460,6 @@
             <groupId>${hive.group}</groupId>
             <artifactId>hive-shims</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-framework</artifactId>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index eb51855eed584..cd4071142f9c0 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -117,10 +117,6 @@
       <classifier>${avro.mapred.classifier}</classifier>
     </dependency>
     <!-- transitive dependencies of hive-exec-core doesn't declare -->
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>

From 55e7cc8e89b1ce3a8faa3e41f4b0affae5e8c8af Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 19:20:00 -0700
Subject: [PATCH 14/35] Remove commented-out portions of the Hive build.

---
 pom.xml          |  3 ---
 sql/hive/pom.xml | 30 ------------------------------
 2 files changed, 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index db2afbce3c386..5e893080272df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1186,9 +1186,6 @@
       <dependency>
         <groupId>${hive.group}</groupId>
         <artifactId>hive-exec</artifactId>
-<!--
-        <classifier>core</classifier>
--->
         <version>${hive.version}</version>
         <scope>${hive.deps.scope}</scope>
         <exclusions>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index cd4071142f9c0..43c8b37af923d 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -62,48 +62,18 @@
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-test-tags_${scala.binary.version}</artifactId>
     </dependency>
-<!--
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>${protobuf.version}</version>
-    </dependency>
--->
     <dependency>
       <groupId>${hive.group}</groupId>
       <artifactId>hive-cli</artifactId>
     </dependency>
-<!--
-    <dependency>
-      <groupId>${hive.group}</groupId>
-      <artifactId>hive-common</artifactId>
-    </dependency>
--->
     <dependency>
       <groupId>${hive.group}</groupId>
       <artifactId>hive-exec</artifactId>
-<!--
-      <classifier>core</classifier>
--->
     </dependency>
     <dependency>
       <groupId>${hive.group}</groupId>
       <artifactId>hive-metastore</artifactId>
     </dependency>
-    <!--
-        <dependency>
-          <groupId>${hive.group}</groupId>
-          <artifactId>hive-serde</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>${hive.group}</groupId>
-          <artifactId>hive-shims</artifactId>
-        </dependency>
-    -->
     <!-- hive-serde already depends on avro, but this brings in customized config of avro deps from parent -->
     <dependency>
       <groupId>org.apache.avro</groupId>

From 482840a31d1675bd9caf9a0c7aa14404db91fdbc Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 19:23:39 -0700
Subject: [PATCH 15/35] Remove unnecessary Janino exclude.

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5e893080272df..18345b3d14c83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1607,10 +1607,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.codehaus.janino</groupId>
-            <artifactId>janino</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>

From 9eb49f2afbb5460b2ddc0d71a23a425f1aa9f03c Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 19:28:18 -0700
Subject: [PATCH 16/35] Remove unnecessary libfb303 direct dependency.

---
 pom.xml          | 16 ----------------
 sql/hive/pom.xml |  5 -----
 2 files changed, 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 18345b3d14c83..dfdbb71be5ef6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1314,10 +1314,6 @@
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libfb303</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
@@ -1359,10 +1355,6 @@
             <groupId>${hive.group}</groupId>
             <artifactId>hive-shims</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libfb303</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
@@ -1408,10 +1400,6 @@
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libfb303</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -1465,10 +1453,6 @@
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libfb303</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index 43c8b37af923d..5c52223adb333 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -86,15 +86,10 @@
       <artifactId>avro-mapred</artifactId>
       <classifier>${avro.mapred.classifier}</classifier>
     </dependency>
-    <!-- transitive dependencies of hive-exec-core doesn't declare -->
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libfb303</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.scalacheck</groupId>
       <artifactId>scalacheck_${scala.binary.version}</artifactId>

From 35d539d6c58292739c256fba8aa089a1097a7b2e Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 19:35:00 -0700
Subject: [PATCH 17/35] Remove a bunch of unnecessary logging-related excludes.

---
 pom.xml | 98 ---------------------------------------------------------
 1 file changed, 98 deletions(-)

diff --git a/pom.xml b/pom.xml
index dfdbb71be5ef6..5d621a2c8e448 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1072,18 +1072,6 @@
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -1128,18 +1116,6 @@
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -1164,18 +1140,6 @@
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -1255,18 +1219,6 @@
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -1318,18 +1270,6 @@
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -1367,14 +1307,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
 
@@ -1400,18 +1332,6 @@
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -1497,18 +1417,6 @@
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -1621,12 +1529,6 @@
         <groupId>org.apache.thrift</groupId>
         <artifactId>libfb303</artifactId>
         <version>${libthrift.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.antlr</groupId>

From 805f55be217f78df4288f4c91568487e4758c516 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 19:35:37 -0700
Subject: [PATCH 18/35] Remove a stray httpclient exclude.

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5d621a2c8e448..c746754e3b4ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1187,10 +1187,6 @@
             <groupId>com.esotericsoftware.kryo</groupId>
             <artifactId>kryo</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.avro</groupId>
             <artifactId>avro-mapred</artifactId>

From 277e56a5e7a43dd73e49df7eb2e3efbd291d8257 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 20:06:57 -0700
Subject: [PATCH 19/35] Document org.ow2.asm exclusions.

---
 pom.xml       | 40 ++++++++++++++++++++++++++--------------
 tools/pom.xml | 10 ++++++++++
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index c746754e3b4ea..6b6e932314a43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -272,11 +272,7 @@
         <exclusions>
           <exclusion>
             <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-commons</artifactId>
+            <artifactId>*</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -287,11 +283,7 @@
         <exclusions>
           <exclusion>
             <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-commons</artifactId>
+            <artifactId>*</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -693,6 +685,21 @@
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
           </exclusion>
+          <!-- ASM is actually relocated inside of the docker-client JAR but is not relocated.
+               Ordinarily, this would be a problem but in our case it's fine because this package
+               is only used in a handful of unit tests which are isolated to their own Maven
+               project. For more details, see https://github.com/spotify/docker-client/pull/272.
+               We need to add these exclusions here because the 'shaded' classifier only affects
+               the JAR contents and does not impact the resolution of transitive dependencies.
+               These exclusions are here to make Maven Enforcer happy. -->
+          <exclusion>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -751,7 +758,7 @@
           </exclusion>
           <exclusion>
             <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
+            <artifactId>*</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.jboss.netty</groupId>
@@ -879,7 +886,7 @@
           </exclusion>
           <exclusion>
             <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
+            <artifactId>*</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.jboss.netty</groupId>
@@ -903,7 +910,7 @@
           </exclusion>
           <exclusion>
             <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
+            <artifactId>*</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.jboss.netty</groupId>
@@ -932,7 +939,7 @@
           </exclusion>
           <exclusion>
             <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
+            <artifactId>*</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.jboss.netty</groupId>
@@ -1569,6 +1576,11 @@
                       <!-- hsqldb interferes with the use of Derby as the default db
                            in Hive's use of Datanucleus. -->
                       <exclude>org.hsqldb:hsqldb</exclude>
+                      <!-- Our direct ASM dependency is via a shaded JAR, but our transitive deps.
+                           depend on a mixture of ASM artifacts which publish the same classes
+                           in different artifacts. To avoid hard-to-debug conflicts, we choose to
+                           exclude org.ow2.asm (ASM 4) in favor of asm.asm (ASM 3). -->
+                      <exclude>org.ow2.asm</exclude>
                     </excludes>
                     <searchTransitive>true</searchTransitive>
                   </bannedDependencies>
diff --git a/tools/pom.xml b/tools/pom.xml
index 9bb20e1381067..3898b5d48185c 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -71,6 +71,16 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
       </plugin>
+      <!-- This project is only used to hold the MiMa exclude generator, so we don't care
+           whether normally-banned dependencies are used here. Therefore, skpi enforcer: -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.4.1</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>

From 4f7c0c55e074d51822690bfdeafef1a9a37c8282 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 20:21:07 -0700
Subject: [PATCH 20/35] Clarify comments surrounding Hive's Avro dep.
 classifier.

---
 pom.xml          | 3 +++
 sql/hive/pom.xml | 8 --------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6b6e932314a43..ca6cce0f9bbb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -832,6 +832,9 @@
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-mapred</artifactId>
         <version>${avro.version}</version>
+        <!-- use the build matching the hadoop api of avro-mapred (i.e. no classifier for hadoop 1
+             API, adoop2 classifier for hadoop 2 API. avro-mapred is a dependency of
+             org.spark-project.hive:hive-serde -->
         <classifier>${avro.mapred.classifier}</classifier>
         <scope>${hive.deps.scope}</scope>
         <exclusions>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index 5c52223adb333..7accdb7f9f00e 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -74,18 +74,10 @@
       <groupId>${hive.group}</groupId>
       <artifactId>hive-metastore</artifactId>
     </dependency>
-    <!-- hive-serde already depends on avro, but this brings in customized config of avro deps from parent -->
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
     </dependency>
-    <!-- use the build matching the hadoop api of avro-mapred (i.e. no classifier for hadoop 1 API,
-    hadoop2 classifier for hadoop 2 API. avro-mapred is a dependency of org.spark-project.hive:hive-serde -->
-    <dependency>
-      <groupId>org.apache.avro</groupId>
-      <artifactId>avro-mapred</artifactId>
-      <classifier>${avro.mapred.classifier}</classifier>
-    </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>

From 1abd1f0b6e118eeabcc6e20ef0d423fe06d4beda Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 22:01:31 -0700
Subject: [PATCH 21/35] Remove unnecessary io.netty exclusions; add clarifying
 comment.

---
 core/pom.xml |  4 ----
 pom.xml      | 30 ++++++------------------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 4c7e3a36620a9..a5116e63d8eed 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -211,10 +211,6 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-all</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.clearspring.analytics</groupId>
       <artifactId>stream</artifactId>
diff --git a/pom.xml b/pom.xml
index ca6cce0f9bbb8..0b8533608a5a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -409,10 +409,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
       <!-- Added for selenium only, and should match its dependent version: -->
@@ -517,11 +513,13 @@
         <artifactId>netty-all</artifactId>
         <version>4.0.29.Final</version>
       </dependency>
+      <!-- Spark 2.x doesn't have a direct dependency on io.netty:netty, but we leave this
+           entry in order to prevent a downgrade of our transitive io.netty:netty dependency -->
       <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty</artifactId>
-        <version>3.8.0.Final</version>
-      </dependency>
+         <groupId>io.netty</groupId>
+         <artifactId>netty</artifactId>
+         <version>3.8.0.Final</version>
+       </dependency>
       <dependency>
         <groupId>org.apache.derby</groupId>
         <artifactId>derby</artifactId>
@@ -798,10 +796,6 @@
         <version>${avro.version}</version>
         <scope>${hadoop.deps.scope}</scope>
         <exclusions>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
@@ -838,10 +832,6 @@
         <classifier>${avro.mapred.classifier}</classifier>
         <scope>${hive.deps.scope}</scope>
         <exclusions>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
@@ -1463,10 +1453,6 @@
         <version>${flume.version}</version>
         <scope>${flume.deps.scope}</scope>
         <exclusions>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.flume</groupId>
             <artifactId>flume-ng-auth</artifactId>
@@ -1487,10 +1473,6 @@
         <version>${flume.version}</version>
         <scope>${flume.deps.scope}</scope>
         <exclusions>
-          <exclusion>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>

From 8eb56cd322b929c6cde271b6516879b7096bafc0 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 22:06:44 -0700
Subject: [PATCH 22/35] Add enforcer rule for excluding
 javax.servlet:servlet-api

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 0b8533608a5a7..d5ceff5addb3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1558,6 +1558,7 @@
                       -->
                       <exclude>org.jboss.netty</exclude>
                       <exclude>org.codehaus.groovy</exclude>
+                      <exclude>javax.servlet:servlet-api</exclude>
                       <!-- hsqldb interferes with the use of Derby as the default db
                            in Hive's use of Datanucleus. -->
                       <exclude>org.hsqldb:hsqldb</exclude>

From 6b64539c164e3e3f9cf03e8ac05c205e7bd44ecd Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 22:09:42 -0700
Subject: [PATCH 23/35] Add enforcer rule for mockito-all exclusion.

---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index d5ceff5addb3d..6c0993f9ae0fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1567,6 +1567,9 @@
                            in different artifacts. To avoid hard-to-debug conflicts, we choose to
                            exclude org.ow2.asm (ASM 4) in favor of asm.asm (ASM 3). -->
                       <exclude>org.ow2.asm</exclude>
+                      <!-- We don't want to depend on mockito-all, which bundles its transitive
+                           dependencies; we use the regular mockito-core dependency instead. -->
+                      <exclude>org.mockito:mockito-all</exclude>
                     </excludes>
                     <searchTransitive>true</searchTransitive>
                   </bannedDependencies>

From b1809b7e17e8d02a42be4866b9351ad3ac1a22b8 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 23:11:39 -0700
Subject: [PATCH 24/35] Remove another stray slf4j exclude.

---
 pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6c0993f9ae0fd..4b412082c92c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1506,12 +1506,6 @@
         <groupId>org.apache.thrift</groupId>
         <artifactId>libthrift</artifactId>
         <version>${libthrift.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.thrift</groupId>

From e5ca86e93508187b3c93d681ba907e43703535d1 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 23:21:55 -0700
Subject: [PATCH 25/35] More unnecessary exclude removal; reudce scope of Kryo
 exclude.

---
 pom.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4b412082c92c2..7a3958d6d3be5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1184,8 +1184,8 @@
             <artifactId>ant</artifactId>
           </exclusion>
           <exclusion>
-            <groupId>com.esotericsoftware.kryo</groupId>
-            <artifactId>kryo</artifactId>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>*</artifactId>
           </exclusion>
           <exclusion>
             <groupId>org.apache.avro</groupId>
@@ -1207,10 +1207,6 @@
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libfb303</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.zookeeper</groupId>
             <artifactId>zookeeper</artifactId>

From 393696cf4c9580782cb9753cebf8b74faeaabf30 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 23:30:04 -0700
Subject: [PATCH 26/35] Remove unnecessary Zookeeper excludes

---
 pom.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7a3958d6d3be5..cd55de932d368 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1136,10 +1136,6 @@
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -1207,10 +1203,6 @@
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -1258,10 +1250,6 @@
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -1405,10 +1393,6 @@
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>

From 17afbe23b92520228e5d004648bd2d9f0a56e12c Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 23:36:28 -0700
Subject: [PATCH 27/35] Remove unnecessary curator excludes

---
 pom.xml | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index cd55de932d368..e38b441cf0e3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1187,18 +1187,12 @@
             <groupId>org.apache.avro</groupId>
             <artifactId>avro-mapred</artifactId>
           </exclusion>
+          <!-- We need to keep this exclusion here because hive-exec pulls in a dependency on the
+               curator POM -->
           <exclusion>
             <groupId>org.apache.curator</groupId>
             <artifactId>apache-curator</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-client</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-framework</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
@@ -1345,14 +1339,6 @@
             <groupId>${hive.group}</groupId>
             <artifactId>hive-shims</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-framework</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-recipes</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>
@@ -1385,10 +1371,6 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-framework</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.thrift</groupId>
             <artifactId>libthrift</artifactId>

From d736e7e26863af4cc382fe644f9e60c6193f7687 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 23:39:31 -0700
Subject: [PATCH 28/35] Remove inherited exclusion.

---
 core/pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index a5116e63d8eed..cbe575b881689 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -257,12 +257,6 @@
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-java</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-        </exclusion>
-      </exclusions>
       <scope>test</scope>
     </dependency>
     <!-- Added for selenium: -->

From 51853c7d18c6a85a669a2d62639dfba30ed29dcd Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Mon, 4 Apr 2016 23:53:27 -0700
Subject: [PATCH 29/35] Fix typo.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e38b441cf0e3a..21c89b84e45c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -683,7 +683,7 @@
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
           </exclusion>
-          <!-- ASM is actually relocated inside of the docker-client JAR but is not relocated.
+          <!-- ASM is actually packaged inside of the docker-client JAR but is not relocated.
                Ordinarily, this would be a problem but in our case it's fine because this package
                is only used in a handful of unit tests which are isolated to their own Maven
                project. For more details, see https://github.com/spotify/docker-client/pull/272.

From fc938a099bbf3704bf9f55fc0b4f6a6c0d3db92b Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Tue, 5 Apr 2016 01:03:37 -0700
Subject: [PATCH 30/35] Roll back a subset of Calcite changes to avoid pentaho
 dep. resolution problem.

---
 pom.xml          | 8 ++++++++
 sql/hive/pom.xml | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/pom.xml b/pom.xml
index 21c89b84e45c0..0952add3390c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1175,6 +1175,12 @@
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>
           </exclusion>
+          <!-- Calcite is excluded here and explicitly re-added in hive/pom.xml;
+               see comments there for full explanation. -->
+          <exclusion>
+            <groupId>org.apache.calcite</groupId>
+            <artifactId>calcite-core</artifactId>
+          </exclusion>
           <exclusion>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
@@ -1444,6 +1450,8 @@
       <dependency>
         <groupId>org.apache.calcite</groupId>
         <artifactId>calcite-core</artifactId>
+        <!-- Version matches Hive 1.2.1's version -->
+        <version>1.2.0-incubating</version>
         <exclusions>
           <exclusion>
             <groupId>com.google.guava</groupId>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index 7accdb7f9f00e..c60630954b902 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -78,6 +78,15 @@
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
     </dependency>
+    <!-- This direct dependency shouldn't be strictly necessary, since Hive will transitively
+         include the required Calcite dependencies, but we need to add this explicit dependency
+         so that our dependencyManament excludes prevent pentaho-aggdesigner-algorithm from being
+         resolved: that artifact is not present in Maven Central and therefore breaks the SBT
+         build. For discussion and details, see https://github.com/apache/spark/pull/12171 -->
+    <dependency>
+      <groupId>org.apache.calcite</groupId>
+      <artifactId>calcite-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>

From 36430de7b4ca793b43577ac0c73f506712413a31 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Tue, 5 Apr 2016 01:17:50 -0700
Subject: [PATCH 31/35] Pin Janino commons-compiler version.

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index 0952add3390c4..01589e2b08fbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1472,6 +1472,11 @@
         <artifactId>janino</artifactId>
         <version>${janino.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.janino</groupId>
+        <artifactId>commons-compiler</artifactId>
+        <version>${janino.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.thrift</groupId>
         <artifactId>libthrift</artifactId>

From 0bb11be97113cecb30c642b6d4797f9e131ba095 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Tue, 5 Apr 2016 10:56:03 -0700
Subject: [PATCH 32/35] Re-add joda-time dependency to fix Hive tests

---
 dev/deps/spark-deps-hadoop-2.2 | 1 +
 dev/deps/spark-deps-hadoop-2.3 | 1 +
 dev/deps/spark-deps-hadoop-2.4 | 1 +
 dev/deps/spark-deps-hadoop-2.6 | 1 +
 dev/deps/spark-deps-hadoop-2.7 | 1 +
 pom.xml                        | 6 ++++++
 sql/hive/pom.xml               | 8 +++++++-
 7 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dev/deps/spark-deps-hadoop-2.2 b/dev/deps/spark-deps-hadoop-2.2
index 56bee436011aa..0e2b94553bb72 100644
--- a/dev/deps/spark-deps-hadoop-2.2
+++ b/dev/deps/spark-deps-hadoop-2.2
@@ -118,6 +118,7 @@ jettison-1.1.jar
 jetty-all-7.6.0.v20120127.jar
 jetty-util-6.1.26.jar
 jline-2.12.jar
+joda-time-2.9.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar
 json-20090211.jar
diff --git a/dev/deps/spark-deps-hadoop-2.3 b/dev/deps/spark-deps-hadoop-2.3
index 3eea9fc101e51..71efbdba68d4d 100644
--- a/dev/deps/spark-deps-hadoop-2.3
+++ b/dev/deps/spark-deps-hadoop-2.3
@@ -109,6 +109,7 @@ jetty-6.1.26.jar
 jetty-all-7.6.0.v20120127.jar
 jetty-util-6.1.26.jar
 jline-2.12.jar
+joda-time-2.9.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar
 json-20090211.jar
diff --git a/dev/deps/spark-deps-hadoop-2.4 b/dev/deps/spark-deps-hadoop-2.4
index 22d6e285d01df..800d78f1de008 100644
--- a/dev/deps/spark-deps-hadoop-2.4
+++ b/dev/deps/spark-deps-hadoop-2.4
@@ -110,6 +110,7 @@ jetty-6.1.26.jar
 jetty-all-7.6.0.v20120127.jar
 jetty-util-6.1.26.jar
 jline-2.12.jar
+joda-time-2.9.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar
 json-20090211.jar
diff --git a/dev/deps/spark-deps-hadoop-2.6 b/dev/deps/spark-deps-hadoop-2.6
index 9635a1952e93d..f41f92aea1ab5 100644
--- a/dev/deps/spark-deps-hadoop-2.6
+++ b/dev/deps/spark-deps-hadoop-2.6
@@ -116,6 +116,7 @@ jetty-6.1.26.jar
 jetty-all-7.6.0.v20120127.jar
 jetty-util-6.1.26.jar
 jline-2.12.jar
+joda-time-2.9.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar
 json-20090211.jar
diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7
index 7c75c2e7c4660..6b074f67b3a44 100644
--- a/dev/deps/spark-deps-hadoop-2.7
+++ b/dev/deps/spark-deps-hadoop-2.7
@@ -116,6 +116,7 @@ jetty-6.1.26.jar
 jetty-all-7.6.0.v20120127.jar
 jetty-util-6.1.26.jar
 jline-2.12.jar
+joda-time-2.9.jar
 jodd-core-3.5.2.jar
 jpam-1.1.jar
 json-20090211.jar
diff --git a/pom.xml b/pom.xml
index 01589e2b08fbc..601024d4206c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,6 +171,7 @@
     <commons-lang3.version>3.3.2</commons-lang3.version>
     <janino.version>2.7.8</janino.version>
     <jersey.version>1.9</jersey.version>
+    <joda.version>2.9</joda.version>
     <jsr305.version>1.3.9</jsr305.version>
     <libthrift.version>0.9.2</libthrift.version>
     <antlr4.version>4.5.2-1</antlr4.version>
@@ -1477,6 +1478,11 @@
         <artifactId>commons-compiler</artifactId>
         <version>${janino.version}</version>
       </dependency>
+      <dependency>
+        <groupId>joda-time</groupId>
+        <artifactId>joda-time</artifactId>
+        <version>${joda.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.thrift</groupId>
         <artifactId>libthrift</artifactId>
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index c60630954b902..789ec323a167e 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -80,13 +80,19 @@
     </dependency>
     <!-- This direct dependency shouldn't be strictly necessary, since Hive will transitively
          include the required Calcite dependencies, but we need to add this explicit dependency
-         so that our dependencyManament excludes prevent pentaho-aggdesigner-algorithm from being
+         so that our dependencyManagement excludes prevent pentaho-aggdesigner-algorithm from being
          resolved: that artifact is not present in Maven Central and therefore breaks the SBT
          build. For discussion and details, see https://github.com/apache/spark/pull/12171 -->
     <dependency>
       <groupId>org.apache.calcite</groupId>
       <artifactId>calcite-core</artifactId>
     </dependency>
+    <!-- Although Spark doesn't directly depend on joda-time, Hive seems to need it because removing
+         this dependency breaks the Hive tests; see https://github.com/apache/spark/pull/12171. -->
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>

From c5635f5953c550c4fa6ca3e87b2bbfdfab6d3e5a Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Tue, 5 Apr 2016 10:59:30 -0700
Subject: [PATCH 33/35] Remove redundant enforcer plugin version.

---
 tools/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/pom.xml b/tools/pom.xml
index 3898b5d48185c..a659fe4e47de2 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -76,7 +76,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.4.1</version>
         <configuration>
           <skip>true</skip>
         </configuration>

From b7c8c6feebef8500cf0f25fd7faf90f49369e608 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Tue, 5 Apr 2016 13:33:29 -0700
Subject: [PATCH 34/35] Remove avro.mapred.classifier, since it's now fixed at
 hadoop2

---
 external/flume-assembly/pom.xml       | 1 -
 external/kafka-assembly/pom.xml       | 1 -
 external/kinesis-asl-assembly/pom.xml | 1 -
 pom.xml                               | 6 +-----
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/external/flume-assembly/pom.xml b/external/flume-assembly/pom.xml
index ac15b93c048da..e782b164f200f 100644
--- a/external/flume-assembly/pom.xml
+++ b/external/flume-assembly/pom.xml
@@ -96,7 +96,6 @@
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro-mapred</artifactId>
-      <classifier>${avro.mapred.classifier}</classifier>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/external/kafka-assembly/pom.xml b/external/kafka-assembly/pom.xml
index 62818f5e8f434..2c27cbff73053 100644
--- a/external/kafka-assembly/pom.xml
+++ b/external/kafka-assembly/pom.xml
@@ -88,7 +88,6 @@
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro-mapred</artifactId>
-      <classifier>${avro.mapred.classifier}</classifier>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml
index d1c38c7ca5d69..43772d1641221 100644
--- a/external/kinesis-asl-assembly/pom.xml
+++ b/external/kinesis-asl-assembly/pom.xml
@@ -98,7 +98,6 @@
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro-mapred</artifactId>
-      <classifier>${avro.mapred.classifier}</classifier>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 601024d4206c5..13a9b4098ab40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,7 +144,6 @@
     <oro.version>2.0.8</oro.version>
     <codahale.metrics.version>3.1.2</codahale.metrics.version>
     <avro.version>1.7.7</avro.version>
-    <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
     <jets3t.version>0.7.1</jets3t.version>
     <aws.kinesis.client.version>1.6.1</aws.kinesis.client.version>
     <!-- the producer is used in tests -->
@@ -827,10 +826,7 @@
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-mapred</artifactId>
         <version>${avro.version}</version>
-        <!-- use the build matching the hadoop api of avro-mapred (i.e. no classifier for hadoop 1
-             API, adoop2 classifier for hadoop 2 API. avro-mapred is a dependency of
-             org.spark-project.hive:hive-serde -->
-        <classifier>${avro.mapred.classifier}</classifier>
+        <classifier>hadoop2</classifier>
         <scope>${hive.deps.scope}</scope>
         <exclusions>
           <exclusion>

From f1eb02ac4eae9d9a658b3dafc228309fd781b0a6 Mon Sep 17 00:00:00 2001
From: Josh Rosen <joshrosen@databricks.com>
Date: Tue, 5 Apr 2016 14:26:42 -0700
Subject: [PATCH 35/35] Remove unnecessary Guava excludes.

---
 pom.xml | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index 13a9b4098ab40..be0569799dd99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -404,12 +404,6 @@
         <artifactId>selenium-java</artifactId>
         <version>2.45.0</version> <!-- 2.46.0+ requires Jetty 9 -->
         <scope>test</scope>
-        <exclusions>
-          <exclusion>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <!-- Added for selenium only, and should match its dependent version: -->
       <dependency>
@@ -565,18 +559,10 @@
         <artifactId>jackson-annotations</artifactId>
         <version>${fasterxml.jackson.version}</version>
       </dependency>
-      <!-- Guava is excluded because of SPARK-6149.  The Guava version referenced in this module is
-           15.0, which causes runtime incompatibility issues. -->
       <dependency>
         <groupId>com.fasterxml.jackson.module</groupId>
         <artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
         <version>${fasterxml.jackson.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>com.sun.jersey</groupId>
@@ -675,10 +661,6 @@
         <version>3.4.0</version>
         <scope>test</scope>
         <exclusions>
-          <exclusion>
-            <artifactId>guava</artifactId>
-            <groupId>com.google.guava</groupId>
-          </exclusion>
           <exclusion>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
@@ -1280,10 +1262,6 @@
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>servlet-api</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
 
@@ -1366,10 +1344,6 @@
         <version>${hive.version}</version>
         <scope>${hive.deps.scope}</scope>
         <exclusions>
-          <exclusion>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
@@ -1450,10 +1424,6 @@
         <!-- Version matches Hive 1.2.1's version -->
         <version>1.2.0-incubating</version>
         <exclusions>
-          <exclusion>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-          </exclusion>
           <exclusion>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>