You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spot.apache.org by ta...@apache.org on 2018/09/20 19:47:45 UTC
[2/3] incubator-spot git commit: Usage of assembly changed
Usage of assembly changed
Because the version of assembly updated, the usage has changed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spot/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spot/commit/5957e228
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spot/tree/5957e228
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spot/diff/5957e228
Branch: refs/heads/master
Commit: 5957e2287cafd5947dbe614bf428ae14d614fbe2
Parents: bf5b930
Author: Sun Hao <29...@qq.com>
Authored: Sat Jan 27 15:05:17 2018 +0800
Committer: GitHub <no...@github.com>
Committed: Sat Jan 27 15:05:17 2018 +0800
----------------------------------------------------------------------
spot-ml/build.sbt | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spot/blob/5957e228/spot-ml/build.sbt
----------------------------------------------------------------------
diff --git a/spot-ml/build.sbt b/spot-ml/build.sbt
index 5ffc520..cc83ed0 100644
--- a/spot-ml/build.sbt
+++ b/spot-ml/build.sbt
@@ -23,9 +23,7 @@ scalaVersion := "2.11.8"
val sparkVersion = "2.1.0"
-import sbtassembly.Plugin.AssemblyKeys._
-
-assemblySettings
+baseAssemblySettings
libraryDependencies += "org.apache.spark" %% "spark-core" % sparkVersion % "provided"
libraryDependencies += "org.apache.spark" %% "spark-mllib" % sparkVersion
@@ -37,7 +35,7 @@ resolvers += Resolver.sonatypeRepo("public")
val meta = """META.INF(.)*""".r
-mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) => {
+assemblyMergeStrategy in assembly := {
case PathList("org", "apache", "commons", xs@_*) => MergeStrategy.last
case PathList("com", "esotericsoftware", "minlog", xs@_*) => MergeStrategy.last
case PathList("com", "google", xs@_*) => MergeStrategy.last
@@ -50,7 +48,6 @@ mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) => {
case meta(_) => MergeStrategy.discard
case x => MergeStrategy.first
}
-}
// super important with multiple tests running spark Contexts
parallelExecution in Test := false
@@ -69,4 +66,4 @@ getTop1MFileFromAlexa := {
}
}
-resourceGenerators in Compile <+= getTop1MFileFromAlexa
\ No newline at end of file
+resourceGenerators in Compile += getTop1MFileFromAlexa