You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gearpump.apache.org by ma...@apache.org on 2017/07/20 08:35:16 UTC
incubator-gearpump git commit: [GEARPUMP-322] Fix multiple SLF4J
bindings on classpath
Repository: incubator-gearpump
Updated Branches:
refs/heads/master e3c63ef2b -> 05f68bc55
[GEARPUMP-322] Fix multiple SLF4J bindings on classpath
Author: huafengw <fv...@gmail.com>
Closes #196 from huafengw/fix322.
Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/05f68bc5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/05f68bc5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/05f68bc5
Branch: refs/heads/master
Commit: 05f68bc55aad8e56c0587995fce84fd471823bc1
Parents: e3c63ef
Author: huafengw <fv...@gmail.com>
Authored: Thu Jul 20 16:34:50 2017 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Thu Jul 20 16:34:58 2017 +0800
----------------------------------------------------------------------
project/BuildExperiments.scala | 3 ++-
project/BuildGearpump.scala | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/05f68bc5/project/BuildExperiments.scala
----------------------------------------------------------------------
diff --git a/project/BuildExperiments.scala b/project/BuildExperiments.scala
index 92957a1..0d3adb0 100644
--- a/project/BuildExperiments.scala
+++ b/project/BuildExperiments.scala
@@ -46,7 +46,8 @@ object BuildExperiments extends sbt.Build {
"org.apache.hadoop" % "hadoop-mapreduce-client-core" % hadoopVersion,
"org.apache.hadoop" % "hadoop-yarn-server-resourcemanager" % hadoopVersion % "provided",
"org.apache.hadoop" % "hadoop-yarn-server-nodemanager" % hadoopVersion % "provided"
- )
+ ).map(_.exclude("org.slf4j", "slf4j-api"))
+ .map(_.exclude("org.slf4j", "slf4j-log4j12"))
))
.dependsOn(services % "test->test;compile->compile",
core % "provided", gearpumpHadoop).disablePlugins(sbtassembly.AssemblyPlugin)
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/05f68bc5/project/BuildGearpump.scala
----------------------------------------------------------------------
diff --git a/project/BuildGearpump.scala b/project/BuildGearpump.scala
index f0c9517..895c042 100644
--- a/project/BuildGearpump.scala
+++ b/project/BuildGearpump.scala
@@ -219,7 +219,8 @@ object BuildGearpump extends sbt.Build {
libraryDependencies ++= Seq(
"org.apache.hadoop" % "hadoop-hdfs" % hadoopVersion,
"org.apache.hadoop" % "hadoop-common" % hadoopVersion
- )
+ ).map(_.exclude("org.slf4j", "slf4j-api"))
+ .map(_.exclude("org.slf4j", "slf4j-log4j12"))
)
).dependsOn(core % "provided").disablePlugins(sbtassembly.AssemblyPlugin)