diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-10-05 15:52:57 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-10-05 15:52:57 +0530 |
| commit | c810ee0690d536873b1046541cdf1b492902a60e (patch) | |
| tree | 05dc901858682ab877ffa7cfb5a304a369c199ea /project | |
| parent | 582969288592063ea4071080e8ff7b9108cf4a8b (diff) | |
| parent | 232765f7b26d933caa14e0e1bc0e4937dae90523 (diff) | |
| download | spark-c810ee0690d536873b1046541cdf1b492902a60e.tar.gz spark-c810ee0690d536873b1046541cdf1b492902a60e.tar.bz2 spark-c810ee0690d536873b1046541cdf1b492902a60e.zip | |
Merge branch 'master' into scala-2.10
Conflicts:
core/src/test/scala/org/apache/spark/DistributedSuite.scala
project/SparkBuild.scala
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 67d03f987f..19d3aa23ad 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"))), + // For Sonatype publishing resolvers ++= Seq("sonatype-snapshots" at "https://oss.sonatype.org/content/repositories/snapshots", "sonatype-staging" at "https://oss.sonatype.org/service/local/staging/deploy/maven2/"), |