Revert "[SPARK-18697][BUILD] Upgrade sbt plugins"

This reverts commit 7f31d37.
tpoterba · Dec 7, 2016 · 4cc8d89 · 4cc8d89
1 parent 81e5619
commit 4cc8d89
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
@@ -596,17 +596,19 @@ object Hive {
 }
 
 object Assembly {
-  import sbtassembly.AssemblyPlugin.autoImport._
+  import sbtassembly.AssemblyUtils._
+  import sbtassembly.Plugin._
+  import AssemblyKeys._
 
   val hadoopVersion = taskKey[String]("The version of hadoop that spark is compiled against.")
 
-  lazy val settings = Seq(
+  lazy val settings = assemblySettings ++ Seq(
     test in assembly := {},
     hadoopVersion := {
       sys.props.get("hadoop.version")
         .getOrElse(SbtPomKeys.effectivePom.value.getProperties.get("hadoop.version").asInstanceOf[String])
     },
-    assemblyJarName in assembly := {
+    jarName in assembly := {
       if (moduleName.value.contains("streaming-flume-assembly")
         || moduleName.value.contains("streaming-kafka-0-8-assembly")
         || moduleName.value.contains("streaming-kafka-0-10-assembly")
@@ -617,8 +619,8 @@ object Assembly {
         s"${moduleName.value}-${version.value}-hadoop${hadoopVersion.value}.jar"
       }
     },
-    assemblyJarName in (Test, assembly) := s"${moduleName.value}-test-${version.value}.jar",
-    assemblyMergeStrategy in assembly := {
+    jarName in (Test, assembly) := s"${moduleName.value}-test-${version.value}.jar",
+    mergeStrategy in assembly := {
       case m if m.toLowerCase.endsWith("manifest.mf")          => MergeStrategy.discard
       case m if m.toLowerCase.matches("meta-inf.*\\.sf$")      => MergeStrategy.discard
       case "log4j.properties"                                  => MergeStrategy.discard
@@ -630,7 +632,8 @@ object Assembly {
 }
 
 object PySparkAssembly {
-  import sbtassembly.AssemblyPlugin.autoImport._
+  import sbtassembly.Plugin._
+  import AssemblyKeys._
   import java.util.zip.{ZipOutputStream, ZipEntry}
 
   lazy val settings = Seq(

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,12 +1,12 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.11.2")
 
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.0.1")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
 
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
 
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
 
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.12")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.11")
 
 addSbtPlugin("com.alpinenow" % "junit_xml_listener" % "0.5.1")
 
@@ -16,9 +16,9 @@ addSbtPlugin("com.cavorite" % "sbt-avro" % "0.3.2")
 
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
 
-libraryDependencies += "org.ow2.asm"  % "asm" % "5.1"
+libraryDependencies += "org.ow2.asm"  % "asm" % "5.0.3"
 
-libraryDependencies += "org.ow2.asm"  % "asm-commons" % "5.1"
+libraryDependencies += "org.ow2.asm"  % "asm-commons" % "5.0.3"
 
 addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.7.11")