Skip to content

Commit

Permalink
[MINOR] Upgrade log4j version to 2.16.0 (apache#654)
Browse files Browse the repository at this point in the history
* Update log4j version
  • Loading branch information
ruanwenjun authored and jinrongluo committed Dec 17, 2021
1 parent c393c8b commit 6adc45e
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 213 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -414,9 +414,9 @@ subprojects {
dependency "com.google.guava:guava:29.0-jre"

dependency "org.slf4j:slf4j-api:1.7.30"
dependency "org.apache.logging.log4j:log4j-api:2.13.3"
dependency "org.apache.logging.log4j:log4j-core:2.13.3"
dependency "org.apache.logging.log4j:log4j-slf4j-impl:2.13.3"
dependency "org.apache.logging.log4j:log4j-api:2.16.0"
dependency "org.apache.logging.log4j:log4j-core:2.16.0"
dependency "org.apache.logging.log4j:log4j-slf4j-impl:2.16.0"

dependency "com.lmax:disruptor:3.4.2"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

configurations {
implementation.exclude group: 'ch.qos.logback', module: 'logback-classic'
implementation.exclude group: 'log4j', module: 'log4j'
}

List rocketmq = [
Expand Down
7 changes: 3 additions & 4 deletions tools/third-party-dependencies/known-dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,9 @@ jna-4.2.2.jar
jsr305-3.0.2.jar
junit-4.12.jar
listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
log4j-1.2.17.jar
log4j-api-2.13.3.jar
log4j-core-2.13.3.jar
log4j-slf4j-impl-2.13.3.jar
log4j-api-2.16.0.jar
log4j-core-2.16.0.jar
log4j-slf4j-impl-2.16.0.jar
logback-core-1.0.13.jar
metrics-annotation-4.1.0.jar
metrics-core-4.1.0.jar
Expand Down
7 changes: 3 additions & 4 deletions tools/third-party-licenses/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,8 @@ jackson-databind 2.11.0: https://github.com/FasterXML/jackson-databind, Apache 2
javassist 3.20.0-GA/3.24.0-GA: https://github.com/jboss-javassist/javassist, Apache 2.0
jcommander 1.72: https://github.com/cbeust/jcommander, Apache 2.0
jna 4.2.2: https://github.com/java-native-access/jna, Apache 2.0
log4j 1.2.17: https://github.com/apache/log4j, Apache 2.0
log4j-api 2.13.3: https://github.com/apache/log4j, Apache 2.0
log4j-core 2.13.3: https://github.com/apache/log4j, Apache 2.0
log4j-api 2.16.0: https://github.com/apache/log4j, Apache 2.0
log4j-core 2.16.0: https://github.com/apache/log4j, Apache 2.0
metrics-annotation 4.1.0: https://github.com/dropwizard/metrics, Apache 2.0
metrics-core 4.1.0: https://github.com/dropwizard/metrics, Apache 2.0
metrics-healthchecks 4.1.0: https://github.com/dropwizard/metrics, Apache 2.0
Expand Down Expand Up @@ -327,5 +326,5 @@ The following components are provided under the MIT license. See project link fo
The text of each license is also included at licenses/LICENSE-[project].txt.

checker-qual 2.11.1: https://github.com/typetools/checker-framework, MIT
log4j-slf4j-impl 2.13.3: https://github.com/qos-ch/slf4j, MIT
log4j-slf4j-impl 2.16.0: https://github.com/qos-ch/slf4j, MIT
slf4j-api 1.7.30: https://github.com/qos-ch/slf4j, MIT
202 changes: 0 additions & 202 deletions tools/third-party-licenses/licenses/LICENSE-log4j.txt

This file was deleted.

0 comments on commit 6adc45e

Please sign in to comment.