From 6a2c5c610c259f62cb12d8cfc18bf59cdb334bb2 Mon Sep 17 00:00:00 2001
From: witgo <witgo@qq.com>
Date: Mon, 19 May 2014 19:40:29 -0700
Subject: [PATCH] [SPARK-1875]NoClassDefFoundError: StringUtils when building
with hadoop 1.x and hive
Author: witgo <witgo@qq.com>
Closes #824 from witgo/SPARK-1875_commons-lang-2.6 and squashes the following commits:
ef7231d [witgo] review commit
ead3c3b [witgo] SPARK-1875:NoClassDefFoundError: StringUtils when building against Hadoop 1
---
project/SparkBuild.scala | 3 +--
sql/hive/pom.xml | 8 --------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 29dcd8678b..b9d92340ff 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -318,7 +318,6 @@ object SparkBuild extends Build {
val excludeFastutil = ExclusionRule(organization = "it.unimi.dsi")
val excludeJruby = ExclusionRule(organization = "org.jruby")
val excludeThrift = ExclusionRule(organization = "org.apache.thrift")
- val excludeCommonsLang = ExclusionRule(organization = "commons-lang")
val excludeServletApi = ExclusionRule(organization = "javax.servlet", artifact = "servlet-api")
def sparkPreviousArtifact(id: String, organization: String = "org.apache.spark",
@@ -493,7 +492,7 @@ object SparkBuild extends Build {
javaOptions += "-XX:MaxPermSize=1g",
libraryDependencies ++= Seq(
"org.spark-project.hive" % "hive-metastore" % hiveVersion,
- "org.spark-project.hive" % "hive-exec" % hiveVersion excludeAll(excludeCommonsLang, excludeCommonsLogging),
+ "org.spark-project.hive" % "hive-exec" % hiveVersion excludeAll(excludeCommonsLogging),
"org.spark-project.hive" % "hive-serde" % hiveVersion
),
// Multiple queries rely on the TestHive singleton. See comments there for more details.
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index 4d0b2fa145..9254b70e64 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -57,10 +57,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -80,10 +76,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
</exclusions>
</dependency>
<!-- hive-serde already depends on avro, but this brings in customized config of avro deps from parent -->
--
GitLab