From b6b8d68cf23dad01d8e0c87c1ef02dbeaaac08e8 Mon Sep 17 00:00:00 2001 From: Shawn Qiang <814238703@qq.com> Date: Thu, 12 Feb 2026 01:40:26 +0800 Subject: [PATCH] Fix SLF4J component error Signed-off-by: Shawn Qiang <814238703@qq.com> --- CHANGELOG.md | 3 ++- client/rest/build.gradle | 2 +- plugins/repository-hdfs/build.gradle | 2 +- .../licenses/log4j-slf4j-impl-2.25.3.jar.sha1 | 1 - .../repository-hdfs/licenses/log4j-slf4j-impl-NOTICE.txt | 5 ----- .../licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 | 1 + ...slf4j-impl-LICENSE.txt => log4j-slf4j2-impl-LICENSE.txt} | 0 .../repository-hdfs/licenses/log4j-slf4j2-impl-NOTICE.txt | 6 ++++++ plugins/repository-s3/build.gradle | 2 +- .../repository-s3/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 | 1 - .../licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 | 1 + qa/wildfly/build.gradle | 2 +- 12 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/log4j-slf4j-impl-NOTICE.txt create mode 100644 plugins/repository-hdfs/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 rename plugins/repository-hdfs/licenses/{log4j-slf4j-impl-LICENSE.txt => log4j-slf4j2-impl-LICENSE.txt} (100%) create mode 100644 plugins/repository-hdfs/licenses/log4j-slf4j2-impl-NOTICE.txt delete mode 100644 plugins/repository-s3/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 create mode 100644 plugins/repository-s3/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c75cc33e1535..e607220316b16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,8 +19,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Update EncryptedBlobContainer to adhere limits while listing blobs in specific sort order if wrapped blob container supports ([#20514](https://github.com/opensearch-project/OpenSearch/pull/20514)) - [segment replication] Fix segment replication infinite retry due to stale metadata checkpoint ([#20551](https://github.com/opensearch-project/OpenSearch/pull/20551)) - Changing opensearch.cgroups.hierarchy.override causes java.lang.SecurityException exception ([#20565](https://github.com/opensearch-project/OpenSearch/pull/20565)) -- Fix CriteriaBasedCodec to work with delegate codec. ([20442](https://github.com/opensearch-project/OpenSearch/pull/20442)) +- Fix CriteriaBasedCodec to work with delegate codec. ([#20442](https://github.com/opensearch-project/OpenSearch/pull/20442)) - Fix WLM workload group creation failing due to updated_at clock skew ([#20486](https://github.com/opensearch-project/OpenSearch/pull/20486)) +- Fix SLF4J component error ([#20587](https://github.com/opensearch-project/OpenSearch/pull/20587)) ### Dependencies - Bump `ch.qos.logback:logback-core` and `ch.qos.logback:logback-classic` from 1.5.24 to 1.5.27 ([#20525](https://github.com/opensearch-project/OpenSearch/pull/20525)) diff --git a/client/rest/build.gradle b/client/rest/build.gradle index a22f81c97b70a..5a0a3c21722e7 100644 --- a/client/rest/build.gradle +++ b/client/rest/build.gradle @@ -71,7 +71,7 @@ dependencies { testImplementation "org.apache.logging.log4j:log4j-api:${versions.log4j}" testImplementation "org.apache.logging.log4j:log4j-core:${versions.log4j}" testImplementation "org.apache.logging.log4j:log4j-jul:${versions.log4j}" - testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}" + testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${versions.log4j}" } tasks.named("dependencyLicenses").configure { diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle index 4f657d35f8caa..0b966b40d759b 100644 --- a/plugins/repository-hdfs/build.gradle +++ b/plugins/repository-hdfs/build.gradle @@ -76,7 +76,7 @@ dependencies { implementation 'com.google.re2j:re2j:1.8' api 'javax.servlet:servlet-api:2.5' api "org.slf4j:slf4j-api:${versions.slf4j}" - api "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}" + api "org.apache.logging.log4j:log4j-slf4j2-impl:${versions.log4j}" api "net.minidev:json-smart:${versions.json_smart}" api "io.netty:netty-all:${versions.netty}" implementation "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}" diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 deleted file mode 100644 index 8463520c396f8..0000000000000 --- a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4a173925524d8f6c3f39ae8954ee348e8244afd7 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-NOTICE.txt b/plugins/repository-hdfs/licenses/log4j-slf4j-impl-NOTICE.txt deleted file mode 100644 index 0375732360047..0000000000000 --- a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-NOTICE.txt +++ /dev/null @@ -1,5 +0,0 @@ -Apache log4j -Copyright 2007 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 b/plugins/repository-hdfs/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 new file mode 100644 index 0000000000000..9b67ab85d8523 --- /dev/null +++ b/plugins/repository-hdfs/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 @@ -0,0 +1 @@ +8d1aca17817adb4a15720e64b98caf9cb3b2cc51 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j-impl-LICENSE.txt b/plugins/repository-hdfs/licenses/log4j-slf4j2-impl-LICENSE.txt similarity index 100% rename from plugins/repository-hdfs/licenses/log4j-slf4j-impl-LICENSE.txt rename to plugins/repository-hdfs/licenses/log4j-slf4j2-impl-LICENSE.txt diff --git a/plugins/repository-hdfs/licenses/log4j-slf4j2-impl-NOTICE.txt b/plugins/repository-hdfs/licenses/log4j-slf4j2-impl-NOTICE.txt new file mode 100644 index 0000000000000..5a296bfcd19ec --- /dev/null +++ b/plugins/repository-hdfs/licenses/log4j-slf4j2-impl-NOTICE.txt @@ -0,0 +1,6 @@ +SLF4J 2 Provider for Log4j API +Copyright 1999-2025 The Apache Software Foundation + + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle index 71ccb0549be05..88c5954f41d2d 100644 --- a/plugins/repository-s3/build.gradle +++ b/plugins/repository-s3/build.gradle @@ -93,7 +93,7 @@ dependencies { api "joda-time:joda-time:${versions.joda}" api "org.slf4j:slf4j-api:${versions.slf4j}" - runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}" + runtimeOnly "org.apache.logging.log4j:log4j-slf4j2-impl:${versions.log4j}" // network stack api "io.netty:netty-buffer:${versions.netty}" diff --git a/plugins/repository-s3/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 b/plugins/repository-s3/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 deleted file mode 100644 index 8463520c396f8..0000000000000 --- a/plugins/repository-s3/licenses/log4j-slf4j-impl-2.25.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4a173925524d8f6c3f39ae8954ee348e8244afd7 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 b/plugins/repository-s3/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 new file mode 100644 index 0000000000000..9b67ab85d8523 --- /dev/null +++ b/plugins/repository-s3/licenses/log4j-slf4j2-impl-2.25.3.jar.sha1 @@ -0,0 +1 @@ +8d1aca17817adb4a15720e64b98caf9cb3b2cc51 \ No newline at end of file diff --git a/qa/wildfly/build.gradle b/qa/wildfly/build.gradle index dfb1a1efc04dc..12f2eacccd982 100644 --- a/qa/wildfly/build.gradle +++ b/qa/wildfly/build.gradle @@ -62,7 +62,7 @@ dependencies { api(project(path: ':client:rest-high-level')) { exclude module: 'jakarta.annotation-api' } - testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}" + testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${versions.log4j}" testImplementation(project(':test:framework')) { exclude module: 'jakarta.annotation-api' }