Repository: flume Updated Branches: refs/heads/trunk 4b21230b4 -> 94b5ce497
FLUME-3282 Use slf4j in every component Changed http sink to log with slf4j instead of log4j. Changed some test to use slf4j as well. This closes #233 Reviewers: Peter Turcsanyi, Endre Major (Ferenc Szabo via Ferenc Szabo) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/94b5ce49 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/94b5ce49 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/94b5ce49 Branch: refs/heads/trunk Commit: 94b5ce49794968477898a3001d6a93dca7ce5883 Parents: 4b21230 Author: Ferenc Szabo <[email protected]> Authored: Mon Nov 19 16:46:42 2018 +0100 Committer: Ferenc Szabo <[email protected]> Committed: Mon Nov 19 16:46:42 2018 +0100 ---------------------------------------------------------------------- flume-ng-auth/pom.xml | 10 -- flume-ng-channels/flume-file-channel/pom.xml | 12 -- flume-ng-channels/flume-jdbc-channel/pom.xml | 11 -- .../src/test/resources/log4j2.xml | 10 +- .../flume-spillable-memory-channel/pom.xml | 12 -- flume-ng-configuration/pom.xml | 12 +- flume-ng-core/pom.xml | 10 -- flume-ng-embedded-agent/pom.xml | 12 -- .../flume-avro-source/pom.xml | 12 -- .../flume-thrift-source/pom.xml | 12 -- flume-ng-node/pom.xml | 10 -- flume-ng-sdk/pom.xml | 12 -- flume-ng-sinks/flume-dataset-sink/pom.xml | 23 --- flume-ng-sinks/flume-hdfs-sink/pom.xml | 22 --- flume-ng-sinks/flume-hive-sink/pom.xml | 12 -- flume-ng-sinks/flume-http-sink/pom.xml | 11 -- .../org/apache/flume/sink/http/HttpSink.java | 6 +- .../src/test/resources/log4j2.xml | 2 +- flume-ng-sinks/flume-irc-sink/pom.xml | 12 -- .../flume-ng-elasticsearch-sink/pom.xml | 12 -- flume-ng-sinks/flume-ng-hbase-sink/pom.xml | 53 +++--- flume-ng-sinks/flume-ng-hbase2-sink/pom.xml | 33 ++-- flume-ng-sinks/flume-ng-kafka-sink/pom.xml | 12 -- .../src/test/resources/log4j2.xml | 10 +- .../flume-ng-morphline-solr-sink/pom.xml | 12 -- flume-ng-sources/flume-jms-source/pom.xml | 12 -- flume-ng-sources/flume-kafka-source/pom.xml | 22 --- flume-ng-sources/flume-scribe-source/pom.xml | 12 -- flume-ng-tests/pom.xml | 20 --- .../flume/test/agent/TestFileChannel.java | 5 +- .../flume/test/agent/TestSyslogSource.java | 5 +- .../apache/flume/test/util/StagedInstall.java | 5 +- .../org/apache/flume/test/util/SyslogAgent.java | 5 +- flume-shared/flume-shared-kafka-test/pom.xml | 1 - pom.xml | 170 +++++++++++++------ 35 files changed, 187 insertions(+), 425 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-auth/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-auth/pom.xml b/flume-ng-auth/pom.xml index 43d5eec..fa65b09 100644 --- a/flume-ng-auth/pom.xml +++ b/flume-ng-auth/pom.xml @@ -49,16 +49,6 @@ limitations under the License. <dependency> <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> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-channels/flume-file-channel/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-file-channel/pom.xml b/flume-ng-channels/flume-file-channel/pom.xml index c746b77..5305824 100644 --- a/flume-ng-channels/flume-file-channel/pom.xml +++ b/flume-ng-channels/flume-file-channel/pom.xml @@ -89,18 +89,6 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-channels/flume-jdbc-channel/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-jdbc-channel/pom.xml b/flume-ng-channels/flume-jdbc-channel/pom.xml index 2f353af..6020a4c 100644 --- a/flume-ng-channels/flume-jdbc-channel/pom.xml +++ b/flume-ng-channels/flume-jdbc-channel/pom.xml @@ -63,17 +63,6 @@ limitations under the License. <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-channels/flume-kafka-channel/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-kafka-channel/src/test/resources/log4j2.xml b/flume-ng-channels/flume-kafka-channel/src/test/resources/log4j2.xml index 1263a38..b4b0067 100644 --- a/flume-ng-channels/flume-kafka-channel/src/test/resources/log4j2.xml +++ b/flume-ng-channels/flume-kafka-channel/src/test/resources/log4j2.xml @@ -24,23 +24,23 @@ <Console name="Console" target="SYSTEM_OUT"> <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> </Console> - <RollingFile name="kafka" fileName="${kafka.logs.dir}/server.log"> + <RollingFile name="kafka" fileName="${kafka.logs.dir}/server.log" filePattern="${kafka.logs.dir}/server.log.%i"> <PatternLayout pattern="[%d] %p %m (%c)%n" /> <CronTriggeringPolicy schedule="0 0 0 * * ?"/> </RollingFile> - <RollingFile name="stateChange" fileName="${kafka.logs.dir}/state-change.log"> + <RollingFile name="stateChange" fileName="${kafka.logs.dir}/state-change.log" filePattern="${kafka.logs.dir}/state-change.log.%i"> <PatternLayout pattern="[%d] %p %m (%c)%n" /> <CronTriggeringPolicy schedule="0 0 0 * * ?"/> </RollingFile> - <RollingFile name="request" fileName="${kafka.logs.dir}/kafka-request.log"> + <RollingFile name="request" fileName="${kafka.logs.dir}/kafka-request.log" filePattern="${kafka.logs.dir}/kafka-request.log.%i"> <PatternLayout pattern="[%d] %p %m (%c)%n" /> <CronTriggeringPolicy schedule="0 0 0 * * ?"/> </RollingFile> - <RollingFile name="cleaner" fileName="${kafka.logs.dir}/log-cleaner.log"> + <RollingFile name="cleaner" fileName="${kafka.logs.dir}/log-cleaner.log" filePattern="${kafka.logs.dir}/log-cleaner.log.%i"> <PatternLayout pattern="[%d] %p %m (%c)%n" /> <CronTriggeringPolicy schedule="0 0 0 * * ?"/> </RollingFile> - <RollingFile name="controller" fileName="${kafka.logs.dir}/controller.log"> + <RollingFile name="controller" fileName="${kafka.logs.dir}/controller.log" filePattern="${kafka.logs.dir}/controller.log.%i"> <PatternLayout pattern="[%d] %p %m (%c)%n" /> <CronTriggeringPolicy schedule="0 0 0 * * ?"/> </RollingFile> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-channels/flume-spillable-memory-channel/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-channels/flume-spillable-memory-channel/pom.xml b/flume-ng-channels/flume-spillable-memory-channel/pom.xml index 4c4776b..9e61026 100644 --- a/flume-ng-channels/flume-spillable-memory-channel/pom.xml +++ b/flume-ng-channels/flume-spillable-memory-channel/pom.xml @@ -95,18 +95,6 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-configuration/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-configuration/pom.xml b/flume-ng-configuration/pom.xml index 5d6fa32..af698d8 100644 --- a/flume-ng-configuration/pom.xml +++ b/flume-ng-configuration/pom.xml @@ -44,17 +44,7 @@ limitations under the License. <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - </dependency> - - <dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-core/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-core/pom.xml b/flume-ng-core/pom.xml index f28b98f..8dc32e4 100644 --- a/flume-ng-core/pom.xml +++ b/flume-ng-core/pom.xml @@ -303,20 +303,10 @@ limitations under the License. <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - </dependency> - - <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-embedded-agent/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-embedded-agent/pom.xml b/flume-ng-embedded-agent/pom.xml index 72380b2..fc3260c 100644 --- a/flume-ng-embedded-agent/pom.xml +++ b/flume-ng-embedded-agent/pom.xml @@ -81,18 +81,6 @@ limitations under the License. </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <optional>true</optional> - </dependency> - - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-legacy-sources/flume-avro-source/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-legacy-sources/flume-avro-source/pom.xml b/flume-ng-legacy-sources/flume-avro-source/pom.xml index 21fe14b..3bbe3fd 100644 --- a/flume-ng-legacy-sources/flume-avro-source/pom.xml +++ b/flume-ng-legacy-sources/flume-avro-source/pom.xml @@ -114,18 +114,6 @@ limitations under the License. <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-legacy-sources/flume-thrift-source/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-legacy-sources/flume-thrift-source/pom.xml b/flume-ng-legacy-sources/flume-thrift-source/pom.xml index 27caf22..5727de3 100644 --- a/flume-ng-legacy-sources/flume-thrift-source/pom.xml +++ b/flume-ng-legacy-sources/flume-thrift-source/pom.xml @@ -157,18 +157,6 @@ limitations under the License. <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-node/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-node/pom.xml b/flume-ng-node/pom.xml index 84aaa40..80ad34b 100644 --- a/flume-ng-node/pom.xml +++ b/flume-ng-node/pom.xml @@ -90,16 +90,6 @@ </dependency> <dependency> - <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>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sdk/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sdk/pom.xml b/flume-ng-sdk/pom.xml index a8747bf..418218b 100644 --- a/flume-ng-sdk/pom.xml +++ b/flume-ng-sdk/pom.xml @@ -210,18 +210,6 @@ limitations under the License. <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sinks/flume-dataset-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-dataset-sink/pom.xml b/flume-ng-sinks/flume-dataset-sink/pom.xml index 3c9b729..1ceb31c 100644 --- a/flume-ng-sinks/flume-dataset-sink/pom.xml +++ b/flume-ng-sinks/flume-dataset-sink/pom.xml @@ -115,29 +115,6 @@ limitations under the License. <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> <version>${hadoop2.version}</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sinks/flume-hdfs-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hdfs-sink/pom.xml b/flume-ng-sinks/flume-hdfs-sink/pom.xml index 214760f..3681e6c 100644 --- a/flume-ng-sinks/flume-hdfs-sink/pom.xml +++ b/flume-ng-sinks/flume-hdfs-sink/pom.xml @@ -71,18 +71,6 @@ limitations under the License. <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> @@ -202,16 +190,6 @@ limitations under the License. <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sinks/flume-hive-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-hive-sink/pom.xml b/flume-ng-sinks/flume-hive-sink/pom.xml index a177b7c..84ee3e1 100644 --- a/flume-ng-sinks/flume-hive-sink/pom.xml +++ b/flume-ng-sinks/flume-hive-sink/pom.xml @@ -156,18 +156,6 @@ limitations under the License. <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sinks/flume-http-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-http-sink/pom.xml b/flume-ng-sinks/flume-http-sink/pom.xml index 594eeec..358ce41 100644 --- a/flume-ng-sinks/flume-http-sink/pom.xml +++ b/flume-ng-sinks/flume-http-sink/pom.xml @@ -99,17 +99,6 @@ limitations under the License. <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sinks/flume-http-sink/src/main/java/org/apache/flume/sink/http/HttpSink.java ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-http-sink/src/main/java/org/apache/flume/sink/http/HttpSink.java b/flume-ng-sinks/flume-http-sink/src/main/java/org/apache/flume/sink/http/HttpSink.java index 08e887b..d4d7ad9 100644 --- a/flume-ng-sinks/flume-http-sink/src/main/java/org/apache/flume/sink/http/HttpSink.java +++ b/flume-ng-sinks/flume-http-sink/src/main/java/org/apache/flume/sink/http/HttpSink.java @@ -26,8 +26,8 @@ import org.apache.flume.Transaction; import org.apache.flume.conf.Configurable; import org.apache.flume.instrumentation.SinkCounter; import org.apache.flume.sink.AbstractSink; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.OutputStream; @@ -48,7 +48,7 @@ import java.util.Map; public class HttpSink extends AbstractSink implements Configurable { /** Class logger. */ - private static final Logger LOG = LogManager.getLogger(HttpSink.class); + private static final Logger LOG = LoggerFactory.getLogger(HttpSink.class); /** Lowest valid HTTP status code. */ private static final int HTTP_STATUS_CONTINUE = 100; http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sinks/flume-http-sink/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-http-sink/src/test/resources/log4j2.xml b/flume-ng-sinks/flume-http-sink/src/test/resources/log4j2.xml index d539bdb..3b08de4 100644 --- a/flume-ng-sinks/flume-http-sink/src/test/resources/log4j2.xml +++ b/flume-ng-sinks/flume-http-sink/src/test/resources/log4j2.xml @@ -19,7 +19,7 @@ <Configuration status="OFF"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> - <PatternLayout pattern="%m%n" /> + <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> </Console> </Appenders> <Loggers> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sinks/flume-irc-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-irc-sink/pom.xml b/flume-ng-sinks/flume-irc-sink/pom.xml index f0e481c..c623fa4 100644 --- a/flume-ng-sinks/flume-irc-sink/pom.xml +++ b/flume-ng-sinks/flume-irc-sink/pom.xml @@ -70,18 +70,6 @@ limitations under the License. <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml b/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml index a70aa2f..1f1ecc4 100644 --- a/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-elasticsearch-sink/pom.xml @@ -66,18 +66,6 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sinks/flume-ng-hbase-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml index 684736a..04c9c2d 100644 --- a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml @@ -67,18 +67,6 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> @@ -212,17 +200,6 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -253,6 +230,16 @@ <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -260,6 +247,16 @@ <artifactId>hbase-server</artifactId> <classifier>tests</classifier> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <!-- There should be no need for Flume to include the following two @@ -303,16 +300,6 @@ <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> </profile> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sinks/flume-ng-hbase2-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-hbase2-sink/pom.xml b/flume-ng-sinks/flume-ng-hbase2-sink/pom.xml index f8f764c..a34c2fa 100644 --- a/flume-ng-sinks/flume-ng-hbase2-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-hbase2-sink/pom.xml @@ -33,6 +33,16 @@ <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> <version>${hbase2.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -40,6 +50,16 @@ <artifactId>hbase-common</artifactId> <version>${hbase2.version}</version> <type>test-jar</type> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -58,7 +78,6 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-server</artifactId> - <version>${hbase2.version}</version> </dependency> <dependency> @@ -143,18 +162,6 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sinks/flume-ng-kafka-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-kafka-sink/pom.xml b/flume-ng-sinks/flume-ng-kafka-sink/pom.xml index 10d2cf9..f9f10ae 100644 --- a/flume-ng-sinks/flume-ng-kafka-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-kafka-sink/pom.xml @@ -95,18 +95,6 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sinks/flume-ng-kafka-sink/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-kafka-sink/src/test/resources/log4j2.xml b/flume-ng-sinks/flume-ng-kafka-sink/src/test/resources/log4j2.xml index 1263a38..b4b0067 100644 --- a/flume-ng-sinks/flume-ng-kafka-sink/src/test/resources/log4j2.xml +++ b/flume-ng-sinks/flume-ng-kafka-sink/src/test/resources/log4j2.xml @@ -24,23 +24,23 @@ <Console name="Console" target="SYSTEM_OUT"> <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> </Console> - <RollingFile name="kafka" fileName="${kafka.logs.dir}/server.log"> + <RollingFile name="kafka" fileName="${kafka.logs.dir}/server.log" filePattern="${kafka.logs.dir}/server.log.%i"> <PatternLayout pattern="[%d] %p %m (%c)%n" /> <CronTriggeringPolicy schedule="0 0 0 * * ?"/> </RollingFile> - <RollingFile name="stateChange" fileName="${kafka.logs.dir}/state-change.log"> + <RollingFile name="stateChange" fileName="${kafka.logs.dir}/state-change.log" filePattern="${kafka.logs.dir}/state-change.log.%i"> <PatternLayout pattern="[%d] %p %m (%c)%n" /> <CronTriggeringPolicy schedule="0 0 0 * * ?"/> </RollingFile> - <RollingFile name="request" fileName="${kafka.logs.dir}/kafka-request.log"> + <RollingFile name="request" fileName="${kafka.logs.dir}/kafka-request.log" filePattern="${kafka.logs.dir}/kafka-request.log.%i"> <PatternLayout pattern="[%d] %p %m (%c)%n" /> <CronTriggeringPolicy schedule="0 0 0 * * ?"/> </RollingFile> - <RollingFile name="cleaner" fileName="${kafka.logs.dir}/log-cleaner.log"> + <RollingFile name="cleaner" fileName="${kafka.logs.dir}/log-cleaner.log" filePattern="${kafka.logs.dir}/log-cleaner.log.%i"> <PatternLayout pattern="[%d] %p %m (%c)%n" /> <CronTriggeringPolicy schedule="0 0 0 * * ?"/> </RollingFile> - <RollingFile name="controller" fileName="${kafka.logs.dir}/controller.log"> + <RollingFile name="controller" fileName="${kafka.logs.dir}/controller.log" filePattern="${kafka.logs.dir}/controller.log.%i"> <PatternLayout pattern="[%d] %p %m (%c)%n" /> <CronTriggeringPolicy schedule="0 0 0 * * ?"/> </RollingFile> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml index 8b19514..8e59960 100644 --- a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml @@ -86,18 +86,6 @@ limitations under the License. <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sources/flume-jms-source/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sources/flume-jms-source/pom.xml b/flume-ng-sources/flume-jms-source/pom.xml index b7d79aa..7bb81c3 100644 --- a/flume-ng-sources/flume-jms-source/pom.xml +++ b/flume-ng-sources/flume-jms-source/pom.xml @@ -72,18 +72,6 @@ limitations under the License. <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sources/flume-kafka-source/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sources/flume-kafka-source/pom.xml b/flume-ng-sources/flume-kafka-source/pom.xml index 9119b20..9b5d697 100644 --- a/flume-ng-sources/flume-kafka-source/pom.xml +++ b/flume-ng-sources/flume-kafka-source/pom.xml @@ -57,21 +57,10 @@ <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka_2.10</artifactId> - <version>${kafka.version}</version> </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.mockito</groupId> @@ -80,23 +69,12 @@ <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka-clients</artifactId> - <version>${kafka.version}</version> </dependency> <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka_2.10</artifactId> <classifier>test</classifier> <scope>test</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-sources/flume-scribe-source/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sources/flume-scribe-source/pom.xml b/flume-ng-sources/flume-scribe-source/pom.xml index 45940af..7761762 100644 --- a/flume-ng-sources/flume-scribe-source/pom.xml +++ b/flume-ng-sources/flume-scribe-source/pom.xml @@ -157,18 +157,6 @@ limitations under the License. <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-tests/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-tests/pom.xml b/flume-ng-tests/pom.xml index 162ed4e..b57c4d2 100644 --- a/flume-ng-tests/pom.xml +++ b/flume-ng-tests/pom.xml @@ -42,16 +42,6 @@ </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> @@ -69,16 +59,6 @@ <groupId>org.apache.hadoop</groupId> <artifactId>${hadoop.common.artifact.id}</artifactId> <optional>true</optional> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.google.guava</groupId> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-tests/src/test/java/org/apache/flume/test/agent/TestFileChannel.java ---------------------------------------------------------------------- diff --git a/flume-ng-tests/src/test/java/org/apache/flume/test/agent/TestFileChannel.java b/flume-ng-tests/src/test/java/org/apache/flume/test/agent/TestFileChannel.java index 6a98292..e7185c1 100644 --- a/flume-ng-tests/src/test/java/org/apache/flume/test/agent/TestFileChannel.java +++ b/flume-ng-tests/src/test/java/org/apache/flume/test/agent/TestFileChannel.java @@ -21,11 +21,12 @@ package org.apache.flume.test.agent; import com.google.common.base.Charsets; import com.google.common.io.Files; import org.apache.flume.test.util.StagedInstall; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.util.ArrayList; @@ -35,7 +36,7 @@ import java.util.concurrent.TimeUnit; public class TestFileChannel { - private static final Logger LOGGER = Logger.getLogger(TestFileChannel.class); + private static final Logger LOGGER = LoggerFactory.getLogger(TestFileChannel.class); private static final Collection<File> tempResources = new ArrayList<File>(); http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-tests/src/test/java/org/apache/flume/test/agent/TestSyslogSource.java ---------------------------------------------------------------------- diff --git a/flume-ng-tests/src/test/java/org/apache/flume/test/agent/TestSyslogSource.java b/flume-ng-tests/src/test/java/org/apache/flume/test/agent/TestSyslogSource.java index 9b1e325..6464e3d 100644 --- a/flume-ng-tests/src/test/java/org/apache/flume/test/agent/TestSyslogSource.java +++ b/flume-ng-tests/src/test/java/org/apache/flume/test/agent/TestSyslogSource.java @@ -20,12 +20,13 @@ package org.apache.flume.test.agent; import org.apache.flume.test.util.SyslogAgent; -import org.apache.log4j.Logger; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; @@ -33,7 +34,7 @@ import java.util.List; @RunWith(Parameterized.class) public class TestSyslogSource { - private static final Logger LOGGER = Logger.getLogger(TestSyslogSource.class); + private static final Logger LOGGER = LoggerFactory.getLogger(TestSyslogSource.class); private SyslogAgent agent; private SyslogAgent.SyslogSourceType sourceType; http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-tests/src/test/java/org/apache/flume/test/util/StagedInstall.java ---------------------------------------------------------------------- diff --git a/flume-ng-tests/src/test/java/org/apache/flume/test/util/StagedInstall.java b/flume-ng-tests/src/test/java/org/apache/flume/test/util/StagedInstall.java index 50b49cc..8eda1e6 100644 --- a/flume-ng-tests/src/test/java/org/apache/flume/test/util/StagedInstall.java +++ b/flume-ng-tests/src/test/java/org/apache/flume/test/util/StagedInstall.java @@ -24,7 +24,8 @@ import com.google.common.collect.ImmutableList; import com.google.common.io.Files; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.FileFilter; @@ -48,7 +49,7 @@ import java.util.zip.GZIPInputStream; */ public class StagedInstall { - private static final Logger LOGGER = Logger.getLogger(StagedInstall.class); + private static final Logger LOGGER = LoggerFactory.getLogger(StagedInstall.class); public static final String PROP_PATH_TO_DIST_TARBALL = "flume.dist.tarball"; http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-ng-tests/src/test/java/org/apache/flume/test/util/SyslogAgent.java ---------------------------------------------------------------------- diff --git a/flume-ng-tests/src/test/java/org/apache/flume/test/util/SyslogAgent.java b/flume-ng-tests/src/test/java/org/apache/flume/test/util/SyslogAgent.java index a2b0f3b..8d9d5e5 100644 --- a/flume-ng-tests/src/test/java/org/apache/flume/test/util/SyslogAgent.java +++ b/flume-ng-tests/src/test/java/org/apache/flume/test/util/SyslogAgent.java @@ -22,8 +22,9 @@ package org.apache.flume.test.util; import com.google.common.base.Charsets; import com.google.common.io.Files; import org.apache.commons.io.FileUtils; -import org.apache.log4j.Logger; import org.junit.Assert; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.BufferedOutputStream; import java.io.File; @@ -42,7 +43,7 @@ import java.util.concurrent.TimeUnit; * */ public class SyslogAgent { - private static final Logger LOGGER = Logger.getLogger(SyslogAgent.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SyslogAgent.class); private static final Collection<File> tempResources = new ArrayList<File>(); private static final int DEFAULT_ATTEMPTS = 20; private static final long DEFAULT_TIMEOUT = 500L; http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/flume-shared/flume-shared-kafka-test/pom.xml ---------------------------------------------------------------------- diff --git a/flume-shared/flume-shared-kafka-test/pom.xml b/flume-shared/flume-shared-kafka-test/pom.xml index 2c1b9dd..49751c2 100644 --- a/flume-shared/flume-shared-kafka-test/pom.xml +++ b/flume-shared/flume-shared-kafka-test/pom.xml @@ -78,7 +78,6 @@ <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka-clients</artifactId> - <version>${kafka.version}</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/94b5ce49/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index aa9f801..687c471 100644 --- a/pom.xml +++ b/pom.xml @@ -182,6 +182,16 @@ limitations under the License. <artifactId>zookeeper</artifactId> <version>${zookeeper.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </dependencyManagement> @@ -244,10 +254,22 @@ limitations under the License. <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> <version>${hadoop.version}</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> + <scope>test</scope> <version>${hadoop.version}</version> <exclusions> <exclusion> @@ -313,6 +335,16 @@ limitations under the License. <artifactId>zookeeper</artifactId> <version>${zookeeper.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <!-- only compatible with hadoop-2 --> @@ -321,18 +353,6 @@ limitations under the License. <artifactId>flume-dataset-sink</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> </dependencies> </dependencyManagement> </profile> @@ -392,6 +412,7 @@ limitations under the License. <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> + <scope>test</scope> <version>${hadoop.version}</version> <exclusions> <exclusion> @@ -402,6 +423,14 @@ limitations under the License. <groupId>tomcat</groupId> <artifactId>jasper-runtime</artifactId> </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -437,6 +466,16 @@ limitations under the License. <groupId>org.apache.hbase</groupId> <artifactId>hbase-client</artifactId> <version>${hbase.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -445,12 +484,32 @@ limitations under the License. <version>${hbase.version}</version> <classifier>tests</classifier> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-testing-util</artifactId> <version>${hbase.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <!-- There should be no need for Flume to include the following two @@ -463,6 +522,16 @@ limitations under the License. <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> <version>${hbase.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -471,6 +540,16 @@ limitations under the License. <version>${hbase.version}</version> <classifier>tests</classifier> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -529,6 +608,16 @@ limitations under the License. <artifactId>zookeeper</artifactId> <version>${zookeeper.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <!-- only compatible with hadoop-2 --> @@ -537,18 +626,6 @@ limitations under the License. <artifactId>flume-dataset-sink</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> </dependencies> </dependencyManagement> </profile> @@ -1172,18 +1249,6 @@ limitations under the License. <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>${log4j.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4j.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <version>${log4j.version}</version> </dependency> @@ -1207,19 +1272,6 @@ limitations under the License. </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro</artifactId> <version>${avro.version}</version> @@ -1424,6 +1476,10 @@ limitations under the License. <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> </exclusions> </dependency> @@ -1772,8 +1828,22 @@ limitations under the License. <version>${kafka.version}</version> <classifier>test</classifier> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.kafka</groupId> + <artifactId>kafka-clients</artifactId> + <version>${kafka.version}</version> </dependency> - <dependency> <groupId>org.kitesdk</groupId> <artifactId>kite-data-core</artifactId>
