Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `1password/load-secrets-action` from 2 to 3 ([#19100](https://github.com/opensearch-project/OpenSearch/pull/19100))
- Bump `com.nimbusds:nimbus-jose-jwt` from 10.3 to 10.4.2 ([#19099](https://github.com/opensearch-project/OpenSearch/pull/19099), [#19101](https://github.com/opensearch-project/OpenSearch/pull/19101))
- Bump netty from 4.1.121.Final to 4.1.124.Final ([#19103](https://github.com/opensearch-project/OpenSearch/pull/19103))
- Bump google cloud storage from 1.113.1 to 2.55.0 ([#4547](https://github.com/opensearch-project/OpenSearch/pull/4547))
- Bump Google Cloud Storage SDK from 1.113.1 to 2.55.0 ([#18922](https://github.com/opensearch-project/OpenSearch/pull/18922))
- Bump `com.google.auth:google-auth-library-oauth2-http` from 1.37.1 to 1.38.0 ([#19144](https://github.com/opensearch-project/OpenSearch/pull/19144))
- Bump `com.squareup.okio:okio` from 3.15.0 to 3.16.0 ([#19146](https://github.com/opensearch-project/OpenSearch/pull/19146))
- Bump Slf4j from 1.7.36 to 2.0.17 ([#19136](https://github.com/opensearch-project/OpenSearch/pull/19136))

### Deprecated

Expand Down
3 changes: 0 additions & 3 deletions client/rest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,6 @@ testingConventions {
thirdPartyAudit {
ignoreMissingClasses(
'org.conscrypt.Conscrypt',
'org.slf4j.impl.StaticLoggerBinder',
'org.slf4j.impl.StaticMDCBinder',
'org.slf4j.impl.StaticMarkerBinder',
//commons-logging optional dependencies
'org.apache.avalon.framework.logger.Logger',
'org.apache.log.Hierarchy',
Expand Down
1 change: 0 additions & 1 deletion client/rest/licenses/slf4j-api-1.7.36.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions client/rest/licenses/slf4j-api-2.0.17.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9e58ac9c7779ba3bf8142aff6c830617a7fe60f
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ snakeyaml = "2.1"
icu4j = "77.1"
supercsv = "2.4.0"
log4j = "2.21.0"
slf4j = "1.7.36"
slf4j = "2.0.17"
asm = "9.7"
jettison = "1.5.4"
woodstox = "6.4.0"
Expand Down
4 changes: 0 additions & 4 deletions plugins/arrow-flight-rpc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,6 @@ tasks.named('thirdPartyAudit').configure {
'org.apache.commons.logging.Log',
'org.apache.commons.logging.LogFactory',

'org.slf4j.impl.StaticLoggerBinder',
'org.slf4j.impl.StaticMDCBinder',
'org.slf4j.impl.StaticMarkerBinder',

// from Log4j (deliberate, Netty will fallback to Log4j 2)
'org.apache.log4j.Level',
'org.apache.log4j.Logger',
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9e58ac9c7779ba3bf8142aff6c830617a7fe60f
3 changes: 0 additions & 3 deletions plugins/cache-ehcache/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ thirdPartyAudit {
'org.osgi.framework.BundleActivator',
'org.osgi.framework.BundleContext',
'org.osgi.framework.ServiceReference',
'org.slf4j.impl.StaticLoggerBinder',
'org.slf4j.impl.StaticMDCBinder',
'org.slf4j.impl.StaticMarkerBinder'
)
}

Expand Down
1 change: 0 additions & 1 deletion plugins/cache-ehcache/licenses/slf4j-api-1.7.36.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions plugins/cache-ehcache/licenses/slf4j-api-2.0.17.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9e58ac9c7779ba3bf8142aff6c830617a7fe60f
1 change: 0 additions & 1 deletion plugins/crypto-kms/licenses/slf4j-api-1.7.36.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions plugins/crypto-kms/licenses/slf4j-api-2.0.17.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9e58ac9c7779ba3bf8142aff6c830617a7fe60f
3 changes: 0 additions & 3 deletions plugins/discovery-ec2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,6 @@ tasks.named("thirdPartyAudit").configure {
'org.apache.avalon.framework.logger.Logger',
'org.apache.log.Hierarchy',
'org.apache.log.Logger',
'org.slf4j.impl.StaticLoggerBinder',
'org.slf4j.impl.StaticMDCBinder',
'org.slf4j.impl.StaticMarkerBinder',
'software.amazon.eventstream.HeaderValue',
'software.amazon.eventstream.Message',
'software.amazon.eventstream.MessageDecoder',
Expand Down
1 change: 0 additions & 1 deletion plugins/discovery-ec2/licenses/slf4j-api-1.7.36.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions plugins/discovery-ec2/licenses/slf4j-api-2.0.17.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9e58ac9c7779ba3bf8142aff6c830617a7fe60f
3 changes: 0 additions & 3 deletions plugins/identity-shiro/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@ thirdPartyAudit.ignoreMissingClasses(
'org.apache.log4j.Logger',
'org.apache.log4j.Priority',
'org.cryptacular.bean.HashBean',
'org.slf4j.impl.StaticLoggerBinder',
'org.slf4j.impl.StaticMDCBinder',
'org.slf4j.impl.StaticMarkerBinder',
'org.springframework.context.MessageSource',
'org.springframework.context.support.MessageSourceAccessor'
)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9e58ac9c7779ba3bf8142aff6c830617a7fe60f

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9e58ac9c7779ba3bf8142aff6c830617a7fe60f
3 changes: 0 additions & 3 deletions plugins/ingestion-kafka/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ thirdPartyAudit {
'net.jpountz.util.SafeUtils',
'net.jpountz.xxhash.XXHash32',
'net.jpountz.xxhash.XXHashFactory',
'org.slf4j.impl.StaticLoggerBinder',
'org.slf4j.impl.StaticMDCBinder',
'org.slf4j.impl.StaticMarkerBinder',
'com.google.common.util.concurrent.ListenableFuture',
'io.grpc.BindableService',
'io.grpc.CallOptions',
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9e58ac9c7779ba3bf8142aff6c830617a7fe60f
4 changes: 0 additions & 4 deletions plugins/ingestion-kinesis/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,6 @@ thirdPartyAudit {
'org.apache.log4j.Logger',
'org.apache.log4j.Priority',

'org.slf4j.impl.StaticLoggerBinder',
'org.slf4j.impl.StaticMDCBinder',
'org.slf4j.impl.StaticMarkerBinder',

'org.graalvm.nativeimage.hosted.Feature',
'org.graalvm.nativeimage.hosted.Feature$AfterImageWriteAccess',

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9e58ac9c7779ba3bf8142aff6c830617a7fe60f
3 changes: 0 additions & 3 deletions plugins/repository-azure/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,6 @@ thirdPartyAudit {
'javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters',
'org.osgi.framework.BundleActivator',
'org.osgi.framework.BundleContext',
'org.slf4j.impl.StaticLoggerBinder',
'org.slf4j.impl.StaticMDCBinder',
'org.slf4j.impl.StaticMarkerBinder',
'io.micrometer.common.KeyValue',
'io.micrometer.common.KeyValues',
'io.micrometer.common.docs.KeyName',
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9e58ac9c7779ba3bf8142aff6c830617a7fe60f
5 changes: 0 additions & 5 deletions plugins/repository-gcs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,6 @@ thirdPartyAudit {
'org.graalvm.nativeimage.hosted.Feature$DuringAnalysisAccess',
'org.graalvm.nativeimage.hosted.Feature$FeatureAccess',
'org.graalvm.nativeimage.hosted.RuntimeReflection',
//slf4j dependencies
'org.slf4j.impl.StaticLoggerBinder',
'org.slf4j.impl.StaticMDCBinder',
'org.slf4j.impl.StaticMarkerBinder',
'org.slf4j.spi.LoggingEventBuilder',
)
}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9e58ac9c7779ba3bf8142aff6c830617a7fe60f

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9e58ac9c7779ba3bf8142aff6c830617a7fe60f
1 change: 0 additions & 1 deletion plugins/repository-s3/licenses/slf4j-api-1.7.36.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-s3/licenses/slf4j-api-2.0.17.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d9e58ac9c7779ba3bf8142aff6c830617a7fe60f
Loading