diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-05-31 19:23:07 -0700 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-05-31 19:23:07 -0700 |
commit | beb9c117f053a6ce4431b3553897515d7d00c900 (patch) | |
tree | cde9150d562dc59fec64ec348e6f9cffc4f674cf /project | |
parent | bcce6e8d01a0e842483270099a73310cb46dfc88 (diff) | |
parent | 8b0390d344e7ddcc574fc58f4f90f96555e53878 (diff) | |
download | spark-beb9c117f053a6ce4431b3553897515d7d00c900.tar.gz spark-beb9c117f053a6ce4431b3553897515d7d00c900.tar.bz2 spark-beb9c117f053a6ce4431b3553897515d7d00c900.zip |
Merge branch 'master' into scala-2.9
Conflicts:
project/build/SparkProject.scala
Diffstat (limited to 'project')
-rw-r--r-- | project/build/SparkProject.scala | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/project/build/SparkProject.scala b/project/build/SparkProject.scala index 7ebd92fde6..f33b42b986 100644 --- a/project/build/SparkProject.scala +++ b/project/build/SparkProject.scala @@ -16,10 +16,11 @@ 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 BasicPackagePaths with Eclipsify with IdeaProject { override def compileOptions = super.compileOptions ++ Seq(Unchecked) + + lazy val jettyServer = "org.eclipse.jetty" % "jetty-server" % "7.4.2.v20110526" + override def packageDocsJar = defaultJarPath("-javadoc.jar") override def packageSrcJar= defaultJarPath("-sources.jar") lazy val sourceArtifact = Artifact.sources(artifactID) @@ -38,21 +39,16 @@ class SparkProject(info: ProjectInfo) extends ParentProject(info) with IdeaProje val asm = "asm" % "asm-all" % "3.3.1" val scalaTest = "org.scalatest" % "scalatest_2.9.0" % "1.4.1" % "test" val scalaCheck = "org.scala-tools.testing" % "scalacheck_2.9.0" % "1.8" % "test" - val jetty = jettyWebapp } - class ReplProject(info: ProjectInfo) extends DefaultProject(info) with BaseProject with DepJar with XmlTestReport { - val jetty = jettyWebapp - } + class ReplProject(info: ProjectInfo) extends DefaultProject(info) with BaseProject with DepJar with XmlTestReport 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 { - val jetty = jettyWebapp - } - + class BagelProject(info: ProjectInfo) extends DefaultProject(info) with BaseProject with DepJar with XmlTestReport + } |