diff --git a/pom.xml b/pom.xml
index c1174593c192..14370d92a908 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,7 @@
2.4.0
2.0.8
3.1.2
+
1.7.7
hadoop2
0.9.3
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index e52baf51aed1..77dae289f775 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -318,8 +318,8 @@ object SparkBuild extends PomBuild {
enable(MimaBuild.mimaSettings(sparkHome, x))(x)
}
- /* Generate and pick the spark build info from extra-resources */
- enable(Core.settings)(core)
+ /* Generate and pick the spark build info from extra-resources and override a dependency */
+ enable(Core.settings ++ CoreDependencyOverrides.settings)(core)
/* Unsafe settings */
enable(Unsafe.settings)(unsafe)
@@ -443,6 +443,16 @@ object DockerIntegrationTests {
)
}
+/**
+ * Overrides to work around sbt's dependency resolution being different from Maven's in Unidoc.
+ *
+ * Note that, this is a hack that should be removed in the future. See SPARK-20343
+ */
+object CoreDependencyOverrides {
+ lazy val settings = Seq(
+ dependencyOverrides += "org.apache.avro" % "avro" % "1.7.7")
+}
+
/**
* Overrides to work around sbt's dependency resolution being different from Maven's.
*/