From ead3c3bfc7f1aeecc04c921a5946025b9dadf224 Mon Sep 17 00:00:00 2001
From: witgo <witgo@qq.com>
Date: Mon, 19 May 2014 15:41:32 +0800
Subject: [PATCH 1/2] SPARK-1875:NoClassDefFoundError: StringUtils when
 building against Hadoop 1

---
 pom.xml                  | 5 +++++
 project/SparkBuild.scala | 3 +--
 sql/hive/pom.xml         | 8 --------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5df7036585b75..f5032010b59b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,6 +228,11 @@
         <artifactId>commons-lang3</artifactId>
         <version>3.3.2</version>
       </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.6</version>
+      </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 29dcd8678b476..b9d92340ff75b 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 4d0b2fa1452a2..9254b70e64a08 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 -->

From ef7231d38089f351a5c2e9dc1d5bfd3b65d15180 Mon Sep 17 00:00:00 2001
From: witgo <witgo@qq.com>
Date: Mon, 19 May 2014 16:21:11 +0800
Subject: [PATCH 2/2] review commit

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

diff --git a/pom.xml b/pom.xml
index f5032010b59b5..5df7036585b75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,11 +228,6 @@
         <artifactId>commons-lang3</artifactId>
         <version>3.3.2</version>
       </dependency>
-      <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <version>2.6</version>
-      </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
         <artifactId>jsr305</artifactId>