You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2016/12/07 01:03:44 UTC
spark git commit: Revert "[SPARK-18697][BUILD] Upgrade sbt plugins"
Repository: spark
Updated Branches:
refs/heads/master 81e5619ca -> 4cc8d8906
Revert "[SPARK-18697][BUILD] Upgrade sbt plugins"
This reverts commit 7f31d378c4025cb3dea2b96fcf2a9e451c534df0.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4cc8d890
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4cc8d890
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4cc8d890
Branch: refs/heads/master
Commit: 4cc8d8906df3025cebb7f9fcc14d25d659d602cc
Parents: 81e5619
Author: Sean Owen <so...@cloudera.com>
Authored: Wed Dec 7 09:03:20 2016 +0800
Committer: Sean Owen <so...@cloudera.com>
Committed: Wed Dec 7 09:03:20 2016 +0800
----------------------------------------------------------------------
project/SparkBuild.scala | 15 +++++++++------
project/plugins.sbt | 10 +++++-----
2 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/4cc8d890/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index b1c0453..fdc33c7 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(
http://git-wip-us.apache.org/repos/asf/spark/blob/4cc8d890/project/plugins.sbt
----------------------------------------------------------------------
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 5df88d9..76597d2 100644
--- 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")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org