From d58cb33ffa9e98a64cecea7b40ce7bfbed145079 Mon Sep 17 00:00:00 2001 From: Patrick Wendell <pwendell@gmail.com> Date: Wed, 14 May 2014 09:51:01 -0700 Subject: [PATCH] SPARK-1828: Created forked version of hive-exec that doesn't bundle other dependencies See https://issues.apache.org/jira/browse/SPARK-1828 for more information. This is being submitted to Jenkin's for testing. The dependency won't fully propagate in Maven central for a few more hours. Author: Patrick Wendell <pwendell@gmail.com> Closes #767 from pwendell/hive-shaded and squashes the following commits: ea10ac5 [Patrick Wendell] SPARK-1828: Created forked version of hive-exec that doesn't bundle other dependencies --- project/SparkBuild.scala | 6 +++--- sql/hive/pom.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 57b3e22f81..8d56b40431 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -489,9 +489,9 @@ object SparkBuild extends Build { name := "spark-hive", javaOptions += "-XX:MaxPermSize=1g", libraryDependencies ++= Seq( - "org.apache.hive" % "hive-metastore" % hiveVersion, - "org.apache.hive" % "hive-exec" % hiveVersion, - "org.apache.hive" % "hive-serde" % hiveVersion + "org.spark-project.hive" % "hive-metastore" % hiveVersion, + "org.spark-project.hive" % "hive-exec" % hiveVersion, + "org.spark-project.hive" % "hive-serde" % hiveVersion ), // Multiple queries rely on the TestHive singleton. See comments there for more details. parallelExecution in Test := false, diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index 8b32451d76..9254b70e64 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -44,12 +44,12 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.hive</groupId> + <groupId>org.spark-project.hive</groupId> <artifactId>hive-metastore</artifactId> <version>${hive.version}</version> </dependency> <dependency> - <groupId>org.apache.hive</groupId> + <groupId>org.spark-project.hive</groupId> <artifactId>hive-exec</artifactId> <version>${hive.version}</version> <exclusions> @@ -64,7 +64,7 @@ <artifactId>jackson-mapper-asl</artifactId> </dependency> <dependency> - <groupId>org.apache.hive</groupId> + <groupId>org.spark-project.hive</groupId> <artifactId>hive-serde</artifactId> <version>${hive.version}</version> <exclusions> -- GitLab