You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by eo...@apache.org on 2024/04/06 09:35:32 UTC
(bookkeeper) branch master updated: dependency: bump slf4j log4j2 version (#4248)
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 8ca4118d51 dependency: bump slf4j log4j2 version (#4248)
8ca4118d51 is described below
commit 8ca4118d51989ad301bdc517c7552f05e6fdd4ee
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Sat Apr 6 17:35:27 2024 +0800
dependency: bump slf4j log4j2 version (#4248)
Signed-off-by: ZhangJian He <sh...@gmail.com>
---
bookkeeper-dist/src/assemble/bin-all.xml | 2 +-
bookkeeper-dist/src/assemble/bin-server.xml | 2 +-
bookkeeper-dist/src/assemble/bkctl.xml | 2 +-
.../src/main/resources/LICENSE-all.bin.txt | 14 +++++++-------
.../src/main/resources/LICENSE-bkctl.bin.txt | 14 +++++++-------
.../src/main/resources/LICENSE-server.bin.txt | 14 +++++++-------
.../deps/{slf4j-1.7.32 => slf4j-2.0.12}/LICENSE.txt | 0
bookkeeper-server/pom.xml | 2 +-
.../org/apache/bookkeeper/util/LoggerOutput.java | 21 ++++++++++++++++-----
pom.xml | 6 +++---
testtools/pom.xml | 2 +-
tools/ledger/pom.xml | 2 +-
12 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/bookkeeper-dist/src/assemble/bin-all.xml b/bookkeeper-dist/src/assemble/bin-all.xml
index 60bc2ca153..506bfaaf9a 100644
--- a/bookkeeper-dist/src/assemble/bin-all.xml
+++ b/bookkeeper-dist/src/assemble/bin-all.xml
@@ -72,7 +72,7 @@
<include>scala-library-2.11.7/LICENSE.md</include>
<include>scala-parser-combinators_2.11-1.0.4/LICENSE.md</include>
<include>scala-reflect-2.11.8/LICENSE.md</include>
- <include>slf4j-1.7.32/LICENSE.txt</include>
+ <include>slf4j-2.0.12/LICENSE.txt</include>
</includes>
<fileMode>644</fileMode>
</fileSet>
diff --git a/bookkeeper-dist/src/assemble/bin-server.xml b/bookkeeper-dist/src/assemble/bin-server.xml
index 0c951adbed..f80dac43c4 100644
--- a/bookkeeper-dist/src/assemble/bin-server.xml
+++ b/bookkeeper-dist/src/assemble/bin-server.xml
@@ -57,7 +57,7 @@
<include>protobuf-3.14.0/LICENSE</include>
<include>protobuf-3.12.0/LICENSE</include>
<include>reactivestreams-1.0.3/LICENSE</include>
- <include>slf4j-1.7.32/LICENSE.txt</include>
+ <include>slf4j-2.0.12/LICENSE.txt</include>
</includes>
<fileMode>644</fileMode>
</fileSet>
diff --git a/bookkeeper-dist/src/assemble/bkctl.xml b/bookkeeper-dist/src/assemble/bkctl.xml
index 623b56e505..45f9d1b12a 100644
--- a/bookkeeper-dist/src/assemble/bkctl.xml
+++ b/bookkeeper-dist/src/assemble/bkctl.xml
@@ -74,7 +74,7 @@
<include>protobuf-3.14.0/LICENSE</include>
<include>protobuf-3.12.0/LICENSE</include>
<include>reactivestreams-1.0.3/LICENSE</include>
- <include>slf4j-1.7.32/LICENSE.txt</include>
+ <include>slf4j-2.0.12/LICENSE.txt</include>
</includes>
<fileMode>644</fileMode>
</fileSet>
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
index aadea81cc8..b441713fed 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
@@ -256,9 +256,9 @@ Apache Software License, Version 2.
- lib/io.vertx-vertx-core-4.5.7.jar [15]
- lib/io.vertx-vertx-web-4.5.7.jar [16]
- lib/io.vertx-vertx-web-common-4.5.7.jar [16]
-- lib/org.apache.logging.log4j-log4j-api-2.18.0.jar [17]
-- lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [17]
-- lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17]
+- lib/org.apache.logging.log4j-log4j-api-2.23.1.jar [17]
+- lib/org.apache.logging.log4j-log4j-core-2.23.1.jar [17]
+- lib/org.apache.logging.log4j-log4j-slf4j2-impl-2.23.1.jar [17]
- lib/org.apache.commons-commons-collections4-4.1.jar [19]
- lib/org.apache.commons-commons-lang3-3.6.jar [20]
- lib/org.apache.zookeeper-zookeeper-3.8.4.jar [21]
@@ -366,7 +366,7 @@ Apache Software License, Version 2.
[14] Source available at https://github.com/vert-x3/vertx-bridge-common/tree/4.3.2
[15] Source available at https://github.com/eclipse/vert.x/tree/4.3.2
[16] Source available at https://github.com/vert-x3/vertx-web/tree/4.3.2
-[17] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.18.0
+[17] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.23.1
[19] Source available at https://github.com/apache/commons-collections/tree/collections-4.1
[20] Source available at https://github.com/apache/commons-lang/tree/LANG_3_6
[21] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0
@@ -687,11 +687,11 @@ Bundled as lib/javax.servlet-javax.servlet-api-4.0.0.jar
Source available at https://github.com/javaee/servlet-spec/tree/4.0.0
------------------------------------------------------------------------------------
This product bundles Simple Logging Facade for Java, which is available under a
-MIT license. For details, see deps/slf4j-1.7.32/LICENSE.txt.
+MIT license. For details, see deps/slf4j-2.0.12/LICENSE.txt.
Bundled as
- - lib/org.slf4j-slf4j-api-1.7.32.jar
-Source available at https://github.com/qos-ch/slf4j/tree/v_1.7.32
+ - lib/org.slf4j-slf4j-api-2.0.12.jar
+Source available at https://github.com/qos-ch/slf4j/tree/v_2.0.12
------------------------------------------------------------------------------------
This product bundles the Google Auth Library, which is available under a "3-clause BSD"
license. For details, see deps/google-auth-library-credentials-0.20.0/LICENSE
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
index 0a976765ed..d26c6611d3 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
@@ -241,9 +241,9 @@ Apache Software License, Version 2.
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.25.Final-linux-aarch_64.jar [11]
- lib/io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.25.Final.jar [11]
- lib/io.netty-netty-transport-native-unix-common-4.1.108.Final.jar [11]
-- lib/org.apache.logging.log4j-log4j-api-2.18.0.jar [16]
-- lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [16]
-- lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [16]
+- lib/org.apache.logging.log4j-log4j-api-2.23.1.jar [16]
+- lib/org.apache.logging.log4j-log4j-core-2.23.1.jar [16]
+- lib/org.apache.logging.log4j-log4j-slf4j2-impl-2.23.1.jar [16]
- lib/org.apache.commons-commons-collections4-4.1.jar [18]
- lib/org.apache.commons-commons-lang3-3.6.jar [19]
- lib/org.apache.zookeeper-zookeeper-3.8.4.jar [20]
@@ -304,7 +304,7 @@ Apache Software License, Version 2.
[9] Source available at https://github.com/apache/commons-lang/tree/LANG_2_6
[10] Source available at https://github.com/apache/commons-logging/tree/commons-logging-1.1.1
[11] Source available at https://github.com/netty/netty/tree/netty-4.1.108.Final
-[16] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.18.0
+[16] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.23.1
[18] Source available at https://github.com/apache/commons-collections/tree/collections-4.1
[19] Source available at https://github.com/apache/commons-lang/tree/LANG_3_6
[20] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0
@@ -575,11 +575,11 @@ Source available at https://github.com/protocolbuffers/protobuf/tree/v3.22.3
For details, see deps/protobuf-3.12.0/LICENSE.
------------------------------------------------------------------------------------
This product bundles Simple Logging Facade for Java, which is available under a
-MIT license. For details, see deps/slf4j-1.7.32/LICENSE.txt.
+MIT license. For details, see deps/slf4j-2.0.12/LICENSE.txt.
Bundled as
- - lib/org.slf4j-slf4j-api-1.7.32.jar
-Source available at https://github.com/qos-ch/slf4j/tree/v_1.7.32
+ - lib/org.slf4j-slf4j-api-2.0.12.jar
+Source available at https://github.com/qos-ch/slf4j/tree/v_2.0.12
------------------------------------------------------------------------------------
This product bundles the Google Auth Library, which is available under a "3-clause BSD"
license. For details, see deps/google-auth-library-credentials-0.20.0/LICENSE
diff --git a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
index f610a2d7f6..96b0b43b62 100644
--- a/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
+++ b/bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
@@ -256,9 +256,9 @@ Apache Software License, Version 2.
- lib/io.vertx-vertx-core-4.5.7.jar [15]
- lib/io.vertx-vertx-web-4.5.7.jar [16]
- lib/io.vertx-vertx-web-common-4.5.7.jar [16]
-- lib/org.apache.logging.log4j-log4j-api-2.18.0.jar [17]
-- lib/org.apache.logging.log4j-log4j-core-2.18.0.jar [17]
-- lib/org.apache.logging.log4j-log4j-slf4j-impl-2.18.0.jar [17]
+- lib/org.apache.logging.log4j-log4j-api-2.23.1.jar [17]
+- lib/org.apache.logging.log4j-log4j-core-2.23.1.jar [17]
+- lib/org.apache.logging.log4j-log4j-slf4j2-impl-2.23.1.jar [17]
- lib/org.apache.commons-commons-collections4-4.1.jar [19]
- lib/org.apache.commons-commons-lang3-3.6.jar [20]
- lib/org.apache.zookeeper-zookeeper-3.8.4.jar [21]
@@ -362,7 +362,7 @@ Apache Software License, Version 2.
[14] Source available at https://github.com/vert-x3/vertx-bridge-common/tree/4.3.2
[15] Source available at https://github.com/eclipse/vert.x/tree/4.3.2
[16] Source available at https://github.com/vert-x3/vertx-web/tree/4.3.2
-[17] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.18.0
+[17] Source available at https://github.com/apache/logging-log4j2/tree/rel/2.23.1
[19] Source available at https://github.com/apache/commons-collections/tree/collections-4.1
[20] Source available at https://github.com/apache/commons-lang/tree/LANG_3_6
[21] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0
@@ -676,11 +676,11 @@ Bundled as lib/javax.servlet-javax.servlet-api-4.0.0.jar
Source available at https://github.com/javaee/servlet-spec/tree/4.0.0
------------------------------------------------------------------------------------
This product bundles Simple Logging Facade for Java, which is available under a
-MIT license. For details, see deps/slf4j-1.7.32/LICENSE.txt.
+MIT license. For details, see deps/slf4j-2.0.12/LICENSE.txt.
Bundled as
- - lib/org.slf4j-slf4j-api-1.7.32.jar
-Source available at https://github.com/qos-ch/slf4j/tree/v_1.7.32
+ - lib/org.slf4j-slf4j-api-2.0.12.jar
+Source available at https://github.com/qos-ch/slf4j/tree/v_2.0.12
------------------------------------------------------------------------------------
This product bundles the Google Auth Library, which is available under a "3-clause BSD"
license. For details, see deps/google-auth-library-credentials-0.20.0/LICENSE
diff --git a/bookkeeper-dist/src/main/resources/deps/slf4j-1.7.32/LICENSE.txt b/bookkeeper-dist/src/main/resources/deps/slf4j-2.0.12/LICENSE.txt
similarity index 100%
rename from bookkeeper-dist/src/main/resources/deps/slf4j-1.7.32/LICENSE.txt
rename to bookkeeper-dist/src/main/resources/deps/slf4j-2.0.12/LICENSE.txt
diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
index 9db0c66835..ac099ebfa5 100644
--- a/bookkeeper-server/pom.xml
+++ b/bookkeeper-server/pom.xml
@@ -164,7 +164,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
<!-- testing dependencies -->
<dependency>
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/LoggerOutput.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/LoggerOutput.java
index 610997cba9..b507a16f46 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/LoggerOutput.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/util/LoggerOutput.java
@@ -38,6 +38,7 @@ import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.mockito.ArgumentCaptor;
import org.slf4j.Marker;
+import org.slf4j.event.KeyValuePair;
import org.slf4j.event.Level;
import org.slf4j.event.LoggingEvent;
@@ -107,11 +108,6 @@ public class LoggerOutput implements TestRule {
}
}
- @Override
- public Marker getMarker() {
- return null;
- }
-
@Override
public String getLoggerName() {
return log4jEvent.getLoggerName();
@@ -122,6 +118,11 @@ public class LoggerOutput implements TestRule {
return log4jEvent.getMessage().getFormattedMessage();
}
+ @Override
+ public List<Object> getArguments() {
+ return null;
+ }
+
@Override
public String getThreadName() {
return log4jEvent.getThreadName();
@@ -132,6 +133,16 @@ public class LoggerOutput implements TestRule {
return new Object[0];
}
+ @Override
+ public List<Marker> getMarkers() {
+ return null;
+ }
+
+ @Override
+ public List<KeyValuePair> getKeyValuePairs() {
+ return null;
+ }
+
@Override
public long getTimeStamp() {
return log4jEvent.getTimeMillis();
diff --git a/pom.xml b/pom.xml
index ab7590249f..64a629a9fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
<awaitility.version>4.2.0</awaitility.version>
<libthrift.version>0.14.2</libthrift.version>
<lombok.version>1.18.32</lombok.version>
- <log4j.version>2.18.0</log4j.version>
+ <log4j.version>2.23.1</log4j.version>
<lz4.version>1.3.0</lz4.version>
<mockito.version>4.11.0</mockito.version>
<netty.version>4.1.108.Final</netty.version>
@@ -167,7 +167,7 @@
<reflections.version>0.9.11</reflections.version>
<rocksdb.version>7.9.2</rocksdb.version>
<shrinkwrap.version>3.3.0</shrinkwrap.version>
- <slf4j.version>1.7.32</slf4j.version>
+ <slf4j.version>2.0.12</slf4j.version>
<snakeyaml.version>2.0</snakeyaml.version>
<spotbugs-annotations.version>4.6.0</spotbugs-annotations.version>
<javax-annotations-api.version>1.3.2</javax-annotations-api.version>
@@ -252,7 +252,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j.version}</version>
</dependency>
diff --git a/testtools/pom.xml b/testtools/pom.xml
index e075e49b55..f63deecd52 100644
--- a/testtools/pom.xml
+++ b/testtools/pom.xml
@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
</dependency>
</dependencies>
</project>
diff --git a/tools/ledger/pom.xml b/tools/ledger/pom.xml
index b0c59acc31..9a8f0e335f 100644
--- a/tools/ledger/pom.xml
+++ b/tools/ledger/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
+ <artifactId>log4j-slf4j2-impl</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>