Apache Solr open-source search software
SOLR-16424: Upgrade Netty to 4.1.82.Final (#1029)
Kevin Risdene5116a427408
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 3467a8f85c0..dcf14de930e 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -208,6 +208,8 @@ Other Changes* SOLR-16141: Upgrade Apache Tika to 1.28.4 (janhoy)+* SOLR-16424: Upgrade Netty to 4.1.82.Final (Kevin Risden)+Build---------------------* SOLR-16204: Change Lucene dependency to Lucene 9.1.0 (Elia Porciani via Alessandro Benedetti)diff --git a/solr/licenses/netty-buffer-4.1.68.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.68.Final.jar.sha1deleted file mode 100644index af02fcb316a..00000000000--- a/solr/licenses/netty-buffer-4.1.68.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-513c8b3b0b608fa64bfaef473e20f73cc2ae4f2ddiff --git a/solr/licenses/netty-buffer-4.1.82.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.82.Final.jar.sha1new file mode 100644index 00000000000..62af64ff6fd--- /dev/null+++ b/solr/licenses/netty-buffer-4.1.82.Final.jar.sha1@@ -0,0 +1 @@+a544270cf1ae8b8077082f5036436a9a9971ea71diff --git a/solr/licenses/netty-codec-4.1.68.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.68.Final.jar.sha1deleted file mode 100644index 60d44d2d474..00000000000--- a/solr/licenses/netty-codec-4.1.68.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-910fce1b73c414daf894fbbcfc7a1e8530a69a0fdiff --git a/solr/licenses/netty-codec-4.1.82.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.82.Final.jar.sha1new file mode 100644index 00000000000..e0922f08a34--- /dev/null+++ b/solr/licenses/netty-codec-4.1.82.Final.jar.sha1@@ -0,0 +1 @@+b77200379acb345a9ffdece1c605e591ac3e4e0adiff --git a/solr/licenses/netty-codec-http-4.1.68.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.68.Final.jar.sha1deleted file mode 100644index a05d228a1cc..00000000000--- a/solr/licenses/netty-codec-http-4.1.68.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-fc2e0526ceba7fe1d0ca1adfedc301afcc47bc51diff --git a/solr/licenses/netty-codec-http-4.1.82.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.82.Final.jar.sha1new file mode 100644index 00000000000..06a93f2faa7--- /dev/null+++ b/solr/licenses/netty-codec-http-4.1.82.Final.jar.sha1@@ -0,0 +1 @@+f74b563d5206b71c430eeae4cdf703b0ed9cf07cdiff --git a/solr/licenses/netty-common-4.1.68.Final.jar.sha1 b/solr/licenses/netty-common-4.1.68.Final.jar.sha1deleted file mode 100644index fb7b4307c2e..00000000000--- a/solr/licenses/netty-common-4.1.68.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-35820b0f9cb6ae04ea88c43d3c322cb113cbef1bdiff --git a/solr/licenses/netty-common-4.1.82.Final.jar.sha1 b/solr/licenses/netty-common-4.1.82.Final.jar.sha1new file mode 100644index 00000000000..eb6b46d832d--- /dev/null+++ b/solr/licenses/netty-common-4.1.82.Final.jar.sha1@@ -0,0 +1 @@+022d148e85c3f5ebdacc0ce1f5aabb1d420f73f3diff --git a/solr/licenses/netty-handler-4.1.68.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.68.Final.jar.sha1deleted file mode 100644index fea503143f5..00000000000--- a/solr/licenses/netty-handler-4.1.68.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f55a4ad40f228baf6005ac5ca39915ce5dfb3bd5diff --git a/solr/licenses/netty-handler-4.1.82.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.82.Final.jar.sha1new file mode 100644index 00000000000..30491668014--- /dev/null+++ b/solr/licenses/netty-handler-4.1.82.Final.jar.sha1@@ -0,0 +1 @@+644041d1fa96a5d3130a29e8978630d716d76e38diff --git a/solr/licenses/netty-resolver-4.1.68.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.68.Final.jar.sha1deleted file mode 100644index eff734cae53..00000000000--- a/solr/licenses/netty-resolver-4.1.68.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8c174db162c3dc1bca3020705d0e75845b517ca9diff --git a/solr/licenses/netty-resolver-4.1.82.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.82.Final.jar.sha1new file mode 100644index 00000000000..f69a761e112--- /dev/null+++ b/solr/licenses/netty-resolver-4.1.82.Final.jar.sha1@@ -0,0 +1 @@+38f665ae8dcd29032eea31245ba7806bed2e0fa8diff --git a/solr/licenses/netty-transport-4.1.68.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.68.Final.jar.sha1deleted file mode 100644index d11b7310f00..00000000000--- a/solr/licenses/netty-transport-4.1.68.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-8356884a7ad58a3df226eecf955bdfd785e83637diff --git a/solr/licenses/netty-transport-4.1.82.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.82.Final.jar.sha1new file mode 100644index 00000000000..e29568699ea--- /dev/null+++ b/solr/licenses/netty-transport-4.1.82.Final.jar.sha1@@ -0,0 +1 @@+e431a218d91acb6476ccad5f5aafde50aa3945cadiff --git a/solr/licenses/netty-transport-classes-epoll-4.1.82.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.82.Final.jar.sha1new file mode 100644index 00000000000..df877deeddc--- /dev/null+++ b/solr/licenses/netty-transport-classes-epoll-4.1.82.Final.jar.sha1@@ -0,0 +1 @@+e7c7dd18deac93105797f30057c912651ea76521diff --git a/solr/licenses/netty-transport-native-epoll-4.1.68.Final.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.68.Final.jar.sha1deleted file mode 100644index 360b8eb85e0..00000000000--- a/solr/licenses/netty-transport-native-epoll-4.1.68.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-b9cd7f6dd6b67e9fe10cd3cf7622ae145fe131d9diff --git a/solr/licenses/netty-transport-native-epoll-4.1.82.Final.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.82.Final.jar.sha1new file mode 100644index 00000000000..3d14c6a8a09--- /dev/null+++ b/solr/licenses/netty-transport-native-epoll-4.1.82.Final.jar.sha1@@ -0,0 +1 @@+9a9e7b32e3fc07d0760e15c28fe5f751d3d36377diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.68.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.68.Final.jar.sha1deleted file mode 100644index a4ba8c01cea..00000000000--- a/solr/licenses/netty-transport-native-unix-common-4.1.68.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a3f09df9ab7cc0870ef868f31319052cfc49cd72diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.82.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.82.Final.jar.sha1new file mode 100644index 00000000000..602c6f22e10--- /dev/null+++ b/solr/licenses/netty-transport-native-unix-common-4.1.82.Final.jar.sha1@@ -0,0 +1 @@+3e895b35ca1b8a0eca56cacff4c2dde5d2c6abcediff --git a/versions.lock b/versions.lockindex 437aecb4186..e8fdf8cfa34 100644--- a/versions.lock+++ b/versions.lock@@ -85,14 +85,15 @@ io.dropwizard.metrics:metrics-jvm:4.1.5 (1 constraints: 0c050736)io.grpc:grpc-context:1.48.0 (2 constraints: 211d5126)io.jaegertracing:jaeger-core:1.6.0 (2 constraints: 6912c420)io.jaegertracing:jaeger-thrift:1.6.0 (1 constraints: 09050236)-io.netty:netty-buffer:4.1.68.Final (6 constraints: 915bfcb7)-io.netty:netty-codec:4.1.68.Final (2 constraints: 581a4d48)-io.netty:netty-common:4.1.68.Final (8 constraints: 0b75841f)-io.netty:netty-handler:4.1.68.Final (2 constraints: 8d1d363b)-io.netty:netty-resolver:4.1.68.Final (2 constraints: 5a1a4732)-io.netty:netty-transport:4.1.68.Final (5 constraints: dd4d9295)-io.netty:netty-transport-native-epoll:4.1.68.Final (1 constraints: db0f158f)-io.netty:netty-transport-native-unix-common:4.1.68.Final (1 constraints: b212fc1e)+io.netty:netty-buffer:4.1.82.Final (7 constraints: 8d6e8724)+io.netty:netty-codec:4.1.82.Final (2 constraints: 501a8147)+io.netty:netty-common:4.1.82.Final (9 constraints: ff8727e1)+io.netty:netty-handler:4.1.82.Final (2 constraints: 891d643a)+io.netty:netty-resolver:4.1.82.Final (2 constraints: 521a7331)+io.netty:netty-transport:4.1.82.Final (6 constraints: dd608a22)+io.netty:netty-transport-classes-epoll:4.1.82.Final (1 constraints: ae12e21e)+io.netty:netty-transport-native-epoll:4.1.82.Final (1 constraints: db0f158f)+io.netty:netty-transport-native-unix-common:4.1.82.Final (3 constraints: 6332e497)io.opencensus:opencensus-api:0.31.1 (5 constraints: 974d3996)io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)io.opentracing:opentracing-api:0.33.0 (5 constraints: 4d3cfe52)@@ -339,7 +340,7 @@ com.squareup.okio:okio:2.8.0 (1 constraints: 540c39fd)io.github.microutils:kotlin-logging:2.1.21 (1 constraints: ec0e8871)io.github.microutils:kotlin-logging-jvm:2.1.21 (1 constraints: af0f358c)io.micrometer:micrometer-core:1.5.14 (1 constraints: fc161b19)-io.netty:netty-codec-http:4.1.68.Final (1 constraints: 5d077961)+io.netty:netty-codec-http:4.1.82.Final (1 constraints: 59075f61)io.opentracing:opentracing-mock:0.33.0 (1 constraints: 3805343b)jakarta.servlet:jakarta.servlet-api:4.0.4 (4 constraints: 586e1f6a)jakarta.websocket:jakarta.websocket-api:1.1.2 (1 constraints: 92155ab9)diff --git a/versions.props b/versions.propsindex 8fbf4266f70..e4ad9587346 100644--- a/versions.props+++ b/versions.props@@ -20,7 +20,7 @@ commons-collections:commons-collections=3.2.2commons-io:commons-io=2.11.0io.dropwizard.metrics:*=4.1.5io.jaegertracing:*=1.6.0-io.netty:*=4.1.68.Final+io.netty:*=4.1.82.Finalio.opentracing:*=0.33.0io.prometheus:*=0.2.0jakarta.ws.rs:jakarta.ws.rs-api=2.1.6