Skip to content
Snippets Groups Projects
Commit 5e31db70 authored by Marcelo Vanzin's avatar Marcelo Vanzin
Browse files

[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 <vanzin@cloudera.com>

Closes #9508 from vanzin/SPARK-11538.
parent 468ad0ae
No related branches found
No related tags found
No related merge requests found
...@@ -207,7 +207,8 @@ object SparkBuild extends PomBuild { ...@@ -207,7 +207,8 @@ object SparkBuild extends PomBuild {
// Note ordering of these settings matter. // Note ordering of these settings matter.
/* Enable shared settings on all projects */ /* Enable shared settings on all projects */
(allProjects ++ optionallyEnabledProjects ++ assemblyProjects ++ Seq(spark, tools)) (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 */ /* Enable tests settings for all projects except examples, assembly and tools */
(allProjects ++ optionallyEnabledProjects).foreach(enable(TestSettings.settings)) (allProjects ++ optionallyEnabledProjects).foreach(enable(TestSettings.settings))
...@@ -291,6 +292,14 @@ object Flume { ...@@ -291,6 +292,14 @@ object Flume {
lazy val settings = sbtavro.SbtAvro.avroSettings lazy val settings = sbtavro.SbtAvro.avroSettings
} }
/**
* 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 This excludes library dependencies in sbt, which are specified in maven but are
not needed by sbt build. not needed by sbt build.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment