Merge remote-tracking branch 'upstream/main' into workflow-bug

Author: prudhvigodithi

CHANGELOG.md

@@ -39,11 +39,12 @@ 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 `org.apache.tika` from 2.9.2 to 3.2.2 ([#19125](https://github.com/opensearch-project/OpenSearch/pull/19125))
 - Bump `org.apache.commons:commons-compress` from 1.26.1 to 1.28.0 ([#19125](https://github.com/opensearch-project/OpenSearch/pull/19125))
+- Bump Slf4j from 1.7.36 to 2.0.17 ([#19136](https://github.com/opensearch-project/OpenSearch/pull/19136))
 
 ### Deprecated
 

client/rest/build.gradle

@@ -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',

client/rest/licenses/slf4j-api-1.7.36.jar.sha1

@@ -0,0 +1 @@
+d9e58ac9c7779ba3bf8142aff6c830617a7fe60f

client/rest/licenses/slf4j-api-2.0.17.jar.sha1

@@ -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"

gradle/libs.versions.toml

@@ -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',

plugins/arrow-flight-rpc/build.gradle

@@ -0,0 +1 @@
+d9e58ac9c7779ba3bf8142aff6c830617a7fe60f

plugins/arrow-flight-rpc/licenses/slf4j-api-1.7.36.jar.sha1

@@ -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'
   )
 }