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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ 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))

### Deprecated

Expand Down
4 changes: 3 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ jackson_databind = "2.18.2"
snakeyaml = "2.1"
icu4j = "77.1"
supercsv = "2.4.0"
log4j = "2.21.0"
log4j = "2.25.1"
error_prone_annotations = "2.41.0"
Copy link
Contributor

@navneet1v navneet1v Sep 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason for upgrading error_prone_annotations to 2.41.0 version when guava 33.2.1-jre brings in 2.26.1 ?

Due to this mismatch, now plugins like k-NN who uses guava has to remove error_prone_annotations so that there is no jar hell

spotbugs_annotations = "4.9.4"
slf4j = "2.0.17"
asm = "9.7"
jettison = "1.5.4"
Expand Down
1 change: 0 additions & 1 deletion libs/core/licenses/log4j-api-2.21.0.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions libs/core/licenses/log4j-api-2.25.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c7acbbd6f110cd1457c628da46245e355b1ee57a
7 changes: 5 additions & 2 deletions modules/transport-grpc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ dependencies {
api project('spi')
compileOnly "com.google.code.findbugs:jsr305:3.0.2"
runtimeOnly "com.google.guava:guava:${versions.guava}"
implementation "com.google.errorprone:error_prone_annotations:2.24.1"
implementation "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}"
compileOnly "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}"
Expand Down

This file was deleted.

This file was deleted.

202 changes: 0 additions & 202 deletions modules/transport-grpc/licenses/failureaccess-LICENSE.txt

This file was deleted.

Empty file.
3 changes: 2 additions & 1 deletion plugins/arrow-flight-rpc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ dependencies {
runtimeOnly "io.grpc:grpc-core:${versions.grpc}"
implementation "io.grpc:grpc-stub:${versions.grpc}"
implementation "io.grpc:grpc-netty:${versions.grpc}"
implementation "com.google.errorprone:error_prone_annotations:2.31.0"

compileOnly "com.google.errorprone:error_prone_annotations:${versions.error_prone_annotations}"

runtimeOnly group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
annotationProcessor 'org.immutables:value:2.10.1'
Expand Down

This file was deleted.

Loading
Loading