kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ij...@apache.org
Subject kafka git commit: MINOR: add slf4jlog4j to streams example
Date Mon, 22 Aug 2016 22:53:23 GMT
Repository: kafka
Updated Branches:
  refs/heads/0.10.0 45259d11a -> 8bf9addd2


MINOR: add slf4jlog4j to streams example

Author: Guozhang Wang <wangguoz@gmail.com>

Reviewers: Ismael Juma <ismael@juma.me.uk>

Closes #1731 from guozhangwang/Kminor-log4j-streams-examples

(cherry picked from commit d903babb726bdf725bd473c0590f9826b6fa2f14)
Signed-off-by: Ismael Juma <ismael@juma.me.uk>


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/8bf9addd
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/8bf9addd
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/8bf9addd

Branch: refs/heads/0.10.0
Commit: 8bf9addd25a0cccdd79a68ef792c106f671f842f
Parents: 45259d1
Author: Guozhang Wang <wangguoz@gmail.com>
Authored: Mon Aug 22 23:52:50 2016 +0100
Committer: Ismael Juma <ismael@juma.me.uk>
Committed: Mon Aug 22 23:53:12 2016 +0100

----------------------------------------------------------------------
 build.gradle               | 8 +++++++-
 gradle/dependencies.gradle | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/8bf9addd/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index b565200..aa90fc7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -680,7 +680,12 @@ project(':streams') {
       exclude module: 'jline'
       exclude module: 'netty'
     }
-    compile libs.jacksonDatabind // this dependency should be removed after KIP-4
+
+    // zkclient has a hard log4j dependency, we set it here as well to avoid copying an older
+    // version to the binary package; the following two dependencies should be removed after
KIP-4
+    // (along with the zkclient dependency)
+    compile libs.log4j
+    compile libs.jacksonDatabind
 
     testCompile project(':clients').sourceSets.test.output
     testCompile project(':core')
@@ -728,6 +733,7 @@ project(':streams:examples') {
   dependencies {
     compile project(':streams')
     compile project(':connect:json')  // this dependency should be removed after we unify
data API
+    compile libs.slf4jlog4j           // this dependency should be removed after KIP-4
   }
 
   javadoc {

http://git-wip-us.apache.org/repos/asf/kafka/blob/8bf9addd/gradle/dependencies.gradle
----------------------------------------------------------------------
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index f1b4ecd..83a2081 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -31,6 +31,7 @@ versions += [
   jackson: "2.6.3",
   jetty: "9.2.15.v20160210",
   jersey: "2.22.2",
+  log4j: "1.2.17",
   jopt: "4.9",
   junit: "4.12",
   lz4: "1.3.0",
@@ -85,6 +86,7 @@ libs += [
   jettyServlets: "org.eclipse.jetty:jetty-servlets:$versions.jetty",
   jerseyContainerServlet: "org.glassfish.jersey.containers:jersey-container-servlet:$versions.jersey",
   junit: "junit:junit:$versions.junit",
+  log4j: "log4j:log4j:$versions.log4j",
   joptSimple: "net.sf.jopt-simple:jopt-simple:$versions.jopt",
   lz4: "net.jpountz.lz4:lz4:$versions.lz4",
   metrics: "com.yammer.metrics:metrics-core:$versions.metrics",


Mime
View raw message