diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-10-03 12:00:36 -0700 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-10-03 12:00:48 -0700 |
commit | 232765f7b26d933caa14e0e1bc0e4937dae90523 (patch) | |
tree | 5ff8a6d95fe043d2a512d2060278fc95b02def18 /project | |
parent | 405e69bb205f29010f8f01acfa2ee84e9251c1d5 (diff) | |
parent | 9fd6bba60d908c1c176e3bbd34add1853ecc1d8d (diff) | |
download | spark-232765f7b26d933caa14e0e1bc0e4937dae90523.tar.gz spark-232765f7b26d933caa14e0e1bc0e4937dae90523.tar.bz2 spark-232765f7b26d933caa14e0e1bc0e4937dae90523.zip |
Merge pull request #26 from Du-Li/master
fixed a wildcard bug in make-distribution.sh; ask sbt to check local
maven repo in project/SparkBuild.scala
(1) fixed a wildcard bug in make-distribution.sh:
with the wildcard * in quotes, this cp command failed. it worked after
moving the wildcard out quotes.
(2) ask sbt to check local maven repo in SparkBuild.scala:
To build Spark (0.9.0-SNAPSHOT) with the HEAD of mesos (0.15.0), I must
do "make maven-install" under mesos/build, which publishes the java .jar
file under ~/.m2. However, when building Spark (after pointing mesos to
version 0.15.0), sbt uses ivy which by default only checks ~/.ivy2. This
change is to tell sbt to also check ~/.m2.
Diffstat (limited to 'project')
-rw-r--r-- | project/SparkBuild.scala | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index aef246d8a9..cdec6168af 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -97,6 +97,9 @@ object SparkBuild extends Build { // Only allow one test at a time, even across projects, since they run in the same JVM concurrentRestrictions in Global += Tags.limit(Tags.Test, 1), + // also check the local Maven repository ~/.m2 + resolvers ++= Seq(Resolver.file("Local Maven Repo", file(Path.userHome + "/.m2/repository"))), + // Shared between both core and streaming. resolvers ++= Seq("Akka Repository" at "http://repo.akka.io/releases/"), |