aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorThomas Dudziak <tomdzk@gmail.com>2012-10-09 15:21:38 -0700
committerThomas Dudziak <tomdzk@gmail.com>2012-10-18 16:08:54 -0700
commitd9c2a89c57d0e650b6707e45381b2d89ff7e0cdb (patch)
treecd4ad0391a17f588278e1147062a7ddca686e65d /project
parent63fe4e9d33ec59d93b42507ca9ea286178c12ec4 (diff)
downloadspark-d9c2a89c57d0e650b6707e45381b2d89ff7e0cdb.tar.gz
spark-d9c2a89c57d0e650b6707e45381b2d89ff7e0cdb.tar.bz2
spark-d9c2a89c57d0e650b6707e45381b2d89ff7e0cdb.zip
Support for Hadoop 2 distributions such as cdh4
Diffstat (limited to 'project')
-rw-r--r--project/SparkBuild.scala10
1 files changed, 8 insertions, 2 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index c9cf17d90a..e165ba3ac1 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -11,6 +11,11 @@ object SparkBuild extends Build {
// Hadoop version to build against. For example, "0.20.2", "0.20.205.0", or
// "1.0.3" for Apache releases, or "0.20.2-cdh3u5" for Cloudera Hadoop.
val HADOOP_VERSION = "0.20.205.0"
+ val HADOOP_MAJOR_VERSION = "1"
+
+ // For Hadoop 2 versions such as "2.0.0-mr1-cdh4.1.1", set the HADOOP_MAJOR_VERSION to "2"
+ //val HADOOP_VERSION = "2.0.0-mr1-cdh4.1.1"
+ //val HADOOP_MAJOR_VERSION = "2"
lazy val root = Project("root", file("."), settings = rootSettings) aggregate(core, repl, examples, bagel)
@@ -108,7 +113,7 @@ object SparkBuild extends Build {
"Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/",
"JBoss Repository" at "http://repository.jboss.org/nexus/content/repositories/releases/",
"Spray Repository" at "http://repo.spray.cc/",
- "Cloudera Repository" at "http://repository.cloudera.com/artifactory/cloudera-repos/"
+ "Cloudera Repository" at "https://repository.cloudera.com/artifactory/cloudera-repos/"
),
libraryDependencies ++= Seq(
@@ -129,7 +134,8 @@ object SparkBuild extends Build {
"cc.spray" % "spray-can" % "1.0-M2.1",
"cc.spray" % "spray-server" % "1.0-M2.1",
"org.apache.mesos" % "mesos" % "0.9.0-incubating"
- )
+ ) ++ (if (HADOOP_MAJOR_VERSION == "2") Some("org.apache.hadoop" % "hadoop-client" % HADOOP_VERSION) else None).toSeq,
+ unmanagedSourceDirectories in Compile <+= baseDirectory{ _ / ("src/hadoop" + HADOOP_MAJOR_VERSION + "/scala") }
) ++ assemblySettings ++ extraAssemblySettings ++ Twirl.settings
def rootSettings = sharedSettings ++ Seq(