You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by ij...@apache.org on 2016/08/22 22:52:59 UTC
kafka git commit: MINOR: add slf4jlog4j to streams example
Repository: kafka
Updated Branches:
refs/heads/trunk d851ce76f -> d903babb7
MINOR: add slf4jlog4j to streams example
Author: Guozhang Wang <wa...@gmail.com>
Reviewers: Ismael Juma <is...@juma.me.uk>
Closes #1731 from guozhangwang/Kminor-log4j-streams-examples
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/d903babb
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/d903babb
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/d903babb
Branch: refs/heads/trunk
Commit: d903babb726bdf725bd473c0590f9826b6fa2f14
Parents: d851ce7
Author: Guozhang Wang <wa...@gmail.com>
Authored: Mon Aug 22 23:52:50 2016 +0100
Committer: Ismael Juma <is...@juma.me.uk>
Committed: Mon Aug 22 23:52:50 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/d903babb/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 3214108..31a86f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -695,7 +695,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')
@@ -743,6 +748,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/d903babb/gradle/dependencies.gradle
----------------------------------------------------------------------
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 2634450..ea900b6 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",