spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject git commit: [SPARK-1875]NoClassDefFoundError: StringUtils when building with hadoop 1.x and hive
Date Tue, 20 May 2014 02:40:45 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.0 00563e15e -> 875c54fb3


[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

(cherry picked from commit 6a2c5c610c259f62cb12d8cfc18bf59cdb334bb2)
Signed-off-by: Tathagata Das <tathagata.das1565@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/875c54fb
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/875c54fb
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/875c54fb

Branch: refs/heads/branch-1.0
Commit: 875c54fb3e90b2aa597366a98c83015c156948f2
Parents: 00563e1
Author: witgo <witgo@qq.com>
Authored: Mon May 19 19:40:29 2014 -0700
Committer: Tathagata Das <tathagata.das1565@gmail.com>
Committed: Mon May 19 19:40:41 2014 -0700

----------------------------------------------------------------------
 project/SparkBuild.scala | 3 +--
 sql/hive/pom.xml         | 8 --------
 2 files changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/875c54fb/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 8ddace1..ae8a6af 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.

http://git-wip-us.apache.org/repos/asf/spark/blob/875c54fb/sql/hive/pom.xml
----------------------------------------------------------------------
diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml
index c27a3c7..0c55657 100644
--- a/sql/hive/pom.xml
+++ b/sql/hive/pom.xml
@@ -56,10 +56,6 @@
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>commons-lang</groupId>
-          <artifactId>commons-lang</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -79,10 +75,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 -->


Mime
View raw message