aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
Diffstat (limited to 'project')
-rw-r--r--project/DepJar.scala4
-rw-r--r--project/SparkBuild.scala1
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",