Repository: flume Updated Branches: refs/heads/trunk ffc555443 -> 286c24424 (forced update)
http://git-wip-us.apache.org/repos/asf/flume/blob/69c66efe/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 new file mode 100644 index 0000000..1263a38 --- /dev/null +++ b/flume-ng-sinks/flume-ng-kafka-sink/src/test/resources/log4j2.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="OFF"> + <Properties> + <Property name="kafka.logs.dir">target/logs</Property> + </Properties> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> + </Console> + <RollingFile name="kafka" fileName="${kafka.logs.dir}/server.log"> + <PatternLayout pattern="[%d] %p %m (%c)%n" /> + <CronTriggeringPolicy schedule="0 0 0 * * ?"/> + </RollingFile> + <RollingFile name="stateChange" fileName="${kafka.logs.dir}/state-change.log"> + <PatternLayout pattern="[%d] %p %m (%c)%n" /> + <CronTriggeringPolicy schedule="0 0 0 * * ?"/> + </RollingFile> + <RollingFile name="request" fileName="${kafka.logs.dir}/kafka-request.log"> + <PatternLayout pattern="[%d] %p %m (%c)%n" /> + <CronTriggeringPolicy schedule="0 0 0 * * ?"/> + </RollingFile> + <RollingFile name="cleaner" fileName="${kafka.logs.dir}/log-cleaner.log"> + <PatternLayout pattern="[%d] %p %m (%c)%n" /> + <CronTriggeringPolicy schedule="0 0 0 * * ?"/> + </RollingFile> + <RollingFile name="controller" fileName="${kafka.logs.dir}/controller.log"> + <PatternLayout pattern="[%d] %p %m (%c)%n" /> + <CronTriggeringPolicy schedule="0 0 0 * * ?"/> + </RollingFile> + </Appenders> + + <Loggers> + <Logger name="kafka" level="info"> + <AppenderRef ref="kafka"/> + </Logger> + <Logger name="kafka.network.RequestChannel.*" level="WARN" additivity="false"> + <AppenderRef ref="request"/> + </Logger> + <Logger name="kafka.request.logger" level="WARN" additivity="false"> + <AppenderRef ref="request"/> + </Logger> + <Logger name="kafka.controller" level="TRACE" additivity="false"> + <AppenderRef ref="controller"/> + </Logger> + <Logger name="kafka.log.cleaner" level="INFO" additivity="false"> + <AppenderRef ref="cleaner"/> + </Logger> + <Logger name="state.change.logger" level="TRACE" additivity="false"> + <AppenderRef ref="stateChange"/> + </Logger> + <Root level="INFO"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/69c66efe/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 e41adfc..84ddf94 100644 --- a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml @@ -61,13 +61,6 @@ limitations under the License. <optional>true</optional> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> <!-- flume provides 1.7.2 and solr depends on 1.6.4 --> - <scope>provided</scope> - </dependency> - <dependency> <!-- see http://lucene.apache.org/solr --> <groupId>org.apache.solr</groupId> <artifactId>solr-test-framework</artifactId> @@ -90,6 +83,36 @@ limitations under the License. </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-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flume/blob/69c66efe/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/log4j.properties b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/log4j.properties deleted file mode 100644 index 4bfd3fc..0000000 --- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/log4j.properties +++ /dev/null @@ -1,34 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -log4j.rootLogger=WARN, A1 - -log4j.logger.org.apache.flume.sink=INFO -#log4j.logger.org.apache.flume.sink.solr=DEBUG -log4j.logger.org.apache.solr=INFO -#log4j.logger.org.apache.solr.hadoop=DEBUG -log4j.logger.org.kitesdk.morphline=DEBUG -log4j.logger.org.apache.solr.morphline=DEBUG -log4j.logger.org.apache.solr.update.processor.LogUpdateProcessor=WARN -log4j.logger.org.apache.solr.core.SolrCore=WARN -log4j.logger.org.apache.solr.search.SolrIndexSearcher=ERROR - -# A1 is set to be a ConsoleAppender. -log4j.appender.A1=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n http://git-wip-us.apache.org/repos/asf/flume/blob/69c66efe/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/log4j2.xml b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/log4j2.xml new file mode 100644 index 0000000..61de228 --- /dev/null +++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/log4j2.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="OFF"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%-4r [%t] %-5p %c %x - %m%n" /> + </Console> + </Appenders> + <Loggers> + <Logger name="org.apache.flume.sink" level="INFO"/> + <Logger name="org.apache.solr" level="DEBUG"/> + <Logger name="org.kitesdk.morphline" level="DEBUG"/> + <Logger name="org.apache.solr.morphline" level="DEBUG"/> + <Logger name="org.apache.solr" level="DEBUG"/> + <Logger name="org.apache.solr.update.processor.LogUpdateProcessor" level="WARN"/> + <Logger name="org.apache.solr.core.SolrCore" level="WARN"/> + <Logger name="org.apache.solr.search.SolrIndexSearcher" level="ERROR"/> + <Root level="WARN"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/69c66efe/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 555f36c..fb2eb76 100644 --- a/flume-ng-sources/flume-jms-source/pom.xml +++ b/flume-ng-sources/flume-jms-source/pom.xml @@ -65,8 +65,26 @@ limitations under the License. </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <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> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/69c66efe/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 ae8004f..b653fbd 100644 --- a/flume-ng-sources/flume-kafka-source/pom.xml +++ b/flume-ng-sources/flume-kafka-source/pom.xml @@ -61,6 +61,16 @@ <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> @@ -76,6 +86,16 @@ <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/69c66efe/flume-ng-sources/flume-kafka-source/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/flume-ng-sources/flume-kafka-source/src/test/resources/log4j.properties b/flume-ng-sources/flume-kafka-source/src/test/resources/log4j.properties deleted file mode 100644 index 78b1067..0000000 --- a/flume-ng-sources/flume-kafka-source/src/test/resources/log4j.properties +++ /dev/null @@ -1,25 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - - -log4j.rootLogger = INFO, out - -log4j.appender.out = org.apache.log4j.ConsoleAppender -log4j.appender.out.layout = org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern = %d (%t) [%p - %l] %m%n - -log4j.logger.org.apache.flume = INFO \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/69c66efe/flume-ng-sources/flume-kafka-source/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sources/flume-kafka-source/src/test/resources/log4j2.xml b/flume-ng-sources/flume-kafka-source/src/test/resources/log4j2.xml new file mode 100644 index 0000000..7caf0d2 --- /dev/null +++ b/flume-ng-sources/flume-kafka-source/src/test/resources/log4j2.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="OFF"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> + </Console> + </Appenders> + <Loggers> + <Logger name="org.apache.flume" level="INFO"/> + <Root level="INFO"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/69c66efe/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 dc46c62..933f5aa 100644 --- a/flume-ng-sources/flume-scribe-source/pom.xml +++ b/flume-ng-sources/flume-scribe-source/pom.xml @@ -150,8 +150,26 @@ limitations under the License. </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <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> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/69c66efe/flume-ng-sources/flume-twitter-source/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/flume-ng-sources/flume-twitter-source/src/test/resources/log4j.properties b/flume-ng-sources/flume-twitter-source/src/test/resources/log4j.properties deleted file mode 100644 index 7755024..0000000 --- a/flume-ng-sources/flume-twitter-source/src/test/resources/log4j.properties +++ /dev/null @@ -1,33 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -log4j.rootLogger=WARN, A1 - -log4j.logger.org.apache.flume.sink=INFO -#log4j.logger.org.apache.flume.sink.solr=DEBUG -log4j.logger.org.apache.solr=INFO -#log4j.logger.org.apache.solr.hadoop=DEBUG -log4j.logger.org.apache.solr.morphline=DEBUG -log4j.logger.org.apache.solr.update.processor.LogUpdateProcessor=WARN -log4j.logger.org.apache.solr.core.SolrCore=WARN -log4j.logger.org.apache.solr.search.SolrIndexSearcher=ERROR - -# A1 is set to be a ConsoleAppender. -log4j.appender.A1=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n http://git-wip-us.apache.org/repos/asf/flume/blob/69c66efe/flume-ng-sources/flume-twitter-source/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sources/flume-twitter-source/src/test/resources/log4j2.xml b/flume-ng-sources/flume-twitter-source/src/test/resources/log4j2.xml new file mode 100644 index 0000000..0f3d384 --- /dev/null +++ b/flume-ng-sources/flume-twitter-source/src/test/resources/log4j2.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="OFF"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%-4r [%t] %-5p %c %x - %m%n" /> + </Console> + </Appenders> + <Loggers> + <Logger name="org.apache.flume.sink" level="INFO"/> + <Logger name="org.apache.solr" level="INFO"/> + <Logger name="org.apache.solr.morphline" level="DEBUG"/> + <Logger name="org.apache.solr" level="DEBUG"/> + <Logger name="org.apache.solr.update.processor.LogUpdateProcessor" level="WARN"/> + <Logger name="org.apache.solr.core.SolrCore" level="WARN"/> + <Logger name="org.apache.solr.search.SolrIndexSearcher" level="ERROR"/> + <Root level="WARN"> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/69c66efe/flume-ng-tests/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-tests/pom.xml b/flume-ng-tests/pom.xml index 2a4b42c..ee3f4f4 100644 --- a/flume-ng-tests/pom.xml +++ b/flume-ng-tests/pom.xml @@ -41,8 +41,18 @@ <artifactId>flume-ng-configuration</artifactId> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <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> <dependency> @@ -59,6 +69,16 @@ <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/69c66efe/flume-ng-tests/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/flume-ng-tests/src/test/resources/log4j.properties b/flume-ng-tests/src/test/resources/log4j.properties deleted file mode 100644 index 739ecc8..0000000 --- a/flume-ng-tests/src/test/resources/log4j.properties +++ /dev/null @@ -1,25 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - -log4j.rootLogger = INFO, out - -log4j.appender.out = org.apache.log4j.ConsoleAppender -log4j.appender.out.layout = org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern = %d (%t) [%p - %l] %m%n - -log4j.logger.org.apache.flume = DEBUG http://git-wip-us.apache.org/repos/asf/flume/blob/69c66efe/flume-ng-tests/src/test/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/flume-ng-tests/src/test/resources/log4j2.xml b/flume-ng-tests/src/test/resources/log4j2.xml new file mode 100644 index 0000000..a6e2e30 --- /dev/null +++ b/flume-ng-tests/src/test/resources/log4j2.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<Configuration status="OFF"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d (%t) [%p - %l] %m%n" /> + </Console> + </Appenders> + <Loggers> + <Root level="INFO"> + <Logger name="org.apache.flume" level="DEBUG"/> + <AppenderRef ref="Console" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/69c66efe/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index da84b5b..14a7e89 100644 --- a/pom.xml +++ b/pom.xml @@ -81,8 +81,7 @@ limitations under the License. <kite.version>1.0.0</kite.version> <hive.version>1.0.0</hive.version> <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version> - <log4j-extras.version>1.1</log4j-extras.version> - <log4j-log4j.version>1.2.17</log4j-log4j.version> + <log4j.version>2.10.0</log4j.version> <mapdb.version>0.9.9</mapdb.version> <mina.version>2.0.4</mina.version> <mockito.version>1.9.0</mockito.version> @@ -203,6 +202,16 @@ limitations under the License. <groupId>org.apache.hadoop</groupId> <artifactId>${hadoop.common.artifact.id}</artifactId> <version>${hadoop.version}</version> + <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> @@ -217,6 +226,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> @@ -237,6 +254,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> @@ -253,6 +278,16 @@ limitations under the License. <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -282,6 +317,17 @@ 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> + <scope>test</scope> + </dependency> </dependencies> </dependencyManagement> </profile> @@ -304,6 +350,16 @@ limitations under the License. <groupId>org.apache.hadoop</groupId> <artifactId>${hadoop.common.artifact.id}</artifactId> <version>${hadoop.version}</version> + <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> @@ -318,6 +374,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> @@ -349,6 +413,16 @@ limitations under the License. <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Ideally this should be optional, but making it optional causes @@ -408,6 +482,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> @@ -426,6 +508,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> @@ -442,6 +532,17 @@ 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> + <scope>test</scope> + </dependency> </dependencies> </dependencyManagement> </profile> @@ -991,25 +1092,33 @@ limitations under the License. </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j-log4j.version}</version> - <exclusions> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j.version}</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>apache-log4j-extras</artifactId> - <version>${log4j-extras.version}</version> + <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> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-1.2-api</artifactId> + <version>${log4j.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <version>${log4j.version}</version> </dependency> <dependency> @@ -1019,9 +1128,16 @@ 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> @@ -1134,6 +1250,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> @@ -1216,6 +1340,12 @@ limitations under the License. <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> <version>${zookeeper.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -1516,6 +1646,16 @@ limitations under the License. <groupId>org.apache.kafka</groupId> <artifactId>kafka_2.10</artifactId> <version>${kafka.version}</version> + <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> @@ -1546,11 +1686,31 @@ limitations under the License. <groupId>org.apache.hive</groupId> <artifactId>hive-exec</artifactId> <version>${hive.version}</version> + <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.hive</groupId> <artifactId>hive-metastore</artifactId> <version>${hive.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -1563,6 +1723,16 @@ limitations under the License. <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-streaming</artifactId> <version>${hive.version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>
