Repository: flume Updated Branches: refs/heads/flume-1.9 46ea007df -> 1a2c82365
http://git-wip-us.apache.org/repos/asf/flume/blob/1a2c8236/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 deleted file mode 100644 index 61de228..0000000 --- a/flume-ng-sinks/flume-ng-morphline-solr-sink/src/test/resources/log4j2.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?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/1a2c8236/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 ef0757e..d736d16 100644 --- a/flume-ng-sources/flume-jms-source/pom.xml +++ b/flume-ng-sources/flume-jms-source/pom.xml @@ -71,14 +71,8 @@ limitations under the License. </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> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/1a2c8236/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 new file mode 100644 index 0000000..78b1067 --- /dev/null +++ b/flume-ng-sources/flume-kafka-source/src/test/resources/log4j.properties @@ -0,0 +1,25 @@ +# +# 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/1a2c8236/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 deleted file mode 100644 index 7caf0d2..0000000 --- a/flume-ng-sources/flume-kafka-source/src/test/resources/log4j2.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?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/1a2c8236/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 1cf3716..4efa5ea 100644 --- a/flume-ng-sources/flume-scribe-source/pom.xml +++ b/flume-ng-sources/flume-scribe-source/pom.xml @@ -156,14 +156,8 @@ limitations under the License. </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> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/1a2c8236/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 new file mode 100644 index 0000000..7755024 --- /dev/null +++ b/flume-ng-sources/flume-twitter-source/src/test/resources/log4j.properties @@ -0,0 +1,33 @@ +# 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/1a2c8236/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 deleted file mode 100644 index 0f3d384..0000000 --- a/flume-ng-sources/flume-twitter-source/src/test/resources/log4j2.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?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/1a2c8236/flume-ng-tests/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-tests/pom.xml b/flume-ng-tests/pom.xml index bbefbc9..b5369fb 100644 --- a/flume-ng-tests/pom.xml +++ b/flume-ng-tests/pom.xml @@ -41,8 +41,8 @@ <artifactId>flume-ng-configuration</artifactId> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/flume/blob/1a2c8236/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 new file mode 100644 index 0000000..739ecc8 --- /dev/null +++ b/flume-ng-tests/src/test/resources/log4j.properties @@ -0,0 +1,25 @@ +# 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/1a2c8236/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 deleted file mode 100644 index a6e2e30..0000000 --- a/flume-ng-tests/src/test/resources/log4j2.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?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/1a2c8236/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index eadc6b8..26343f9 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,8 @@ 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.version>2.10.0</log4j.version> + <log4j-extras.version>1.1</log4j-extras.version> + <log4j-log4j.version>1.2.17</log4j-log4j.version> <mapdb.version>0.9.9</mapdb.version> <mina.version>2.0.4</mina.version> <mockito.version>1.9.0</mockito.version> @@ -446,7 +447,7 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> + </plugin> <plugin> <groupId>com.github.spotbugs</groupId> <artifactId>spotbugs-maven-plugin</artifactId> @@ -725,14 +726,6 @@ limitations under the License. <scope>test</scope> <exclusions> <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> <!-- exclude this from hadoop minikdc as the minikdc depends on the apacheds-jdbm1 bundle, which is not available in maven central--> <groupId>org.apache.directory.jdbm</groupId> @@ -769,26 +762,36 @@ limitations under the License. </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${log4j.version}</version> + <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> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - <version>${log4j.version}</version> + <groupId>log4j</groupId> + <artifactId>apache-log4j-extras</artifactId> + <version>${log4j-extras.version}</version> </dependency> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <version>${log4j.version}</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <artifactId>slf4j-log4j12</artifactId> <version>${slf4j.version}</version> </dependency> @@ -1304,16 +1307,6 @@ limitations under the License. <groupId>org.apache.kafka</groupId> <artifactId>kafka_2.11</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> @@ -1321,16 +1314,6 @@ 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> @@ -1358,31 +1341,11 @@ 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> @@ -1395,48 +1358,18 @@ 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> <groupId>org.apache.hive.hcatalog</groupId> <artifactId>hive-hcatalog-core</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-cli</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 for Zk provider --> @@ -1489,14 +1422,6 @@ 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> @@ -1512,14 +1437,6 @@ 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> @@ -1536,14 +1453,6 @@ 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> @@ -1560,32 +1469,12 @@ 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> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> <scope>test</scope> <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 @@ -1595,16 +1484,6 @@ 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> @@ -1613,32 +1492,12 @@ 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 @@ -1651,16 +1510,6 @@ 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> @@ -1669,16 +1518,6 @@ 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> @@ -1695,14 +1534,6 @@ 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> @@ -1721,14 +1552,6 @@ 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> @@ -1737,16 +1560,6 @@ 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>
