Skip to content

Commit e074117

Browse files
cwperksdk2k
authored andcommitted
Fix warnings from SLF4J on startup when repository-s3 is installed (opensearch-project#16194)
* Fix warnings from SLF4J on startup when repository-s3 is installed Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add to CHANGELOG Signed-off-by: Craig Perkins <cwperx@amazon.com> * Fix precommit Signed-off-by: Craig Perkins <cwperx@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent d43e779 commit e074117

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5858
- Fix infinite loop in nested agg ([#15931](https://github.com/opensearch-project/OpenSearch/pull/15931))
5959
- Fix race condition in node-join and node-left ([#15521](https://github.com/opensearch-project/OpenSearch/pull/15521))
6060
- Streaming bulk request hangs ([#16158](https://github.com/opensearch-project/OpenSearch/pull/16158))
61+
- Fix warnings from SLF4J on startup when repository-s3 is installed ([#16194](https://github.com/opensearch-project/OpenSearch/pull/16194))
6162

6263
### Security
6364

plugins/repository-s3/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ dependencies {
8282
api "joda-time:joda-time:${versions.joda}"
8383
api "org.slf4j:slf4j-api:${versions.slf4j}"
8484

85+
runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
86+
8587
// network stack
8688
api "io.netty:netty-buffer:${versions.netty}"
8789
api "io.netty:netty-codec:${versions.netty}"
@@ -111,6 +113,7 @@ tasks.named("dependencyLicenses").configure {
111113
mapping from: /jackson-.*/, to: 'jackson'
112114
mapping from: /jaxb-.*/, to: 'jaxb'
113115
mapping from: /netty-.*/, to: 'netty'
116+
mapping from: /log4j-.*/, to: 'log4j'
114117
}
115118

116119
bundlePlugin {
@@ -510,9 +513,7 @@ thirdPartyAudit {
510513
'org.jboss.marshalling.MarshallingConfiguration',
511514
'org.jboss.marshalling.Unmarshaller',
512515
513-
'org.slf4j.impl.StaticLoggerBinder',
514-
'org.slf4j.impl.StaticMDCBinder',
515-
'org.slf4j.impl.StaticMarkerBinder',
516+
'org.slf4j.ext.EventData',
516517
'reactor.blockhound.BlockHound$Builder',
517518
'reactor.blockhound.integration.BlockHoundIntegration',
518519
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
911fdb5b1a1df36719c579ecc6f2957b88bce1ab

0 commit comments

Comments
 (0)