Merge branch 'STORM-848' of https://github.com/kishorvpatil/incubator-storm into STORM-848
STORM-848: Shade external dependencies Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/992603a6 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/992603a6 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/992603a6 Branch: refs/heads/master Commit: 992603a651dc4c55f91ebec5cd1aecc2ec09de60 Parents: 4a523ad 6168ae4 Author: Robert (Bobby) Evans <ev...@yahoo-inc.com> Authored: Fri Jun 5 11:03:22 2015 -0500 Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com> Committed: Fri Jun 5 11:03:22 2015 -0500 ---------------------------------------------------------------------- external/flux/flux-core/pom.xml | 4 + external/storm-hdfs/pom.xml | 4 + external/storm-jdbc/pom.xml | 4 + external/storm-kafka/pom.xml | 8 + pom.xml | 18 +- storm-core/pom.xml | 226 +++++++++++++++++++- storm-dist/binary/src/main/assembly/binary.xml | 30 +++ 7 files changed, 272 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/992603a6/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/992603a6/storm-core/pom.xml ---------------------------------------------------------------------- diff --cc storm-core/pom.xml index 18992f2,c43c6b2..096643e --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@@ -198,18 -199,11 +199,19 @@@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> + <scope>compile</scope> </dependency> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/storm/blob/992603a6/storm-dist/binary/src/main/assembly/binary.xml ----------------------------------------------------------------------