HADOOP-18088. Replace log4j 1.x with reload4j. (#4052)

Co-authored-by: Wei-Chiu Chuang <weichiu@apache.org>
This commit is contained in:
Masatake Iwasaki 2022-04-07 08:33:13 +09:00 committed by Steve Loughran
parent d5845474e2
commit 877ef944f9
No known key found for this signature in database
GPG Key ID: D22CF846DBB162A0
37 changed files with 195 additions and 94 deletions

View File

@ -208,6 +208,7 @@ License Version 2.0:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/AbstractFuture.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/AbstractFuture.java
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/TimeoutFuture.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/checker/TimeoutFuture.java
ch.qos.reload4j:reload4j:1.2.18.3
com.aliyun:aliyun-java-sdk-core:3.4.0 com.aliyun:aliyun-java-sdk-core:3.4.0
com.aliyun:aliyun-java-sdk-ecs:4.2.0 com.aliyun:aliyun-java-sdk-ecs:4.2.0
com.aliyun:aliyun-java-sdk-ram:3.0.0 com.aliyun:aliyun-java-sdk-ram:3.0.0
@ -273,7 +274,6 @@ io.reactivex:rxjava-string:1.1.1
io.reactivex:rxnetty:0.4.20 io.reactivex:rxnetty:0.4.20
io.swagger:swagger-annotations:1.5.4 io.swagger:swagger-annotations:1.5.4
javax.inject:javax.inject:1 javax.inject:javax.inject:1
log4j:log4j:1.2.17
net.java.dev.jna:jna:5.2.0 net.java.dev.jna:jna:5.2.0
net.minidev:accessors-smart:2.4.7 net.minidev:accessors-smart:2.4.7
net.minidev:json-smart:2.4.7 net.minidev:json-smart:2.4.7
@ -436,9 +436,10 @@ org.codehaus.mojo:animal-sniffer-annotations:1.17
org.jruby.jcodings:jcodings:1.0.13 org.jruby.jcodings:jcodings:1.0.13
org.jruby.joni:joni:2.1.2 org.jruby.joni:joni:2.1.2
org.ojalgo:ojalgo:43.0 org.ojalgo:ojalgo:43.0
org.slf4j:jul-to-slf4j:1.7.30 org.slf4j:jcl-over-slf4j:1.7.35
org.slf4j:slf4j-api:1.7.30 org.slf4j:jul-to-slf4j:1.7.35
org.slf4j:slf4j-log4j12:1.7.30 org.slf4j:slf4j-api:1.7.35
org.slf4j:slf4j-reload4j:1.7.35
CDDL 1.1 + GPLv2 with classpath exception CDDL 1.1 + GPLv2 with classpath exception

View File

@ -66,7 +66,7 @@
<excludes> <excludes>
<!-- use slf4j from common to avoid multiple binding warnings --> <!-- use slf4j from common to avoid multiple binding warnings -->
<exclude>org.slf4j:slf4j-api</exclude> <exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude> <exclude>org.slf4j:slf4j-reload4j</exclude>
</excludes> </excludes>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>

View File

@ -40,7 +40,7 @@
<exclude>org.apache.hadoop:hadoop-hdfs</exclude> <exclude>org.apache.hadoop:hadoop-hdfs</exclude>
<!-- use slf4j from common to avoid multiple binding warnings --> <!-- use slf4j from common to avoid multiple binding warnings -->
<exclude>org.slf4j:slf4j-api</exclude> <exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude> <exclude>org.slf4j:slf4j-reload4j</exclude>
<exclude>org.hsqldb:hsqldb</exclude> <exclude>org.hsqldb:hsqldb</exclude>
</excludes> </excludes>
</dependencySet> </dependencySet>

View File

@ -69,7 +69,7 @@
<exclude>org.apache.hadoop:hadoop-hdfs</exclude> <exclude>org.apache.hadoop:hadoop-hdfs</exclude>
<!-- use slf4j from common to avoid multiple binding warnings --> <!-- use slf4j from common to avoid multiple binding warnings -->
<exclude>org.slf4j:slf4j-api</exclude> <exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude> <exclude>org.slf4j:slf4j-reload4j</exclude>
<exclude>org.hsqldb:hsqldb</exclude> <exclude>org.hsqldb:hsqldb</exclude>
</excludes> </excludes>
</dependencySet> </dependencySet>

View File

@ -69,7 +69,7 @@
<exclude>org.apache.hadoop:hadoop-hdfs</exclude> <exclude>org.apache.hadoop:hadoop-hdfs</exclude>
<!-- use slf4j from common to avoid multiple binding warnings --> <!-- use slf4j from common to avoid multiple binding warnings -->
<exclude>org.slf4j:slf4j-api</exclude> <exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude> <exclude>org.slf4j:slf4j-reload4j</exclude>
<exclude>org.hsqldb:hsqldb</exclude> <exclude>org.hsqldb:hsqldb</exclude>
</excludes> </excludes>
</dependencySet> </dependencySet>

View File

@ -179,7 +179,7 @@
<exclude>org.apache.hadoop:hadoop-hdfs</exclude> <exclude>org.apache.hadoop:hadoop-hdfs</exclude>
<!-- use slf4j from common to avoid multiple binding warnings --> <!-- use slf4j from common to avoid multiple binding warnings -->
<exclude>org.slf4j:slf4j-api</exclude> <exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude> <exclude>org.slf4j:slf4j-reload4j</exclude>
<exclude>org.hsqldb:hsqldb</exclude> <exclude>org.hsqldb:hsqldb</exclude>
<exclude>jdiff:jdiff:jar</exclude> <exclude>jdiff:jdiff:jar</exclude>
</excludes> </excludes>

View File

@ -40,7 +40,7 @@
<exclude>org.apache.hadoop:hadoop-hdfs</exclude> <exclude>org.apache.hadoop:hadoop-hdfs</exclude>
<!-- use slf4j from common to avoid multiple binding warnings --> <!-- use slf4j from common to avoid multiple binding warnings -->
<exclude>org.slf4j:slf4j-api</exclude> <exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude> <exclude>org.slf4j:slf4j-reload4j</exclude>
<exclude>org.hsqldb:hsqldb</exclude> <exclude>org.hsqldb:hsqldb</exclude>
</excludes> </excludes>
</dependencySet> </dependencySet>

View File

@ -214,7 +214,7 @@
<exclude>org.apache.hadoop:hadoop-pipes</exclude> <exclude>org.apache.hadoop:hadoop-pipes</exclude>
<!-- use slf4j from common to avoid multiple binding warnings --> <!-- use slf4j from common to avoid multiple binding warnings -->
<exclude>org.slf4j:slf4j-api</exclude> <exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude> <exclude>org.slf4j:slf4j-reload4j</exclude>
</excludes> </excludes>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>

View File

@ -309,7 +309,7 @@
<exclude>org.apache.hadoop:*</exclude> <exclude>org.apache.hadoop:*</exclude>
<!-- use slf4j from common to avoid multiple binding warnings --> <!-- use slf4j from common to avoid multiple binding warnings -->
<exclude>org.slf4j:slf4j-api</exclude> <exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude> <exclude>org.slf4j:slf4j-reload4j</exclude>
<exclude>org.hsqldb:hsqldb</exclude> <exclude>org.hsqldb:hsqldb</exclude>
</excludes> </excludes>
</dependencySet> </dependencySet>

View File

@ -84,8 +84,8 @@
<exclude>org.slf4j:slf4j-api</exclude> <exclude>org.slf4j:slf4j-api</exclude>
<!-- Leave commons-logging unshaded so downstream users can configure logging. --> <!-- Leave commons-logging unshaded so downstream users can configure logging. -->
<exclude>commons-logging:commons-logging</exclude> <exclude>commons-logging:commons-logging</exclude>
<!-- Leave log4j unshaded so downstream users can configure logging. --> <!-- Leave reload4j unshaded so downstream users can configure logging. -->
<exclude>log4j:log4j</exclude> <exclude>ch.qos.reload4j:reload4j</exclude>
<!-- Leave javax annotations we need exposed --> <!-- Leave javax annotations we need exposed -->
<exclude>com.google.code.findbugs:jsr305</exclude> <exclude>com.google.code.findbugs:jsr305</exclude>
<!-- Leave bouncycastle unshaded because it's signed with a special Oracle certificate so it can be a custom JCE security provider --> <!-- Leave bouncycastle unshaded because it's signed with a special Oracle certificate so it can be a custom JCE security provider -->

View File

@ -88,8 +88,8 @@
<exclude>org.slf4j:slf4j-api</exclude> <exclude>org.slf4j:slf4j-api</exclude>
<!-- Leave commons-logging unshaded so downstream users can configure logging. --> <!-- Leave commons-logging unshaded so downstream users can configure logging. -->
<exclude>commons-logging:commons-logging</exclude> <exclude>commons-logging:commons-logging</exclude>
<!-- Leave log4j unshaded so downstream users can configure logging. --> <!-- Leave reload4j unshaded so downstream users can configure logging. -->
<exclude>log4j:log4j</exclude> <exclude>ch.qos.reload4j:reload4j</exclude>
<!-- Leave JUnit unshaded so downstream can use our test helper classes --> <!-- Leave JUnit unshaded so downstream can use our test helper classes -->
<exclude>junit:junit</exclude> <exclude>junit:junit</exclude>
<!-- JUnit brings in hamcrest --> <!-- JUnit brings in hamcrest -->

View File

@ -33,8 +33,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -42,11 +42,6 @@
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>

View File

@ -193,8 +193,12 @@
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>log4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>log4j</artifactId> <artifactId>slf4j-reload4j</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.reload4j</groupId>
<artifactId>reload4j</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
@ -682,7 +686,7 @@
<exclude>commons-logging:commons-logging</exclude> <exclude>commons-logging:commons-logging</exclude>
<exclude>junit:junit</exclude> <exclude>junit:junit</exclude>
<exclude>com.google.code.findbugs:jsr305</exclude> <exclude>com.google.code.findbugs:jsr305</exclude>
<exclude>log4j:log4j</exclude> <exclude>ch.qos.reload4j:reload4j</exclude>
<exclude>org.eclipse.jetty.websocket:websocket-common</exclude> <exclude>org.eclipse.jetty.websocket:websocket-common</exclude>
<exclude>org.eclipse.jetty.websocket:websocket-api</exclude> <exclude>org.eclipse.jetty.websocket:websocket-api</exclude>
<!-- We need a filter that matches just those things that are included in the above artiacts --> <!-- We need a filter that matches just those things that are included in the above artiacts -->

View File

@ -103,8 +103,8 @@
* one of the three custom log4j appenders we have * one of the three custom log4j appenders we have
--> -->
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
@ -150,8 +150,8 @@
<exclude>org.slf4j:slf4j-api</exclude> <exclude>org.slf4j:slf4j-api</exclude>
<!-- Leave commons-logging unshaded so downstream users can configure logging. --> <!-- Leave commons-logging unshaded so downstream users can configure logging. -->
<exclude>commons-logging:commons-logging</exclude> <exclude>commons-logging:commons-logging</exclude>
<!-- Leave log4j unshaded so downstream users can configure logging. --> <!-- Leave reload4j unshaded so downstream users can configure logging. -->
<exclude>log4j:log4j</exclude> <exclude>ch.qos.reload4j:reload4j</exclude>
<!-- Leave javax APIs that are stable --> <!-- Leave javax APIs that are stable -->
<!-- the jdk ships part of the javax.annotation namespace, so if we want to relocate this we'll have to care it out by class :( --> <!-- the jdk ships part of the javax.annotation namespace, so if we want to relocate this we'll have to care it out by class :( -->
<exclude>com.google.code.findbugs:jsr305</exclude> <exclude>com.google.code.findbugs:jsr305</exclude>

View File

@ -206,8 +206,8 @@
<artifactId>commons-cli</artifactId> <artifactId>commons-cli</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>com.sun.jersey</groupId> <groupId>com.sun.jersey</groupId>
@ -282,11 +282,6 @@
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty</artifactId> <artifactId>netty</artifactId>
</exclusion> </exclusion>
<!-- No slf4j backends for downstream clients -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@ -315,11 +310,6 @@
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty</artifactId> <artifactId>netty</artifactId>
</exclusion> </exclusion>
<!-- No slf4j backends for downstream clients -->
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>

View File

@ -47,13 +47,13 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -82,13 +82,13 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -176,6 +176,12 @@
<artifactId>apacheds-server-integ</artifactId> <artifactId>apacheds-server-integ</artifactId>
<version>${apacheds.version}</version> <version>${apacheds.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.directory.server</groupId> <groupId>org.apache.directory.server</groupId>

View File

@ -159,8 +159,8 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -205,7 +205,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -85,7 +85,7 @@ public class GenericsUtil {
} }
Logger log = LoggerFactory.getLogger(clazz); Logger log = LoggerFactory.getLogger(clazz);
try { try {
Class log4jClass = Class.forName("org.slf4j.impl.Log4jLoggerAdapter"); Class log4jClass = Class.forName("org.slf4j.impl.Reload4jLoggerAdapter");
return log4jClass.isInstance(log); return log4jClass.isInstance(log);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
return false; return false;

View File

@ -35,6 +35,6 @@ public class TestClassUtil {
Assert.assertTrue("Containing jar does not exist on file system ", Assert.assertTrue("Containing jar does not exist on file system ",
jarFile.exists()); jarFile.exists());
Assert.assertTrue("Incorrect jar file " + containingJar, Assert.assertTrue("Incorrect jar file " + containingJar,
jarFile.getName().matches("log4j.*[.]jar")); jarFile.getName().matches("reload4j.*[.]jar"));
} }
} }

View File

@ -134,8 +134,8 @@
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -145,7 +145,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -40,7 +40,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -79,13 +79,13 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -48,8 +48,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>

View File

@ -179,8 +179,8 @@
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -190,7 +190,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<!-- 'mvn dependency:analyze' fails to detect use of this dependency --> <!-- 'mvn dependency:analyze' fails to detect use of this dependency -->

View File

@ -134,8 +134,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -160,7 +160,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -54,8 +54,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@ -71,7 +71,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -118,8 +118,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -162,7 +162,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -86,7 +86,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>

View File

@ -88,7 +88,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>

View File

@ -81,8 +81,8 @@
<httpcore.version>4.4.13</httpcore.version> <httpcore.version>4.4.13</httpcore.version>
<!-- SLF4J/LOG4J version --> <!-- SLF4J/LOG4J version -->
<slf4j.version>1.7.30</slf4j.version> <slf4j.version>1.7.36</slf4j.version>
<log4j.version>1.2.17</log4j.version> <reload4j.version>1.2.18.3</reload4j.version>
<!-- com.google.re2j version --> <!-- com.google.re2j version -->
<re2j.version>1.1</re2j.version> <re2j.version>1.1</re2j.version>
@ -298,12 +298,28 @@
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version> <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version> <version>${hadoop.version}</version>
<type>test-jar</type> <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>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
@ -374,12 +390,24 @@
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId> <artifactId>hadoop-mapreduce-client-core</artifactId>
<version>${hadoop.version}</version> <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
<version>${hadoop.version}</version> <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -953,9 +981,9 @@
<version>${commons-logging-api.version}</version> <version>${commons-logging-api.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<version>${log4j.version}</version> <version>${reload4j.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.sun.jdmk</groupId> <groupId>com.sun.jdmk</groupId>
@ -1099,7 +1127,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-reload4j</artifactId>
<version>${slf4j.version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -1305,6 +1333,10 @@
<groupId>org.apache.kerby</groupId> <groupId>org.apache.kerby</groupId>
<artifactId>kerby-config</artifactId> <artifactId>kerby-config</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion> <exclusion>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
@ -1313,6 +1345,10 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -1341,6 +1377,14 @@
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId> <artifactId>netty-transport-native-epoll</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -1480,6 +1524,10 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -1594,6 +1642,10 @@
<artifactId>jdk.tools</artifactId> <artifactId>jdk.tools</artifactId>
<groupId>jdk.tools</groupId> <groupId>jdk.tools</groupId>
</exclusion> </exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -1602,6 +1654,16 @@
<version>${hbase.version}</version> <version>${hbase.version}</version>
<scope>test</scope> <scope>test</scope>
<classifier>tests</classifier> <classifier>tests</classifier>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
@ -1619,6 +1681,28 @@
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId> <artifactId>hbase-server</artifactId>
<version>${hbase.version}</version> <version>${hbase.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<version>${hbase.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>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
@ -1626,6 +1710,16 @@
<version>${hbase.version}</version> <version>${hbase.version}</version>
<scope>test</scope> <scope>test</scope>
<classifier>tests</classifier> <classifier>tests</classifier>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hbase</groupId> <groupId>org.apache.hbase</groupId>
@ -1650,6 +1744,14 @@
<artifactId>jdk.tools</artifactId> <artifactId>jdk.tools</artifactId>
<groupId>jdk.tools</groupId> <groupId>jdk.tools</groupId>
</exclusion> </exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -2160,6 +2262,9 @@
<exclude>com.sun.jersey.jersey-test-framework:*</exclude> <exclude>com.sun.jersey.jersey-test-framework:*</exclude>
<exclude>com.google.inject:guice</exclude> <exclude>com.google.inject:guice</exclude>
<exclude>org.ow2.asm:asm</exclude> <exclude>org.ow2.asm:asm</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
<exclude>log4j:log4j</exclude>
</excludes> </excludes>
<includes> <includes>
<!-- for JDK 8 support --> <!-- for JDK 8 support -->

View File

@ -245,8 +245,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

View File

@ -46,8 +46,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop.thirdparty</groupId> <groupId>org.apache.hadoop.thirdparty</groupId>

View File

@ -118,8 +118,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>

View File

@ -47,8 +47,8 @@
<artifactId>commons-cli</artifactId> <artifactId>commons-cli</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.websocket</groupId> <groupId>org.eclipse.jetty.websocket</groupId>

View File

@ -164,8 +164,8 @@
<artifactId>jersey-guice</artifactId> <artifactId>jersey-guice</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>

View File

@ -160,8 +160,8 @@
<artifactId>hadoop-shaded-guava</artifactId> <artifactId>hadoop-shaded-guava</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>ch.qos.reload4j</groupId>
<artifactId>log4j</artifactId> <artifactId>reload4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>