Skip to content

Commit

Permalink
Update to Netty 4.1.115.Final (#16661) (#16666)
Browse files Browse the repository at this point in the history
(cherry picked from commit 8e097ee)

Signed-off-by: Andriy Redko <[email protected]>
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 407a70d commit 480828e
Show file tree
Hide file tree
Showing 94 changed files with 58 additions and 45 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `lycheeverse/lychee-action` from 2.0.2 to 2.1.0 ([#16610](https://github.com/opensearch-project/OpenSearch/pull/16610))
- Bump `me.champeau.gradle.japicmp` from 0.4.4 to 0.4.5 ([#16614](https://github.com/opensearch-project/OpenSearch/pull/16614))
- Bump `mockito` from 5.14.1 to 5.14.2, `objenesis` from 3.2 to 3.3 and `bytebuddy` from 1.15.4 to 1.15.10 ([#16655](https://github.com/opensearch-project/OpenSearch/pull/16655))
- Bump `Netty` from 4.1.114.Final to 4.1.115.Final ([#16661](https://github.com/opensearch-project/OpenSearch/pull/16661))

### Changed

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ grpc = "1.68.0"
# when updating the JNA version, also update the version in buildSrc/build.gradle
jna = "5.13.0"

netty = "4.1.114.Final"
netty = "4.1.115.Final"
joda = "2.12.7"

# project reactor
Expand Down
3 changes: 3 additions & 0 deletions modules/transport-netty4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,9 @@ thirdPartyAudit {
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess',
Expand Down

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1d65f327e8406f80f744060e10135dd5f61a369a
3 changes: 3 additions & 0 deletions plugins/repository-s3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,9 @@ thirdPartyAudit {
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess',
Expand Down

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dc96c67d06cd6b5eb677f2728f27bf2e3d9a7284
3 changes: 3 additions & 0 deletions plugins/transport-nio/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ thirdPartyAudit {
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess',
Expand Down

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dc96c67d06cd6b5eb677f2728f27bf2e3d9a7284
3 changes: 3 additions & 0 deletions plugins/transport-reactor-netty4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,9 @@ thirdPartyAudit {
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess',
Expand Down

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

0 comments on commit 480828e

Please sign in to comment.