predictionio-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From don...@apache.org
Subject [36/50] [abbrv] incubator-predictionio git commit: Remove duplicate settings
Date Mon, 24 Apr 2017 17:34:21 GMT
Remove duplicate settings

Closes #365


Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/23a86932
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/23a86932
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/23a86932

Branch: refs/heads/master
Commit: 23a8693282e957fb0bcece08c902184dae9a4e24
Parents: 5f7a59a
Author: shimamoto <chibochibo@gmail.com>
Authored: Tue Mar 28 08:48:50 2017 -0700
Committer: Donald Szeto <donald@apache.org>
Committed: Tue Mar 28 08:48:50 2017 -0700

----------------------------------------------------------------------
 build.sbt              | 2 --
 storage/hdfs/build.sbt | 4 ----
 tools/build.sbt        | 2 --
 3 files changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/23a86932/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index c0542f7..6c4cb7c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -53,8 +53,6 @@ organization in ThisBuild := "org.apache.predictionio"
 
 scalaVersion in ThisBuild := sys.props.getOrElse("scala.version", "2.10.6")
 
-crossScalaVersions in ThisBuild := Seq("2.10.6", "2.11.8")
-
 crossScalaVersions in ThisBuild := Seq(scalaVersion.value, "2.11.8")
 
 scalacOptions in ThisBuild ++= Seq("-deprecation", "-unchecked", "-feature")

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/23a86932/storage/hdfs/build.sbt
----------------------------------------------------------------------
diff --git a/storage/hdfs/build.sbt b/storage/hdfs/build.sbt
index 3fd8d22..f8a2bd5 100644
--- a/storage/hdfs/build.sbt
+++ b/storage/hdfs/build.sbt
@@ -31,10 +31,6 @@ pomExtra := childrenPomExtra.value
 
 assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
 
-assemblyOption in assembly := (assemblyOption in assembly).value.copy(
-  includeScala = false,
-  excludedJars = (fullClasspath in assembly).value.filter {_.data.getName startsWith "apache-predictionio"})
-
 // skip test in assembly
 test in assembly := {}
 

http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/23a86932/tools/build.sbt
----------------------------------------------------------------------
diff --git a/tools/build.sbt b/tools/build.sbt
index a39c6b0..23bb71a 100644
--- a/tools/build.sbt
+++ b/tools/build.sbt
@@ -27,8 +27,6 @@ libraryDependencies ++= Seq(
   "io.spray"               %% "spray-testkit"  % "1.3.3" % "test",
   "org.specs2"             %% "specs2"         % "2.3.13" % "test")
 
-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


Mime
View raw message