bump netty to 4.1.118.Final

this resolves CVE-2025-24970. Signed-off-by: Ralph Ursprung <[email protected]>
rursprung · Feb 11, 2025 · 844975e · 844975e
1 parent 302a3fd
commit 844975e
Show file tree

Hide file tree

Showing 80 changed files with 41 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -82,6 +82,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.google.code.gson:gson` from 2.11.0 to 2.12.1 ([#17229](https://github.com/opensearch-project/OpenSearch/pull/17229))
 - Bump `org.jruby.joni:joni` from 2.2.1 to 2.2.3 ([#17136](https://github.com/opensearch-project/OpenSearch/pull/17136))
 - Bump `org.apache.ant:ant` from 1.10.14 to 1.10.15 ([#17288](https://github.com/opensearch-project/OpenSearch/pull/17288))
+- Bump netty from 4.1.117.Final to 4.1.118.Final ([#17320](https://github.com/opensearch-project/OpenSearch/pull/17320))
 
 ### Changed
 - Indexed IP field supports `terms_query` with more than 1025 IP masks [#16391](https://github.com/opensearch-project/OpenSearch/pull/16391)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -32,7 +32,7 @@ grpc              = "1.68.2"
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = "5.13.0"
 
-netty             = "4.1.117.Final"
+netty             = "4.1.118.Final"
 joda              = "2.12.7"
 roaringbitmap     = "1.3.0"
 

diff --git a/libs/arrow-spi/licenses/netty-buffer-4.1.117.Final.jar.sha1 b/libs/arrow-spi/licenses/netty-buffer-4.1.117.Final.jar.sha1
diff --git a/libs/arrow-spi/licenses/netty-buffer-4.1.118.Final.jar.sha1 b/libs/arrow-spi/licenses/netty-buffer-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+7022990af1e0d449f9d5322035899745e19735c5
diff --git a/libs/arrow-spi/licenses/netty-common-4.1.117.Final.jar.sha1 b/libs/arrow-spi/licenses/netty-common-4.1.117.Final.jar.sha1
diff --git a/libs/arrow-spi/licenses/netty-common-4.1.118.Final.jar.sha1 b/libs/arrow-spi/licenses/netty-common-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+4bb0f9899146484fa89f7b9bc27389d5b8e2ecde
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.117.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.118.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+7022990af1e0d449f9d5322035899745e19735c5
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.117.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.118.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+307f665c08ce57333121de4f460479fc0c3c94d4
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.117.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.118.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+eda08a71294afe78c779b85fd696bc13491507a8
diff --git a/modules/transport-netty4/licenses/netty-codec-http2-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http2-4.1.117.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-http2-4.1.118.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http2-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+e3c35c0685ec9e84c4f84b79feea7c9d185a08d3
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.117.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.118.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+4bb0f9899146484fa89f7b9bc27389d5b8e2ecde
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.117.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.118.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+30ebb05b6b0fb071dbfcf713017c4a767a97bb9b
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.117.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.118.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+28c378c19c1779eca1104b400452627f3ebc4aea
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.117.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.118.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+5a27232e5d08218722d94ca14f0b1b4576e7711c
diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.117.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.117.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.118.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+9da25a94e6a0edac90da0bc7894e5a54efcb866b
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.117.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.118.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+0e04bf6679ab5e1bedae12047c4e049887476993
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.117.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.118.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+e3c35c0685ec9e84c4f84b79feea7c9d185a08d3
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.117.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.118.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+488a67579f062bba2d2d20ce46f9bb28a68b0875
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.117.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.118.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+28d6c41b72df614e09440ae0bed53a43fbcfbe27
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.117.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.118.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+ff5bfb643ccc5a809c4c21b10167b8d214ceaeeb
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.117.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.118.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+9da25a94e6a0edac90da0bc7894e5a54efcb866b
diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.117.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.118.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+00b5462c05eeb5a0321fded73c28b5fc7833878f
diff --git a/plugins/repository-s3/licenses/netty-buffer-4.1.117.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-buffer-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-s3/licenses/netty-buffer-4.1.118.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-buffer-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+7022990af1e0d449f9d5322035899745e19735c5
diff --git a/plugins/repository-s3/licenses/netty-codec-4.1.117.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-s3/licenses/netty-codec-4.1.118.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+307f665c08ce57333121de4f460479fc0c3c94d4
diff --git a/plugins/repository-s3/licenses/netty-codec-http-4.1.117.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-s3/licenses/netty-codec-http-4.1.118.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+eda08a71294afe78c779b85fd696bc13491507a8
diff --git a/plugins/repository-s3/licenses/netty-codec-http2-4.1.117.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http2-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-s3/licenses/netty-codec-http2-4.1.118.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http2-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+e3c35c0685ec9e84c4f84b79feea7c9d185a08d3
diff --git a/plugins/repository-s3/licenses/netty-common-4.1.117.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-common-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-s3/licenses/netty-common-4.1.118.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-common-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+4bb0f9899146484fa89f7b9bc27389d5b8e2ecde
diff --git a/plugins/repository-s3/licenses/netty-handler-4.1.117.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-handler-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-s3/licenses/netty-handler-4.1.118.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-handler-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+30ebb05b6b0fb071dbfcf713017c4a767a97bb9b
diff --git a/plugins/repository-s3/licenses/netty-resolver-4.1.117.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-resolver-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-s3/licenses/netty-resolver-4.1.118.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-resolver-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+28c378c19c1779eca1104b400452627f3ebc4aea
diff --git a/plugins/repository-s3/licenses/netty-transport-4.1.117.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-s3/licenses/netty-transport-4.1.118.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+5a27232e5d08218722d94ca14f0b1b4576e7711c
diff --git a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.117.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.118.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+376ce95507066f0e755d97c1c8bcd6c33f657617
diff --git a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.117.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.117.Final.jar.sha1
diff --git a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.118.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+9da25a94e6a0edac90da0bc7894e5a54efcb866b
diff --git a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.117.Final.jar.sha1
diff --git a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.118.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+7022990af1e0d449f9d5322035899745e19735c5
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.117.Final.jar.sha1
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.118.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+307f665c08ce57333121de4f460479fc0c3c94d4
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.117.Final.jar.sha1
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.118.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+0e04bf6679ab5e1bedae12047c4e049887476993
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.117.Final.jar.sha1
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.118.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+eda08a71294afe78c779b85fd696bc13491507a8
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.117.Final.jar.sha1
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.118.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+e3c35c0685ec9e84c4f84b79feea7c9d185a08d3
diff --git a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.117.Final.jar.sha1
diff --git a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.118.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+4bb0f9899146484fa89f7b9bc27389d5b8e2ecde
diff --git a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.117.Final.jar.sha1
diff --git a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.118.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+30ebb05b6b0fb071dbfcf713017c4a767a97bb9b
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.117.Final.jar.sha1
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.118.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+28c378c19c1779eca1104b400452627f3ebc4aea
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.117.Final.jar.sha1
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.118.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+ff5bfb643ccc5a809c4c21b10167b8d214ceaeeb
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.117.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.117.Final.jar.sha1
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.118.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+5a27232e5d08218722d94ca14f0b1b4576e7711c
diff --git a/...ansport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.117.Final.jar.sha1 b/...ansport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.117.Final.jar.sha1
diff --git a/...ansport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.118.Final.jar.sha1 b/...ansport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.118.Final.jar.sha1
@@ -0,0 +1 @@
+9da25a94e6a0edac90da0bc7894e5a54efcb866b