Skip to content
Snippets Groups Projects
Unverified Commit 7f31d378 authored by Weiqing Yang's avatar Weiqing Yang Committed by Sean Owen
Browse files

[SPARK-18697][BUILD] Upgrade sbt plugins

## What changes were proposed in this pull request?

This PR is to upgrade sbt plugins. The following sbt plugins will be upgraded:
```
sbt-assembly: 0.11.2 -> 0.14.3
sbteclipse-plugin: 4.0.0 -> 5.0.1
sbt-mima-plugin: 0.1.11 -> 0.1.12
org.ow2.asm/asm: 5.0.3 -> 5.1
org.ow2.asm/asm-commons: 5.0.3 -> 5.1
```
All other plugins are up-to-date.

## How was this patch tested?
Pass the Jenkins build.

Author: Weiqing Yang <yangweiqing001@gmail.com>

Closes #16159 from weiqingy/SPARK-18697.
parent bd9a4a5a
No related branches found
No related tags found
No related merge requests found
...@@ -596,19 +596,17 @@ object Hive { ...@@ -596,19 +596,17 @@ object Hive {
} }
object Assembly { object Assembly {
import sbtassembly.AssemblyUtils._ import sbtassembly.AssemblyPlugin.autoImport._
import sbtassembly.Plugin._
import AssemblyKeys._
val hadoopVersion = taskKey[String]("The version of hadoop that spark is compiled against.") val hadoopVersion = taskKey[String]("The version of hadoop that spark is compiled against.")
lazy val settings = assemblySettings ++ Seq( lazy val settings = Seq(
test in assembly := {}, test in assembly := {},
hadoopVersion := { hadoopVersion := {
sys.props.get("hadoop.version") sys.props.get("hadoop.version")
.getOrElse(SbtPomKeys.effectivePom.value.getProperties.get("hadoop.version").asInstanceOf[String]) .getOrElse(SbtPomKeys.effectivePom.value.getProperties.get("hadoop.version").asInstanceOf[String])
}, },
jarName in assembly := { assemblyJarName in assembly := {
if (moduleName.value.contains("streaming-flume-assembly") if (moduleName.value.contains("streaming-flume-assembly")
|| moduleName.value.contains("streaming-kafka-0-8-assembly") || moduleName.value.contains("streaming-kafka-0-8-assembly")
|| moduleName.value.contains("streaming-kafka-0-10-assembly") || moduleName.value.contains("streaming-kafka-0-10-assembly")
...@@ -619,8 +617,8 @@ object Assembly { ...@@ -619,8 +617,8 @@ object Assembly {
s"${moduleName.value}-${version.value}-hadoop${hadoopVersion.value}.jar" s"${moduleName.value}-${version.value}-hadoop${hadoopVersion.value}.jar"
} }
}, },
jarName in (Test, assembly) := s"${moduleName.value}-test-${version.value}.jar", assemblyJarName in (Test, assembly) := s"${moduleName.value}-test-${version.value}.jar",
mergeStrategy in assembly := { assemblyMergeStrategy in assembly := {
case m if m.toLowerCase.endsWith("manifest.mf") => MergeStrategy.discard case m if m.toLowerCase.endsWith("manifest.mf") => MergeStrategy.discard
case m if m.toLowerCase.matches("meta-inf.*\\.sf$") => MergeStrategy.discard case m if m.toLowerCase.matches("meta-inf.*\\.sf$") => MergeStrategy.discard
case "log4j.properties" => MergeStrategy.discard case "log4j.properties" => MergeStrategy.discard
...@@ -632,8 +630,7 @@ object Assembly { ...@@ -632,8 +630,7 @@ object Assembly {
} }
object PySparkAssembly { object PySparkAssembly {
import sbtassembly.Plugin._ import sbtassembly.AssemblyPlugin.autoImport._
import AssemblyKeys._
import java.util.zip.{ZipOutputStream, ZipEntry} import java.util.zip.{ZipOutputStream, ZipEntry}
lazy val settings = Seq( lazy val settings = Seq(
......
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.11.2") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0") addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.0.1")
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2") addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0") addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.11") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.12")
addSbtPlugin("com.alpinenow" % "junit_xml_listener" % "0.5.1") addSbtPlugin("com.alpinenow" % "junit_xml_listener" % "0.5.1")
...@@ -16,9 +16,9 @@ addSbtPlugin("com.cavorite" % "sbt-avro" % "0.3.2") ...@@ -16,9 +16,9 @@ addSbtPlugin("com.cavorite" % "sbt-avro" % "0.3.2")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0") addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
libraryDependencies += "org.ow2.asm" % "asm" % "5.0.3" libraryDependencies += "org.ow2.asm" % "asm" % "5.1"
libraryDependencies += "org.ow2.asm" % "asm-commons" % "5.0.3" libraryDependencies += "org.ow2.asm" % "asm-commons" % "5.1"
addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.7.11") addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.7.11")
......
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