Repository: spark Updated Branches: refs/heads/branch-1.6 9d6238859 -> e86499954
[SPARK-11538][BUILD] Force guava 14 in sbt build. sbt's version resolution code always picks the most recent version, and we don't want that for guava. Author: Marcelo Vanzin <van...@cloudera.com> Closes #9508 from vanzin/SPARK-11538. (cherry picked from commit 5e31db70bb783656ba042863fcd3c223e17a8f81) Signed-off-by: Reynold Xin <r...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/051b2ca3 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/051b2ca3 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/051b2ca3 Branch: refs/heads/branch-1.6 Commit: 051b2ca3a0aa18c5d805cbd183bca504865297c4 Parents: 9d62388 Author: Marcelo Vanzin <van...@cloudera.com> Authored: Thu Nov 5 18:05:58 2015 -0800 Committer: Reynold Xin <r...@databricks.com> Committed: Fri Nov 6 11:57:29 2015 -0800 ---------------------------------------------------------------------- project/SparkBuild.scala | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/051b2ca3/project/SparkBuild.scala ---------------------------------------------------------------------- diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 75c3693..b75ed13 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -207,7 +207,8 @@ object SparkBuild extends PomBuild { // Note ordering of these settings matter. /* Enable shared settings on all projects */ (allProjects ++ optionallyEnabledProjects ++ assemblyProjects ++ Seq(spark, tools)) - .foreach(enable(sharedSettings ++ ExcludedDependencies.settings ++ Revolver.settings)) + .foreach(enable(sharedSettings ++ DependencyOverrides.settings ++ + ExcludedDependencies.settings ++ Revolver.settings)) /* Enable tests settings for all projects except examples, assembly and tools */ (allProjects ++ optionallyEnabledProjects).foreach(enable(TestSettings.settings)) @@ -292,6 +293,14 @@ object Flume { } /** + * Overrides to work around sbt's dependency resolution being different from Maven's. + */ +object DependencyOverrides { + lazy val settings = Seq( + dependencyOverrides += "com.google.guava" % "guava" % "14.0.1") +} + +/** This excludes library dependencies in sbt, which are specified in maven but are not needed by sbt build. */ --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
