You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/04/23 20:43:21 UTC
[1/2] git commit: exclude log4j and slf4j-log4j12 from curator
dependency
Repository: incubator-storm
Updated Branches:
refs/heads/master 6a08855b4 -> 7429e1d16
exclude log4j and slf4j-log4j12 from curator dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/f6daf072
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/f6daf072
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/f6daf072
Branch: refs/heads/master
Commit: f6daf072fd644247090f44e6d054a934974e901a
Parents: c4ea0ca
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Tue Apr 22 12:10:35 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Tue Apr 22 12:10:35 2014 -0400
----------------------------------------------------------------------
storm-core/pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/f6daf072/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 3329b88..22a7a72 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -111,6 +111,16 @@
<dependency>
<groupId>com.netflix.curator</groupId>
<artifactId>curator-framework</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
[2/2] git commit: Merge branch 'zk-log4j-excludes'
Posted by pt...@apache.org.
Merge branch 'zk-log4j-excludes'
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/7429e1d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/7429e1d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/7429e1d1
Branch: refs/heads/master
Commit: 7429e1d163bc7c52a4e111da22ea5dcfc84ea392
Parents: 6a08855 f6daf07
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Apr 23 14:39:53 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Apr 23 14:39:53 2014 -0400
----------------------------------------------------------------------
storm-core/pom.xml | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/7429e1d1/storm-core/pom.xml
----------------------------------------------------------------------