diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-08-01 15:27:08 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2011-08-01 15:27:08 -0700 |
| commit | 2e57338896b6a926ed0e32b88bdfa02333d1cc9f (patch) | |
| tree | e857f97057b13601587c5eea0802a577f49ada8d /project | |
| parent | 711575391df632627cd9eb91d84d5b6f0d4db6f2 (diff) | |
| parent | a0b7865037d6ba100abef7a1f69669d0d9b3febc (diff) | |
| download | spark-2e57338896b6a926ed0e32b88bdfa02333d1cc9f.tar.gz spark-2e57338896b6a926ed0e32b88bdfa02333d1cc9f.tar.bz2 spark-2e57338896b6a926ed0e32b88bdfa02333d1cc9f.zip | |
Merge branch 'scala-2.9'
Diffstat (limited to 'project')
| -rw-r--r-- | project/DepJar.scala | 4 | ||||
| -rw-r--r-- | project/SparkBuild.scala | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/project/DepJar.scala b/project/DepJar.scala index 1d54005690..6ca00423be 100644 --- a/project/DepJar.scala +++ b/project/DepJar.scala @@ -90,7 +90,7 @@ object DepJarPlugin extends Plugin { descendants x relativeTo(base) } - lazy val depJarSettings = inConfig(DepJar)(Seq( + lazy val depJarSettings: Seq[Setting[_]] = inConfig(DepJar)(Seq( depJar <<= packageBin.identity, packageBin <<= assemblyTask, jarName <<= (name, version) { (name, version) => name + "-dep-" + version + ".jar" }, @@ -105,4 +105,4 @@ object DepJarPlugin extends Plugin { Seq( depJar <<= (depJar in DepJar).identity ) -}
\ No newline at end of file +} diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 23d13a8179..858751618e 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -22,6 +22,7 @@ object SparkBuild extends Build { retrieveManaged := true, transitiveClassifiers in Scope.GlobalScope := Seq("sources"), testListeners <<= target.map(t => Seq(new eu.henkelmann.sbt.JUnitXmlTestsListener(t.getAbsolutePath))), + publishTo <<= baseDirectory { base => Some(Resolver.file("Local", base / "target" / "maven" asFile)(Patterns(true, Resolver.mavenStyleBasePattern))) }, libraryDependencies ++= Seq( "org.eclipse.jetty" % "jetty-server" % "7.4.2.v20110526", "org.scalatest" % "scalatest_2.9.0" % "1.6.1" % "test", |