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

This reverts commit 7f31d378c4025cb3dea2b96fcf2a9e451c534df0.

1 files changed, 9 insertions, 6 deletions

diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index b1c0453285..fdc33c77fe 100644
--- 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(