Apache Solr open-source search software
SOLR-16626: Upgrade to Netty 4.1.87.Final (#1300)
Kevin Risdenb11b054807da
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 76cbe2f8c78..89f02246edb 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -224,6 +224,8 @@ Other Changes* SOLR-16544: Improve documentation on how to contribute to Solr (Justin Sweeney)+* SOLR-16626: Upgrade to Netty 4.1.87.Final (Kevin Risden)+================== 9.1.1 ==================Bug Fixesdiff --git a/solr/licenses/netty-buffer-4.1.82.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.82.Final.jar.sha1deleted file mode 100644index 62af64ff6fd..00000000000--- a/solr/licenses/netty-buffer-4.1.82.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a544270cf1ae8b8077082f5036436a9a9971ea71diff --git a/solr/licenses/netty-buffer-4.1.87.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.87.Final.jar.sha1new file mode 100644index 00000000000..629efb541eb--- /dev/null+++ b/solr/licenses/netty-buffer-4.1.87.Final.jar.sha1@@ -0,0 +1 @@+8942174141fb0586e7fffefc8ae48e1458293696diff --git a/solr/licenses/netty-codec-4.1.82.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.82.Final.jar.sha1deleted file mode 100644index e0922f08a34..00000000000--- a/solr/licenses/netty-codec-4.1.82.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-b77200379acb345a9ffdece1c605e591ac3e4e0adiff --git a/solr/licenses/netty-codec-4.1.87.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.87.Final.jar.sha1new file mode 100644index 00000000000..fdbc004af7c--- /dev/null+++ b/solr/licenses/netty-codec-4.1.87.Final.jar.sha1@@ -0,0 +1 @@+d7ab7363f736114e6324ccf802d094529b30b8d8diff --git a/solr/licenses/netty-codec-http-4.1.82.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.82.Final.jar.sha1deleted file mode 100644index 06a93f2faa7..00000000000--- a/solr/licenses/netty-codec-http-4.1.82.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f74b563d5206b71c430eeae4cdf703b0ed9cf07cdiff --git a/solr/licenses/netty-codec-http-4.1.87.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.87.Final.jar.sha1new file mode 100644index 00000000000..edffe0db034--- /dev/null+++ b/solr/licenses/netty-codec-http-4.1.87.Final.jar.sha1@@ -0,0 +1 @@+3230e95d6832ee4306fe1ca774c7bcecf1da4b28diff --git a/solr/licenses/netty-codec-http2-4.1.82.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.82.Final.jar.sha1deleted file mode 100644index ad30b032333..00000000000--- a/solr/licenses/netty-codec-http2-4.1.82.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-238798287388d7b2f5ab309b941b513956649c92diff --git a/solr/licenses/netty-codec-http2-4.1.87.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.87.Final.jar.sha1new file mode 100644index 00000000000..90a9c368b41--- /dev/null+++ b/solr/licenses/netty-codec-http2-4.1.87.Final.jar.sha1@@ -0,0 +1 @@+72b756ff290d782c9ebb36db7d42ee272270c0b4diff --git a/solr/licenses/netty-codec-socks-4.1.82.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.82.Final.jar.sha1deleted file mode 100644index 0f554bf01f3..00000000000--- a/solr/licenses/netty-codec-socks-4.1.82.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a25236fd9c8ecda6eb811d914bf4a875f523ce0adiff --git a/solr/licenses/netty-codec-socks-4.1.87.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.87.Final.jar.sha1new file mode 100644index 00000000000..b84def110eb--- /dev/null+++ b/solr/licenses/netty-codec-socks-4.1.87.Final.jar.sha1@@ -0,0 +1 @@+109027470b72d56914d76154e947f9bd5844bb9bdiff --git a/solr/licenses/netty-common-4.1.82.Final.jar.sha1 b/solr/licenses/netty-common-4.1.82.Final.jar.sha1deleted file mode 100644index eb6b46d832d..00000000000--- a/solr/licenses/netty-common-4.1.82.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-022d148e85c3f5ebdacc0ce1f5aabb1d420f73f3diff --git a/solr/licenses/netty-common-4.1.87.Final.jar.sha1 b/solr/licenses/netty-common-4.1.87.Final.jar.sha1new file mode 100644index 00000000000..0396efda392--- /dev/null+++ b/solr/licenses/netty-common-4.1.87.Final.jar.sha1@@ -0,0 +1 @@+3e7e80dd6e604144781fcb859b79cfe8d3730079diff --git a/solr/licenses/netty-handler-4.1.82.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.82.Final.jar.sha1deleted file mode 100644index 30491668014..00000000000--- a/solr/licenses/netty-handler-4.1.82.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-644041d1fa96a5d3130a29e8978630d716d76e38diff --git a/solr/licenses/netty-handler-4.1.87.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.87.Final.jar.sha1new file mode 100644index 00000000000..7f73a4c47e4--- /dev/null+++ b/solr/licenses/netty-handler-4.1.87.Final.jar.sha1@@ -0,0 +1 @@+2bd97491c22ebea4670c00f1bd5dbf65a8a1cfe7diff --git a/solr/licenses/netty-handler-proxy-4.1.82.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.82.Final.jar.sha1deleted file mode 100644index 4a4a43e204e..00000000000--- a/solr/licenses/netty-handler-proxy-4.1.82.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-14e417ea8bf374309040e39a9726d446724438f9diff --git a/solr/licenses/netty-handler-proxy-4.1.87.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.87.Final.jar.sha1new file mode 100644index 00000000000..c47d534fe19--- /dev/null+++ b/solr/licenses/netty-handler-proxy-4.1.87.Final.jar.sha1@@ -0,0 +1 @@+8079f16d6209e10f5d3a09522e7aa9ffb217e17ediff --git a/solr/licenses/netty-resolver-4.1.82.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.82.Final.jar.sha1deleted file mode 100644index f69a761e112..00000000000--- a/solr/licenses/netty-resolver-4.1.82.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-38f665ae8dcd29032eea31245ba7806bed2e0fa8diff --git a/solr/licenses/netty-resolver-4.1.87.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.87.Final.jar.sha1new file mode 100644index 00000000000..b2771e9cf9b--- /dev/null+++ b/solr/licenses/netty-resolver-4.1.87.Final.jar.sha1@@ -0,0 +1 @@+eaa964e16a67914c8d9b814d29a4b969635d72a0diff --git a/solr/licenses/netty-transport-4.1.82.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.82.Final.jar.sha1deleted file mode 100644index e29568699ea..00000000000--- a/solr/licenses/netty-transport-4.1.82.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-e431a218d91acb6476ccad5f5aafde50aa3945cadiff --git a/solr/licenses/netty-transport-4.1.87.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.87.Final.jar.sha1new file mode 100644index 00000000000..74f63bfcad8--- /dev/null+++ b/solr/licenses/netty-transport-4.1.87.Final.jar.sha1@@ -0,0 +1 @@+30c78c8ced3417f35e2a55f7533dc2bb43fef2aadiff --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.sha1deleted file mode 100644index df877deeddc..00000000000--- a/solr/licenses/netty-transport-classes-epoll-4.1.82.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-e7c7dd18deac93105797f30057c912651ea76521diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.87.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.87.Final.jar.sha1new file mode 100644index 00000000000..59089c457b3--- /dev/null+++ b/solr/licenses/netty-transport-classes-epoll-4.1.87.Final.jar.sha1@@ -0,0 +1 @@+86e61c5743940d80e10609746784ffa0e4642065diff --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.sha1deleted file mode 100644index 3d14c6a8a09..00000000000--- a/solr/licenses/netty-transport-native-epoll-4.1.82.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-9a9e7b32e3fc07d0760e15c28fe5f751d3d36377diff --git a/solr/licenses/netty-transport-native-epoll-4.1.87.Final.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.87.Final.jar.sha1new file mode 100644index 00000000000..ec39d26241c--- /dev/null+++ b/solr/licenses/netty-transport-native-epoll-4.1.87.Final.jar.sha1@@ -0,0 +1 @@+230b9502593b2cde954b89e28b410d937dd9e048diff --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.sha1deleted file mode 100644index 602c6f22e10..00000000000--- a/solr/licenses/netty-transport-native-unix-common-4.1.82.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-3e895b35ca1b8a0eca56cacff4c2dde5d2c6abcediff --git a/solr/licenses/netty-transport-native-unix-common-4.1.87.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.87.Final.jar.sha1new file mode 100644index 00000000000..2868e8600f5--- /dev/null+++ b/solr/licenses/netty-transport-native-unix-common-4.1.87.Final.jar.sha1@@ -0,0 +1 @@+4bf8308dc7d6ba2570681eaeddb16f8d1196b438diff --git a/versions.lock b/versions.lockindex 07c5c4b7820..3a65cb124e8 100644--- a/versions.lock+++ b/versions.lock@@ -92,21 +92,21 @@ io.grpc:grpc-netty:1.50.2 (1 constraints: 3a053b3b)io.grpc:grpc-protobuf:1.50.2 (1 constraints: 3a053b3b)io.grpc:grpc-protobuf-lite:1.50.2 (1 constraints: 060adeb3)io.grpc:grpc-stub:1.50.2 (1 constraints: 3a053b3b)-io.netty:netty-buffer:4.1.82.Final (10 constraints: 8e99b4d5)-io.netty:netty-codec:4.1.82.Final (5 constraints: 5145087b)-io.netty:netty-codec-http:4.1.82.Final (3 constraints: 492440eb)-io.netty:netty-codec-http2:4.1.82.Final (1 constraints: ee0a9acb)-io.netty:netty-codec-socks:4.1.82.Final (1 constraints: 110f956c)-io.netty:netty-common:4.1.82.Final (12 constraints: 00b3cd3e)-io.netty:netty-handler:4.1.82.Final (3 constraints: 652b523a)-io.netty:netty-handler-proxy:4.1.82.Final (1 constraints: ee0a9acb)-io.netty:netty-resolver:4.1.82.Final (2 constraints: 521a7331)+io.netty:netty-buffer:4.1.87.Final (10 constraints: c0990502)+io.netty:netty-codec:4.1.87.Final (5 constraints: 6a45d783)+io.netty:netty-codec-http:4.1.87.Final (3 constraints: 582433ee)+io.netty:netty-codec-http2:4.1.87.Final (1 constraints: ee0a9acb)+io.netty:netty-codec-socks:4.1.87.Final (1 constraints: 160fb86c)+io.netty:netty-common:4.1.87.Final (12 constraints: 3cb3757d)+io.netty:netty-handler:4.1.87.Final (3 constraints: 6f2b363d)+io.netty:netty-handler-proxy:4.1.87.Final (1 constraints: ee0a9acb)+io.netty:netty-resolver:4.1.87.Final (2 constraints: 5c1a8132)io.netty:netty-tcnative:2.0.48.Final (1 constraints: d60fe48e)io.netty:netty-tcnative-classes:2.0.48.Final (1 constraints: 210d451b)-io.netty:netty-transport:4.1.82.Final (9 constraints: de8b351b)-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: d70ffb8e)-io.netty:netty-transport-native-unix-common:4.1.82.Final (4 constraints: 503d2494)+io.netty:netty-transport:4.1.87.Final (9 constraints: 0b8c663f)+io.netty:netty-transport-classes-epoll:4.1.87.Final (1 constraints: b312051f)+io.netty:netty-transport-native-epoll:4.1.87.Final (1 constraints: d70ffb8e)+io.netty:netty-transport-native-unix-common:4.1.87.Final (4 constraints: 5f3dad97)io.opencensus:opencensus-api:0.31.1 (5 constraints: 974d3996)io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)io.opentelemetry:opentelemetry-api:1.21.0 (9 constraints: fda10c96)diff --git a/versions.props b/versions.propsindex f793207e99d..c096d884da1 100644--- a/versions.props+++ b/versions.props@@ -21,7 +21,7 @@ commons-collections:commons-collections=3.2.2commons-io:commons-io=2.11.0io.dropwizard.metrics:*=4.2.12io.grpc:grpc-*=1.50.2-io.netty:*=4.1.82.Final+io.netty:*=4.1.87.Finalio.opentelemetry:opentelemetry-bom-alpha=1.21.0-alphaio.opentracing:*=0.33.0io.prometheus:*=0.2.0