Skip to content

[Backport] [3.0] Bump reactor-netty from 1.2.4 to 1.2.5 and reactor from 3.5.20 to 3.7.5 (#18243) #18249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 10, 2025
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Dependencies
- Update Apache HttpClient5 and HttpCore5 (CVE-2025-27820) ([#18152](https://github.com/opensearch-project/OpenSearch/pull/18152))
- Bump `netty` from 4.1.118.Final to 4.1.121.Final ([#18192](https://github.com/opensearch-project/OpenSearch/pull/18192))
- Bump `reactor-netty` from 1.2.4 to 1.2.5 ([#18243](https://github.com/opensearch-project/OpenSearch/pull/18243))
- Bump `reactor` from 3.5.20 to 3.7.5 ([#18243](https://github.com/opensearch-project/OpenSearch/pull/18243))

### Deprecated

Expand Down
3 changes: 2 additions & 1 deletion client/rest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ thirdPartyAudit {
'reactor.blockhound.integration.BlockHoundIntegration'
)
ignoreViolations(
'reactor.core.publisher.Traces$SharedSecretsCallSiteSupplierFactory$TracingException'
'reactor.core.publisher.CallSiteSupplierFactory$SharedSecretsCallSiteSupplierFactory',
'reactor.core.publisher.CallSiteSupplierFactory$SharedSecretsCallSiteSupplierFactory$TracingException'
)
}

Expand Down
1 change: 0 additions & 1 deletion client/rest/licenses/reactor-core-3.5.20.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions client/rest/licenses/reactor-core-3.7.5.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2ffb9b7043593da9a80b91f14cc30f4914183f3a
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ joda = "2.12.7"
roaringbitmap = "1.3.0"

# project reactor
reactor_netty = "1.2.4"
reactor = "3.5.20"
reactor_netty = "1.2.5"
reactor = "3.7.5"

# client dependencies
httpclient5 = "5.4.4"
Expand Down

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b3f2a54919a1e15ca9543380b045ba54ca4e57cc
3 changes: 2 additions & 1 deletion server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,8 @@ tasks.named("thirdPartyAudit").configure {
'com.google.protobuf.UnsafeUtil$MemoryAccessor',
'org.apache.logging.log4j.core.util.internal.UnsafeUtil',
'org.apache.logging.log4j.core.util.internal.UnsafeUtil$1',
'reactor.core.publisher.Traces$SharedSecretsCallSiteSupplierFactory$TracingException'
'reactor.core.publisher.CallSiteSupplierFactory$SharedSecretsCallSiteSupplierFactory',
'reactor.core.publisher.CallSiteSupplierFactory$SharedSecretsCallSiteSupplierFactory$TracingException'
)
}

Expand Down
1 change: 0 additions & 1 deletion server/licenses/reactor-core-3.5.20.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/reactor-core-3.7.5.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2ffb9b7043593da9a80b91f14cc30f4914183f3a
Loading