Revert "Bump log4j2 from 2.21.0 to 2.25.1 (opensearch-project#19184)" (opensearch-project#19430)

This reverts commit b9c5bc7.

Signed-off-by: Andrew Ross <[email protected]>

Author: andrross

CHANGELOG.md

@@ -105,7 +105,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.google.code.gson:gson` from 2.13.1 to 2.13.2 ([#19290](https://github.com/opensearch-project/OpenSearch/pull/19290)) ([#19293](https://github.com/opensearch-project/OpenSearch/pull/19293))
 - Bump `actions/stale` from 9 to 10 ([#19292](https://github.com/opensearch-project/OpenSearch/pull/19292))
 - Bump `com.nimbusds:oauth2-oidc-sdk` from 11.25 to 11.28 ([#19291](https://github.com/opensearch-project/OpenSearch/pull/19291))
-- Bump `log4j2` from 2.21.0 to 2.25.1 ([#19184](https://github.com/opensearch-project/OpenSearch/pull/19184))
 - Bump Apache Lucene from 10.2.2 to 10.3.0 ([#19296](https://github.com/opensearch-project/OpenSearch/pull/19296))
 - Add com.google.code.gson:gson to the gradle version catalog ([#19328](https://github.com/opensearch-project/OpenSearch/pull/19328))
 - Bump `org.apache.logging.log4j:log4j-core` from 2.25.1 to 2.25.2 ([#19360](https://github.com/opensearch-project/OpenSearch/pull/19360))

gradle/libs.versions.toml

@@ -13,9 +13,7 @@ jackson_databind  = "2.18.2"
 snakeyaml         = "2.1"
 icu4j             = "77.1"
 supercsv          = "2.4.0"
-log4j             = "2.25.1"
-error_prone_annotations = "2.41.0"
-spotbugs_annotations = "4.9.4"
+log4j             = "2.21.0"
 slf4j             = "2.0.17"
 asm               = "9.7"
 jettison          = "1.5.4"

libs/core/licenses/log4j-api-2.21.0.jar.sha1

@@ -0,0 +1 @@
+760192f2b69eacf4a4afc78e5a1d7a8de054fcbd

libs/core/licenses/log4j-api-2.25.1.jar.sha1

@@ -24,11 +24,8 @@ dependencies {
   api project('spi')
   compileOnly "com.google.code.findbugs:jsr305:3.0.2"
   runtimeOnly "com.google.guava:guava:${versions.guava}"
-  runtimeOnly "com.google.guava:failureaccess:1.0.2"
-
-  compileOnly "com.github.spotbugs:spotbugs-annotations:${versions.spotbugs_annotations}"
-  compileOnly "com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}"
-
+  implementation "com.google.errorprone:error_prone_annotations:2.24.1"
+  implementation "com.google.guava:failureaccess:1.0.2"
   implementation "io.grpc:grpc-api:${versions.grpc}"
   implementation "io.grpc:grpc-core:${versions.grpc}"
   implementation "io.grpc:grpc-netty-shaded:${versions.grpc}"

modules/transport-grpc/build.gradle

@@ -0,0 +1 @@
+32b299e45105aa9b0df8279c74dc1edfcf313ff0

modules/transport-grpc/licenses/error_prone_annotations-2.24.1.jar.sha1

@@ -54,8 +54,7 @@ dependencies {
   runtimeOnly "io.grpc:grpc-core:${versions.grpc}"
   implementation "io.grpc:grpc-stub:${versions.grpc}"
   implementation "io.grpc:grpc-netty:${versions.grpc}"
-
-  compileOnly "com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}"
+  implementation "com.google.errorprone:error_prone_annotations:2.31.0"
 
   runtimeOnly "com.google.code.findbugs:jsr305:3.0.2"
   annotationProcessor 'org.immutables:value:2.10.1'

server/licenses/error_prone_annotations-LICENSE.txt renamed to modules/transport-grpc/licenses/error_prone_annotations-LICENSE.txt

@@ -0,0 +1 @@
+c3ba307b915d6d506e98ffbb49e6d2d12edad65b