Skip to content

[SPARK-20343][BUILD] Force Avro 1.7.7 in sbt build to resolve build failure in SBT Hadoop 2.6 master on Jenkins #17651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HyukjinKwon wants to merge 2 commits into from
Closed

[SPARK-20343][BUILD] Force Avro 1.7.7 in sbt build to resolve build failure in SBT Hadoop 2.6 master on Jenkins #17651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56c1eba
Force Avro 1.7.7 in sbt build to resolve build failure in SBT Hadoop …
HyukjinKwon Apr 16, 2017
0031804
Add a simple comment as a reminder
HyukjinKwon Apr 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
<ivy.version>2.4.0</ivy.version>
<oro.version>2.0.8</oro.version>
<codahale.metrics.version>3.1.2</codahale.metrics.version>
<!-- Keep consistent with Avro vesion in SBT build for SPARK-20343 -->
<avro.version>1.7.7</avro.version>
<avro.mapred.classifier>hadoop2</avro.mapred.classifier>
<jets3t.version>0.9.3</jets3t.version>
Expand Down
14 changes: 12 additions & 2 deletions project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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.
*/
Expand Down