Skip to content

Commit

Permalink
Bump reactor-core and reactor-netty versions (opensearch-project#12042)…
Browse files Browse the repository at this point in the history
… (opensearch-project#12044)

(cherry picked from commit 95b3ec3)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
1 parent 179d2d4 commit 0c54326
Show file tree
Hide file tree
Showing 12 changed files with 9 additions and 8 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump OpenTelemetry from 1.31.0 to 1.32.0 and OpenTelemetry Semconv from 1.21.0-alpha to 1.23.1-alpha ([#11305](https://github.com/opensearch-project/OpenSearch/pull/11305))
- Bump `com.squareup.okhttp3:okhttp` from 4.11.0 to 4.12.0 ([#10861](https://github.com/opensearch-project/OpenSearch/pull/10861))
- Bump `org.apache.commons:commons-text` from 1.10.0 to 1.11.0 ([#11344](https://github.com/opensearch-project/OpenSearch/pull/11344))
- Bump `reactor-netty-core` from 1.1.12 to 1.1.13 ([#11350](https://github.com/opensearch-project/OpenSearch/pull/11350))
- Bump `reactor-netty-core` from 1.1.12 to 1.1.15 ([#11350](https://github.com/opensearch-project/OpenSearch/pull/11350)), ([#12042](https://github.com/opensearch-project/OpenSearch/pull/12042))
- Bump `com.gradle.enterprise` from 3.14.1 to 3.16.1 ([#11339](https://github.com/opensearch-project/OpenSearch/pull/11339), [#11629](https://github.com/opensearch-project/OpenSearch/pull/11629))
- Bump `actions/setup-java` from 3 to 4 ([#11447](https://github.com/opensearch-project/OpenSearch/pull/11447))
- Bump `org.apache.xmlbeans:xmlbeans` from 5.1.1 to 5.2.0 ([#11448](https://github.com/opensearch-project/OpenSearch/pull/11448))
Expand All @@ -91,6 +91,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `com.google.oauth-client:google-oauth-client` from 1.34.1 to 1.35.0 ([#11960](https://github.com/opensearch-project/OpenSearch/pull/11960))
- Bump `com.diffplug.spotless` from 6.23.2 to 6.24.0 ([#11962](https://github.com/opensearch-project/OpenSearch/pull/11962))
- Bump `com.google.cloud:google-cloud-core` from 2.5.10 to 2.30.0 ([#11961](https://github.com/opensearch-project/OpenSearch/pull/11961))
- Bump `reactor-core` from 3.5.11 to 3.5.14 ([#12042](https://github.com/opensearch-project/OpenSearch/pull/12042))

### Changed
- Force merge with `only_expunge_deletes` honors max segment size ([#10036](https://github.com/opensearch-project/OpenSearch/pull/10036))
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ netty = 4.1.106.Final
joda = 2.12.2

# project reactor
reactor_netty = 1.1.13
reactor = 3.5.11
reactor_netty = 1.1.15
reactor = 3.5.14

# client dependencies
httpclient = 4.5.14
Expand Down

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c79756fa2dfc28ac81fc9d23a14b17c656c3e560
1 change: 0 additions & 1 deletion server/licenses/reactor-core-3.5.11.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions server/licenses/reactor-core-3.5.14.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6e0c97c2e78273a00fd4ed38016b19ff3c6de59e

0 comments on commit 0c54326

Please sign in to comment.