You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by do...@apache.org on 2016/10/07 22:08:02 UTC
[21/50] [abbrv] incubator-predictionio git commit:
0.10.0-incubating-rc4: fix assembly conflicts
0.10.0-incubating-rc4: fix assembly conflicts
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/3179dd8d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/3179dd8d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/3179dd8d
Branch: refs/heads/master
Commit: 3179dd8d64f4293da868c7cfca3867800a8aca9c
Parents: 9c27d14
Author: Donald Szeto <do...@apache.org>
Authored: Wed Sep 21 11:01:39 2016 -0700
Committer: Donald Szeto <do...@apache.org>
Committed: Wed Sep 21 11:01:39 2016 -0700
----------------------------------------------------------------------
build.sbt | 2 +-
tools/build.sbt | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/3179dd8d/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 31fa258..94d78a1 100644
--- a/build.sbt
+++ b/build.sbt
@@ -19,7 +19,7 @@ import UnidocKeys._
name := "apache-predictionio-parent"
-version in ThisBuild := "0.10.0-incubating-rc3"
+version in ThisBuild := "0.10.0-incubating-rc4"
organization in ThisBuild := "org.apache.predictionio"
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/3179dd8d/tools/build.sbt
----------------------------------------------------------------------
diff --git a/tools/build.sbt b/tools/build.sbt
index 07a6ad3..fefdb45 100644
--- a/tools/build.sbt
+++ b/tools/build.sbt
@@ -39,6 +39,13 @@ libraryDependencies ++= Seq(
dependencyOverrides += "org.slf4j" % "slf4j-log4j12" % "1.7.18"
+assemblyMergeStrategy in assembly := {
+ case PathList("META-INF", "LICENSE.txt") => MergeStrategy.concat
+ case PathList("META-INF", "NOTICE.txt") => MergeStrategy.concat
+ case x =>
+ val oldStrategy = (assemblyMergeStrategy in assembly).value
+ oldStrategy(x)
+}
excludedJars in assembly <<= (fullClasspath in assembly) map { cp =>
cp filter { _.data.getName match {