This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new bc0d004bcdd Backport Netty to latest version for branch_9x (#3489)
bc0d004bcdd is described below
commit bc0d004bcdd18e9b02cdab34e898bef0d494fefd
Author: Eric Pugh <[email protected]>
AuthorDate: Tue Aug 19 14:48:40 2025 -0400
Backport Netty to latest version for branch_9x (#3489)
---
solr/licenses/netty-buffer-4.1.114.Final.jar.sha1 | 1 -
solr/licenses/netty-buffer-4.2.4.Final.jar.sha1 | 1 +
solr/licenses/netty-codec-4.1.114.Final.jar.sha1 | 1 -
.../licenses/netty-codec-base-4.2.4.Final.jar.sha1 | 1 +
.../netty-codec-compression-4.2.4.Final.jar.sha1 | 1 +
.../netty-codec-http-4.1.114.Final.jar.sha1 | 1 -
.../licenses/netty-codec-http-4.2.4.Final.jar.sha1 | 1 +
.../netty-codec-http2-4.1.114.Final.jar.sha1 | 1 -
.../netty-codec-http2-4.2.4.Final.jar.sha1 | 1 +
.../netty-codec-socks-4.1.114.Final.jar.sha1 | 1 -
.../netty-codec-socks-4.2.4.Final.jar.sha1 | 1 +
solr/licenses/netty-common-4.1.114.Final.jar.sha1 | 1 -
solr/licenses/netty-common-4.2.4.Final.jar.sha1 | 1 +
solr/licenses/netty-handler-4.1.114.Final.jar.sha1 | 1 -
solr/licenses/netty-handler-4.2.4.Final.jar.sha1 | 1 +
.../netty-handler-proxy-4.1.114.Final.jar.sha1 | 1 -
.../netty-handler-proxy-4.2.4.Final.jar.sha1 | 1 +
.../licenses/netty-resolver-4.1.114.Final.jar.sha1 | 1 -
solr/licenses/netty-resolver-4.2.4.Final.jar.sha1 | 1 +
...tcnative-boringssl-static-2.0.66.Final.jar.sha1 | 1 -
...tcnative-boringssl-static-2.0.72.Final.jar.sha1 | 1 +
.../netty-tcnative-classes-2.0.66.Final.jar.sha1 | 1 -
.../netty-tcnative-classes-2.0.72.Final.jar.sha1 | 1 +
.../netty-transport-4.1.114.Final.jar.sha1 | 1 -
solr/licenses/netty-transport-4.2.4.Final.jar.sha1 | 1 +
...-transport-classes-epoll-4.1.114.Final.jar.sha1 | 1 -
...ty-transport-classes-epoll-4.2.4.Final.jar.sha1 | 1 +
...ative-epoll-4.1.114.Final-linux-x86_64.jar.sha1 | 1 -
...-native-epoll-4.2.4.Final-linux-x86_64.jar.sha1 | 1 +
...sport-native-unix-common-4.1.114.Final.jar.sha1 | 1 -
...ansport-native-unix-common-4.2.4.Final.jar.sha1 | 1 +
versions.lock | 33 +++++++++++-----------
versions.props | 2 +-
33 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/solr/licenses/netty-buffer-4.1.114.Final.jar.sha1
b/solr/licenses/netty-buffer-4.1.114.Final.jar.sha1
deleted file mode 100644
index 720e556e6d8..00000000000
--- a/solr/licenses/netty-buffer-4.1.114.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f1d77d15c0b781cd9395a2a956262766fd0c7602
diff --git a/solr/licenses/netty-buffer-4.2.4.Final.jar.sha1
b/solr/licenses/netty-buffer-4.2.4.Final.jar.sha1
new file mode 100644
index 00000000000..24880f50704
--- /dev/null
+++ b/solr/licenses/netty-buffer-4.2.4.Final.jar.sha1
@@ -0,0 +1 @@
+ddf4e915e4c7bc227dad3166e87e65c7c267489a
diff --git a/solr/licenses/netty-codec-4.1.114.Final.jar.sha1
b/solr/licenses/netty-codec-4.1.114.Final.jar.sha1
deleted file mode 100644
index 84b726e18a0..00000000000
--- a/solr/licenses/netty-codec-4.1.114.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5a49dfa2828d64bf756f670e63259115332744cf
diff --git a/solr/licenses/netty-codec-base-4.2.4.Final.jar.sha1
b/solr/licenses/netty-codec-base-4.2.4.Final.jar.sha1
new file mode 100644
index 00000000000..46e186bb28c
--- /dev/null
+++ b/solr/licenses/netty-codec-base-4.2.4.Final.jar.sha1
@@ -0,0 +1 @@
+1ce749159854c881db5f72f20554b593303d6383
diff --git a/solr/licenses/netty-codec-compression-4.2.4.Final.jar.sha1
b/solr/licenses/netty-codec-compression-4.2.4.Final.jar.sha1
new file mode 100644
index 00000000000..163019010df
--- /dev/null
+++ b/solr/licenses/netty-codec-compression-4.2.4.Final.jar.sha1
@@ -0,0 +1 @@
+1ee714313d5a4828a9a5e91ef7b286b0ae70432d
diff --git a/solr/licenses/netty-codec-http-4.1.114.Final.jar.sha1
b/solr/licenses/netty-codec-http-4.1.114.Final.jar.sha1
deleted file mode 100644
index c7c0248da60..00000000000
--- a/solr/licenses/netty-codec-http-4.1.114.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fbce5a53884275662e68aaad70f88bf7e5d04164
diff --git a/solr/licenses/netty-codec-http-4.2.4.Final.jar.sha1
b/solr/licenses/netty-codec-http-4.2.4.Final.jar.sha1
new file mode 100644
index 00000000000..6693fcb5822
--- /dev/null
+++ b/solr/licenses/netty-codec-http-4.2.4.Final.jar.sha1
@@ -0,0 +1 @@
+04670107b2f6419d21cb7967a680671692f44157
diff --git a/solr/licenses/netty-codec-http2-4.1.114.Final.jar.sha1
b/solr/licenses/netty-codec-http2-4.1.114.Final.jar.sha1
deleted file mode 100644
index 47c75f00256..00000000000
--- a/solr/licenses/netty-codec-http2-4.1.114.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-19ae07fdf99142a70338f8cda70a3d2edbc8e80a
diff --git a/solr/licenses/netty-codec-http2-4.2.4.Final.jar.sha1
b/solr/licenses/netty-codec-http2-4.2.4.Final.jar.sha1
new file mode 100644
index 00000000000..256def1df08
--- /dev/null
+++ b/solr/licenses/netty-codec-http2-4.2.4.Final.jar.sha1
@@ -0,0 +1 @@
+b4799709023e809dc85f93c6162b786cf31b4a21
diff --git a/solr/licenses/netty-codec-socks-4.1.114.Final.jar.sha1
b/solr/licenses/netty-codec-socks-4.1.114.Final.jar.sha1
deleted file mode 100644
index decacfe281e..00000000000
--- a/solr/licenses/netty-codec-socks-4.1.114.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-42b1159cac3d196f6bdbd528e29f0fab9dbaae06
diff --git a/solr/licenses/netty-codec-socks-4.2.4.Final.jar.sha1
b/solr/licenses/netty-codec-socks-4.2.4.Final.jar.sha1
new file mode 100644
index 00000000000..e31679540f7
--- /dev/null
+++ b/solr/licenses/netty-codec-socks-4.2.4.Final.jar.sha1
@@ -0,0 +1 @@
+447f08b48a0991565e774bcbffcebe2df8b60a83
diff --git a/solr/licenses/netty-common-4.1.114.Final.jar.sha1
b/solr/licenses/netty-common-4.1.114.Final.jar.sha1
deleted file mode 100644
index e4304152793..00000000000
--- a/solr/licenses/netty-common-4.1.114.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-862712e292b162c8ccaa7847a6a54df8178f77e5
diff --git a/solr/licenses/netty-common-4.2.4.Final.jar.sha1
b/solr/licenses/netty-common-4.2.4.Final.jar.sha1
new file mode 100644
index 00000000000..a219ef2d919
--- /dev/null
+++ b/solr/licenses/netty-common-4.2.4.Final.jar.sha1
@@ -0,0 +1 @@
+2ab161f17d7dd66a1c8ac2f180a448c314790abb
diff --git a/solr/licenses/netty-handler-4.1.114.Final.jar.sha1
b/solr/licenses/netty-handler-4.1.114.Final.jar.sha1
deleted file mode 100644
index 3a44d3b3d57..00000000000
--- a/solr/licenses/netty-handler-4.1.114.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e56fbde4b9aa628eed15a5dbfbeb97877db88146
diff --git a/solr/licenses/netty-handler-4.2.4.Final.jar.sha1
b/solr/licenses/netty-handler-4.2.4.Final.jar.sha1
new file mode 100644
index 00000000000..22865de689c
--- /dev/null
+++ b/solr/licenses/netty-handler-4.2.4.Final.jar.sha1
@@ -0,0 +1 @@
+2743026b7e760647960c40cea3a1e8cadcaca3d3
diff --git a/solr/licenses/netty-handler-proxy-4.1.114.Final.jar.sha1
b/solr/licenses/netty-handler-proxy-4.1.114.Final.jar.sha1
deleted file mode 100644
index 49fbddcc7db..00000000000
--- a/solr/licenses/netty-handler-proxy-4.1.114.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a01071edffb4812009312b461ce5f160cdec9b75
diff --git a/solr/licenses/netty-handler-proxy-4.2.4.Final.jar.sha1
b/solr/licenses/netty-handler-proxy-4.2.4.Final.jar.sha1
new file mode 100644
index 00000000000..89df1228e7c
--- /dev/null
+++ b/solr/licenses/netty-handler-proxy-4.2.4.Final.jar.sha1
@@ -0,0 +1 @@
+6ea0887e31a0eaa13262a33a2451f67332c51dad
diff --git a/solr/licenses/netty-resolver-4.1.114.Final.jar.sha1
b/solr/licenses/netty-resolver-4.1.114.Final.jar.sha1
deleted file mode 100644
index c1135b835f7..00000000000
--- a/solr/licenses/netty-resolver-4.1.114.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-10b23784b23d6a948930f52ba82874f1291b5873
diff --git a/solr/licenses/netty-resolver-4.2.4.Final.jar.sha1
b/solr/licenses/netty-resolver-4.2.4.Final.jar.sha1
new file mode 100644
index 00000000000..73f3c8daad9
--- /dev/null
+++ b/solr/licenses/netty-resolver-4.2.4.Final.jar.sha1
@@ -0,0 +1 @@
+d6104fe65ef3411f07f664220e58396cdfc64cc8
diff --git
a/solr/licenses/netty-tcnative-boringssl-static-2.0.66.Final.jar.sha1
b/solr/licenses/netty-tcnative-boringssl-static-2.0.66.Final.jar.sha1
deleted file mode 100644
index 04aa0028843..00000000000
--- a/solr/licenses/netty-tcnative-boringssl-static-2.0.66.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7b0abf028c27ce6ad0c17a443a13f175fb4eda27
diff --git
a/solr/licenses/netty-tcnative-boringssl-static-2.0.72.Final.jar.sha1
b/solr/licenses/netty-tcnative-boringssl-static-2.0.72.Final.jar.sha1
new file mode 100644
index 00000000000..ec81c9b92c2
--- /dev/null
+++ b/solr/licenses/netty-tcnative-boringssl-static-2.0.72.Final.jar.sha1
@@ -0,0 +1 @@
+28c13534d6f09683e209b28ff2e98efe38d40364
diff --git a/solr/licenses/netty-tcnative-classes-2.0.66.Final.jar.sha1
b/solr/licenses/netty-tcnative-classes-2.0.66.Final.jar.sha1
deleted file mode 100644
index 77a6debf6b2..00000000000
--- a/solr/licenses/netty-tcnative-classes-2.0.66.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9588bd2f891157538a78d86c945aa34bf9308dda
diff --git a/solr/licenses/netty-tcnative-classes-2.0.72.Final.jar.sha1
b/solr/licenses/netty-tcnative-classes-2.0.72.Final.jar.sha1
new file mode 100644
index 00000000000..667e0c1368c
--- /dev/null
+++ b/solr/licenses/netty-tcnative-classes-2.0.72.Final.jar.sha1
@@ -0,0 +1 @@
+d67316bc03c7b929517c34737d36cd7da5946c4f
diff --git a/solr/licenses/netty-transport-4.1.114.Final.jar.sha1
b/solr/licenses/netty-transport-4.1.114.Final.jar.sha1
deleted file mode 100644
index f74dfc80c43..00000000000
--- a/solr/licenses/netty-transport-4.1.114.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e0225a575f487904be8517092cbd74e01913533c
diff --git a/solr/licenses/netty-transport-4.2.4.Final.jar.sha1
b/solr/licenses/netty-transport-4.2.4.Final.jar.sha1
new file mode 100644
index 00000000000..27f84851ffe
--- /dev/null
+++ b/solr/licenses/netty-transport-4.2.4.Final.jar.sha1
@@ -0,0 +1 @@
+dcc86deff7735fe678a9159e3ba991cc85a6870b
diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.114.Final.jar.sha1
b/solr/licenses/netty-transport-classes-epoll-4.1.114.Final.jar.sha1
deleted file mode 100644
index c9046686be2..00000000000
--- a/solr/licenses/netty-transport-classes-epoll-4.1.114.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f442c794e6fe89e6974f058bf393353e01fb927d
diff --git a/solr/licenses/netty-transport-classes-epoll-4.2.4.Final.jar.sha1
b/solr/licenses/netty-transport-classes-epoll-4.2.4.Final.jar.sha1
new file mode 100644
index 00000000000..0dcc4b18e34
--- /dev/null
+++ b/solr/licenses/netty-transport-classes-epoll-4.2.4.Final.jar.sha1
@@ -0,0 +1 @@
+1bcbe4f5b2bec41c5cf04efa9074a0c717882f78
diff --git
a/solr/licenses/netty-transport-native-epoll-4.1.114.Final-linux-x86_64.jar.sha1
b/solr/licenses/netty-transport-native-epoll-4.1.114.Final-linux-x86_64.jar.sha1
deleted file mode 100644
index 672f28c70a2..00000000000
---
a/solr/licenses/netty-transport-native-epoll-4.1.114.Final-linux-x86_64.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-43268d2bef66e72e5a7956045a3caf8395f49ae6
diff --git
a/solr/licenses/netty-transport-native-epoll-4.2.4.Final-linux-x86_64.jar.sha1
b/solr/licenses/netty-transport-native-epoll-4.2.4.Final-linux-x86_64.jar.sha1
new file mode 100644
index 00000000000..283a866f027
--- /dev/null
+++
b/solr/licenses/netty-transport-native-epoll-4.2.4.Final-linux-x86_64.jar.sha1
@@ -0,0 +1 @@
+4857c1eee50b94754443e33810fd5f6bcc758017
diff --git
a/solr/licenses/netty-transport-native-unix-common-4.1.114.Final.jar.sha1
b/solr/licenses/netty-transport-native-unix-common-4.1.114.Final.jar.sha1
deleted file mode 100644
index 9b40cb77ea2..00000000000
--- a/solr/licenses/netty-transport-native-unix-common-4.1.114.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d1171bb99411f282068f49d780cedf8c9adeabfd
diff --git
a/solr/licenses/netty-transport-native-unix-common-4.2.4.Final.jar.sha1
b/solr/licenses/netty-transport-native-unix-common-4.2.4.Final.jar.sha1
new file mode 100644
index 00000000000..4871a45027b
--- /dev/null
+++ b/solr/licenses/netty-transport-native-unix-common-4.2.4.Final.jar.sha1
@@ -0,0 +1 @@
+8e84d47a372fdc928a50b865380a7198a0946782
diff --git a/versions.lock b/versions.lock
index 92bb063ea0a..3bcd61f0c30 100644
--- a/versions.lock
+++ b/versions.lock
@@ -137,22 +137,23 @@ io.grpc:grpc-util:1.65.1 (2 constraints: ec1876f9)
io.grpc:grpc-xds:1.65.1 (1 constraints: 1f100ba6)
io.jaegertracing:jaeger-core:1.8.1 (2 constraints: 6f124721)
io.jaegertracing:jaeger-thrift:1.8.1 (1 constraints: 0c050936)
-io.netty:netty-bom:4.1.114.Final (1 constraints: 8507c567)
-io.netty:netty-buffer:4.1.114.Final (11 constraints: 73a6ad35)
-io.netty:netty-codec:4.1.114.Final (6 constraints: 5a5150a9)
-io.netty:netty-codec-http:4.1.114.Final (4 constraints: fa2f72f8)
-io.netty:netty-codec-http2:4.1.114.Final (2 constraints: 3c16cf31)
-io.netty:netty-codec-socks:4.1.114.Final (2 constraints: 6a1a3f4b)
-io.netty:netty-common:4.1.114.Final (13 constraints: 3dc0e6cd)
-io.netty:netty-handler:4.1.114.Final (4 constraints: 1537b540)
-io.netty:netty-handler-proxy:4.1.114.Final (2 constraints: 3c16cf31)
-io.netty:netty-resolver:4.1.114.Final (3 constraints: d7254fb5)
-io.netty:netty-tcnative-boringssl-static:2.0.66.Final (2 constraints: d61a6458)
-io.netty:netty-tcnative-classes:2.0.66.Final (2 constraints: d61e8b95)
-io.netty:netty-transport:4.1.114.Final (10 constraints: 97988ae2)
-io.netty:netty-transport-classes-epoll:4.1.114.Final (2 constraints: 071ebe65)
-io.netty:netty-transport-native-epoll:4.1.114.Final (2 constraints: 2f1bbf84)
-io.netty:netty-transport-native-unix-common:4.1.114.Final (5 constraints:
2249871c)
+io.netty:netty-bom:4.2.4.Final (1 constraints: 2407df5a)
+io.netty:netty-buffer:4.2.4.Final (12 constraints: 7bb41ab1)
+io.netty:netty-codec-base:4.2.4.Final (7 constraints: 7f5f2a3d)
+io.netty:netty-codec-compression:4.2.4.Final (2 constraints: 4618449e)
+io.netty:netty-codec-http:4.2.4.Final (4 constraints: 762ea1ce)
+io.netty:netty-codec-http2:4.2.4.Final (2 constraints: db157b07)
+io.netty:netty-codec-socks:4.2.4.Final (2 constraints: a819fdf3)
+io.netty:netty-common:4.2.4.Final (14 constraints: 83cdaa7e)
+io.netty:netty-handler:4.2.4.Final (5 constraints: cd4440c5)
+io.netty:netty-handler-proxy:4.2.4.Final (2 constraints: db157b07)
+io.netty:netty-resolver:4.2.4.Final (3 constraints: b42419fe)
+io.netty:netty-tcnative-boringssl-static:2.0.72.Final (2 constraints: d31ac657)
+io.netty:netty-tcnative-classes:2.0.72.Final (2 constraints: d01ebb94)
+io.netty:netty-transport:4.2.4.Final (11 constraints: 00a7b064)
+io.netty:netty-transport-classes-epoll:4.2.4.Final (2 constraints: 451de803)
+io.netty:netty-transport-native-epoll:4.2.4.Final (2 constraints: ce1ab85e)
+io.netty:netty-transport-native-unix-common:4.2.4.Final (5 constraints:
9e474e42)
io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692)
io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)
io.opencensus:opencensus-proto:0.2.0 (1 constraints: e60fd595)
diff --git a/versions.props b/versions.props
index 2e52668fdab..c76b8684fe3 100644
--- a/versions.props
+++ b/versions.props
@@ -26,7 +26,7 @@ dev.langchain4j:langchain4j-*=0.35.0
io.dropwizard.metrics:*=4.2.26
io.grpc:grpc-*=1.65.1
io.jaegertracing:*=1.8.1
-io.netty:*=4.1.114.Final
+io.netty:*=4.2.4.Final
io.opentelemetry:opentelemetry-bom=1.40.0
io.opentracing:*=0.33.0
io.prometheus:*=0.16.0
