Merge branch 'scala-2.9'

Conflicts:
	project/build/SparkProject.scala

1 files changed, 53 insertions, 0 deletions

diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
new file mode 100644
index 0000000000..23d13a8179
--- /dev/null
+++ b/project/SparkBuild.scala
@@ -0,0 +1,53 @@
+import sbt._
+import Keys._
+
+object SparkBuild extends Build {
+
+  lazy val root = Project("root", file("."), settings = sharedSettings) aggregate(core, repl, examples, bagel)
+
+  lazy val core = Project("core", file("core"), settings = coreSettings)
+
+  lazy val repl = Project("repl", file("repl"), settings = replSettings) dependsOn (core)
+
+  lazy val examples = Project("examples", file("examples"), settings = examplesSettings) dependsOn (core)
+
+  lazy val bagel = Project("bagel", file("bagel"), settings = bagelSettings) dependsOn (core)
+
+  def sharedSettings = Defaults.defaultSettings ++ Seq(
+    organization := "org.spark-project",
+    version := "0.4-SNAPSHOT",
+    scalaVersion := "2.9.0-1",
+    scalacOptions := Seq(/*"-deprecation",*/ "-unchecked"), // TODO Enable -deprecation and fix all warnings
+    unmanagedJars in Compile <<= baseDirectory map { base => (base ** "*.jar").classpath },
+    retrieveManaged := true,
+    transitiveClassifiers in Scope.GlobalScope := Seq("sources"),
+    testListeners <<= target.map(t => Seq(new eu.henkelmann.sbt.JUnitXmlTestsListener(t.getAbsolutePath))),
+    libraryDependencies ++= Seq(
+      "org.eclipse.jetty" % "jetty-server" % "7.4.2.v20110526",
+      "org.scalatest" % "scalatest_2.9.0" % "1.6.1" % "test",
+      "org.scala-tools.testing" % "scalacheck_2.9.0-1" % "1.9" % "test"
+    )
+  )
+
+  val slf4jVersion = "1.6.1"
+
+  def coreSettings = sharedSettings ++ Seq(libraryDependencies ++= Seq(
+    "com.google.guava" % "guava" % "r09",
+    "log4j" % "log4j" % "1.2.16",
+    "org.slf4j" % "slf4j-api" % slf4jVersion,
+    "org.slf4j" % "slf4j-log4j12" % slf4jVersion,
+    "com.ning" % "compress-lzf" % "0.7.0",
+    "org.apache.hadoop" % "hadoop-core" % "0.20.2",
+    "asm" % "asm-all" % "3.3.1",
+    "com.google.protobuf" % "protobuf-java" % "2.3.0",
+    "de.javakaffee" % "kryo-serializers" % "0.9"
+  )) ++ DepJarPlugin.depJarSettings
+
+  def replSettings = sharedSettings ++
+      Seq(libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _)) ++
+      DepJarPlugin.depJarSettings
+
+  def examplesSettings = sharedSettings ++ Seq(libraryDependencies += "colt" % "colt" % "1.2.0")
+
+  def bagelSettings = sharedSettings ++ DepJarPlugin.depJarSettings
+}