diff options
author | Ismael Juma <ismael@juma.me.uk> | 2011-05-27 00:58:28 +0100 |
---|---|---|
committer | Ismael Juma <ismael@juma.me.uk> | 2011-05-27 11:22:01 +0100 |
commit | ae1a1f91f17f16f9daae76d65d127c30afd108dc (patch) | |
tree | 644dc6f2596dcdb92ff22292edd3221c041b68ff /project | |
parent | 164ef4c75157c328a680f5e9ef9bcbd05f2b93df (diff) | |
download | spark-ae1a1f91f17f16f9daae76d65d127c30afd108dc.tar.gz spark-ae1a1f91f17f16f9daae76d65d127c30afd108dc.tar.bz2 spark-ae1a1f91f17f16f9daae76d65d127c30afd108dc.zip |
Remove several dependencies from git and configure them as SBT managed dependencies.
Upgrade some of the dependencies while at it.
Diffstat (limited to 'project')
-rw-r--r-- | project/build/SparkProject.scala | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/project/build/SparkProject.scala b/project/build/SparkProject.scala index 634acab702..508e2018b3 100644 --- a/project/build/SparkProject.scala +++ b/project/build/SparkProject.scala @@ -14,15 +14,33 @@ class SparkProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje lazy val bagel = project("bagel", "Bagel", new BagelProject(_), core) + lazy val jettyWebapp = "org.eclipse.jetty" % "jetty-webapp" % "7.4.1.v20110513" % "provided" + trait BaseProject extends BasicScalaProject with ScalaPaths with Eclipsify with IdeaProject { override def compileOptions = super.compileOptions ++ Seq(Unchecked) } - class CoreProject(info: ProjectInfo) extends DefaultProject(info) with BaseProject with DepJar with XmlTestReport + class CoreProject(info: ProjectInfo) extends DefaultProject(info) with BaseProject with DepJar with XmlTestReport { + val guava = "com.google.guava" % "guava" % "r09" + val log4j = "log4j" % "log4j" % "1.2.16" + val slf4jVersion = "1.6.1" + val slf4jApi = "org.slf4j" % "slf4j-api" % slf4jVersion + val slf4jLog4j = "org.slf4j" % "slf4j-log4j12" % slf4jVersion + val compressLzf = "com.ning" % "compress-lzf" % "0.7.0" + val hadoop = "org.apache.hadoop" % "hadoop-core" % "0.20.2" + val asm = "asm" % "asm-all" % "3.3.1" + val scalaTest = "org.scalatest" % "scalatest" % "1.3" % "test" + val scalaCheck = "org.scala-tools.testing" %% "scalacheck" % "1.7" % "test" + val jetty = jettyWebapp + } - class ExamplesProject(info: ProjectInfo) extends DefaultProject(info) with BaseProject + class ExamplesProject(info: ProjectInfo) extends DefaultProject(info) with BaseProject { + val colt = "colt" % "colt" % "1.2.0" + } - class BagelProject(info: ProjectInfo) extends DefaultProject(info) with BaseProject with DepJar with XmlTestReport + class BagelProject(info: ProjectInfo) extends DefaultProject(info) with BaseProject with DepJar with XmlTestReport { + val jetty = jettyWebapp + } } |