This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new 60be7121b9 chore: replace log4j-slf4j-impl with log4j-slf4j2-impl to
account for slf4j 2.0 switch
60be7121b9 is described below
commit 60be7121b906bb88c4a01c2a530ef9978f8dd6d8
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Wed Oct 29 21:59:18 2025 +0300
chore: replace log4j-slf4j-impl with log4j-slf4j2-impl to account for slf4j
2.0 switch
---
src/bom-thirdparty/build.gradle.kts | 2 +-
src/core/build.gradle.kts | 2 +-
src/dist-check/build.gradle.kts | 2 +-
src/dist/src/dist/expected_release_jars.csv | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bom-thirdparty/build.gradle.kts
b/src/bom-thirdparty/build.gradle.kts
index a09704537a..5f2c1a278b 100644
--- a/src/bom-thirdparty/build.gradle.kts
+++ b/src/bom-thirdparty/build.gradle.kts
@@ -112,7 +112,7 @@ dependencies {
api("org.apache.logging.log4j:log4j-1.2-api:2.22.1")
api("org.apache.logging.log4j:log4j-api:2.22.1")
api("org.apache.logging.log4j:log4j-core:2.22.1")
- api("org.apache.logging.log4j:log4j-slf4j-impl:2.22.1")
+ api("org.apache.logging.log4j:log4j-slf4j2-impl:2.22.1")
api("org.apache.rat:apache-rat:0.15")
api("org.apache.tika:tika-core:3.2.3")
api("org.apache.tika:tika-parsers:3.2.3")
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index fb3a14338e..4f0b2239ce 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -49,7 +49,7 @@ dependencies {
kapt("org.apache.logging.log4j:log4j-core") {
because("Generates a plugin cache file for GuiLogEventAppender")
}
- api("org.apache.logging.log4j:log4j-slf4j-impl") {
+ api("org.apache.logging.log4j:log4j-slf4j2-impl") {
because("Both log4j and slf4j are included, so it makes sense to just
add log4j->slf4j bridge as well")
}
api("org.apiguardian:apiguardian-api")
diff --git a/src/dist-check/build.gradle.kts b/src/dist-check/build.gradle.kts
index e01f4bb449..00d5edb396 100644
--- a/src/dist-check/build.gradle.kts
+++ b/src/dist-check/build.gradle.kts
@@ -67,7 +67,7 @@ dependencies {
loggingClasspath("org.apache.logging.log4j:log4j-api")
loggingClasspath("org.apache.logging.log4j:log4j-core")
loggingClasspath("org.apache.logging.log4j:log4j-1.2-api")
- loggingClasspath("org.apache.logging.log4j:log4j-slf4j-impl")
+ loggingClasspath("org.apache.logging.log4j:log4j-slf4j2-impl")
}
val libOpt = copySpec {
diff --git a/src/dist/src/dist/expected_release_jars.csv
b/src/dist/src/dist/expected_release_jars.csv
index 1711ea8c62..cafb7082db 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -102,7 +102,7 @@
356564,log4j-1.2-api-2.22.1.jar
335001,log4j-api-2.22.1.jar
1900022,log4j-core-2.22.1.jar
-24583,log4j-slf4j-impl-2.22.1.jar
+27364,log4j-slf4j2-impl-2.22.1.jar
519087,mail-1.5.0-b01.jar
106949,miglayout-core-5.3.jar
22576,miglayout-swing-5.3.jar
