Skip to content

Commit 2f69501

Browse files
authored
Apply dependencyManagement section to SBT for consistent versions (apache-spark-on-k8s#219)
Bumps avro to 1.8.1
1 parent 83f2b2d commit 2f69501

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

dev/deps/spark-deps-hadoop-palantir

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ api-asn1-api-1.0.0-M20.jar
1414
api-util-1.0.0-M20.jar
1515
arpack_combined_all-0.1.jar
1616
automaton-1.11-8.jar
17-
avro-1.7.7.jar
18-
avro-ipc-1.7.7.jar
19-
avro-mapred-1.7.7-hadoop2.jar
17+
avro-1.8.1.jar
18+
avro-ipc-1.8.1.jar
19+
avro-mapred-1.8.1-hadoop2.jar
2020
aws-java-sdk-core-1.11.45.jar
2121
aws-java-sdk-kms-1.11.45.jar
2222
aws-java-sdk-s3-1.11.45.jar
@@ -38,7 +38,7 @@ commons-cli-1.2.jar
3838
commons-codec-1.10.jar
3939
commons-collections-3.2.2.jar
4040
commons-compiler-3.0.0.jar
41-
commons-compress-1.4.1.jar
41+
commons-compress-1.8.1.jar
4242
commons-configuration-1.6.jar
4343
commons-crypto-1.0.0.jar
4444
commons-dbcp-1.4.jar
@@ -225,6 +225,6 @@ univocity-parsers-2.2.1.jar
225225
validation-api-1.1.0.Final.jar
226226
xbean-asm5-shaded-4.4.jar
227227
xmlenc-0.52.jar
228-
xz-1.0.jar
228+
xz-1.5.jar
229229
zjsonpatch-0.3.0.jar
230230
zookeeper-3.4.6.jar

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
<codahale.metrics.version>3.2.2</codahale.metrics.version>
149149
<dropwizard.version>0.9.2</dropwizard.version>
150150
<spark-influx-sink.version>0.3.12</spark-influx-sink.version>
151-
<avro.version>1.7.7</avro.version>
151+
<avro.version>1.8.1</avro.version>
152152
<avro.mapred.classifier>hadoop2</avro.mapred.classifier>
153153
<jets3t.version>0.9.3</jets3t.version>
154154
<aws.kinesis.client.version>1.7.3</aws.kinesis.client.version>

project/SparkBuild.scala

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import sbt.Classpaths.publishTask
2929
import sbt.Keys._
3030
import sbtunidoc.Plugin.UnidocKeys.unidocGenjavadocVersion
3131
import com.simplytyped.Antlr4Plugin._
32-
import com.typesafe.sbt.pom.{PomBuild, SbtPomKeys}
32+
import com.typesafe.sbt.pom.{MavenHelper, PomBuild, SbtPomKeys}
3333
import com.typesafe.tools.mima.plugin.MimaKeys
3434
import org.scalastyle.sbt.ScalastylePlugin._
3535
import org.scalastyle.sbt.Tasks
@@ -296,7 +296,12 @@ object SparkBuild extends PomBuild {
296296
sys.error(s"$failed fatal warnings")
297297
}
298298
analysis
299-
}
299+
},
300+
dependencyOverrides ++= MavenHelper.fromPom { pom =>
301+
for {
302+
dep <- pom.getDependencyManagement.getDependencies.asScala
303+
} yield MavenHelper.convertDep(dep)
304+
}.value.toSet
300305
)
301306

302307
def enable(settings: Seq[Setting[_]])(projectRef: ProjectRef): Unit = {

0 commit comments

Comments
 (0)