Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Update io.netty:* to v4.1.96.Final (#1813)

Solr Botb0d3085b8399
diff --git a/solr/licenses/netty-buffer-4.1.94.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.94.Final.jar.sha1
deleted file mode 100644
index 5ab0cfb858d..00000000000
--- a/solr/licenses/netty-buffer-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-eec248b26f16e888688e5bb37b7eeda76b78d2f7
diff --git a/solr/licenses/netty-buffer-4.1.96.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..c2e6b557029
--- /dev/null
+++ b/solr/licenses/netty-buffer-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+4b80fffbe77485b457bf844289bf1801f61b9e91
diff --git a/solr/licenses/netty-codec-4.1.94.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.94.Final.jar.sha1
deleted file mode 100644
index 863ee90d58c..00000000000
--- a/solr/licenses/netty-codec-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c70ef20ca338558147887df60f46341bc47f6900
diff --git a/solr/licenses/netty-codec-4.1.96.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..2b1de703195
--- /dev/null
+++ b/solr/licenses/netty-codec-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+9cfe430f8b14e7ba86969d8e1126aa0aae4d18f0
diff --git a/solr/licenses/netty-codec-http-4.1.94.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.94.Final.jar.sha1
deleted file mode 100644
index cdc34be07ff..00000000000
--- a/solr/licenses/netty-codec-http-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9e5404764092c1f6305ad5719078f46ab228d587
diff --git a/solr/licenses/netty-codec-http-4.1.96.Final.jar.sha1 b/solr/licenses/netty-codec-http-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..dbcc61d860e
--- /dev/null
+++ b/solr/licenses/netty-codec-http-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+a4d0d95df5026965c454902ef3d6d84b81f89626
diff --git a/solr/licenses/netty-codec-http2-4.1.94.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.94.Final.jar.sha1
deleted file mode 100644
index 957bf6c2893..00000000000
--- a/solr/licenses/netty-codec-http2-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f651595784d6cca4cbca6a8ad74c48fceed6cea8
diff --git a/solr/licenses/netty-codec-http2-4.1.96.Final.jar.sha1 b/solr/licenses/netty-codec-http2-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..226c1b7d206
--- /dev/null
+++ b/solr/licenses/netty-codec-http2-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+cc8baf4ff67c1bcc0cde60bc5c2bb9447d92d9e6
diff --git a/solr/licenses/netty-codec-socks-4.1.94.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.94.Final.jar.sha1
deleted file mode 100644
index 24cf1720029..00000000000
--- a/solr/licenses/netty-codec-socks-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b9192c7cda295d75f236a13a0b1f5a008f05d516
diff --git a/solr/licenses/netty-codec-socks-4.1.96.Final.jar.sha1 b/solr/licenses/netty-codec-socks-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..7928c87eeb5
--- /dev/null
+++ b/solr/licenses/netty-codec-socks-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+f53c52dbddaa4a02a51430405792d3f30a89b147
diff --git a/solr/licenses/netty-common-4.1.94.Final.jar.sha1 b/solr/licenses/netty-common-4.1.94.Final.jar.sha1
deleted file mode 100644
index 532256b817b..00000000000
--- a/solr/licenses/netty-common-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ad4ecf779ebc794cd351f57792f56ea01387b868
diff --git a/solr/licenses/netty-common-4.1.96.Final.jar.sha1 b/solr/licenses/netty-common-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..cb5590c8416
--- /dev/null
+++ b/solr/licenses/netty-common-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+d10c167623cbc471753f950846df241d1021655c
diff --git a/solr/licenses/netty-handler-4.1.94.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.94.Final.jar.sha1
deleted file mode 100644
index e05fe7897d1..00000000000
--- a/solr/licenses/netty-handler-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cd9121ce24d6d3f2898946d04b0ef3ec548b00b4
diff --git a/solr/licenses/netty-handler-4.1.96.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..a1f0cd55210
--- /dev/null
+++ b/solr/licenses/netty-handler-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+7840d7523d709e02961b647546f9d9dde1699306
diff --git a/solr/licenses/netty-handler-proxy-4.1.94.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.94.Final.jar.sha1
deleted file mode 100644
index bbaaa1fab18..00000000000
--- a/solr/licenses/netty-handler-proxy-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-26ba9d30b8f7b095155b9ac63378d6d9386d85c3
diff --git a/solr/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1 b/solr/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..aa3d220477a
--- /dev/null
+++ b/solr/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+dcabd63f4aaec2b4cad7588bfdd4cd2c82287e38
diff --git a/solr/licenses/netty-resolver-4.1.94.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.94.Final.jar.sha1
deleted file mode 100644
index edc89616fce..00000000000
--- a/solr/licenses/netty-resolver-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e96f649e8e9dcb29a1f8e95328b99c9eb6cf76c2
diff --git a/solr/licenses/netty-resolver-4.1.96.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..9f0e6ac60de
--- /dev/null
+++ b/solr/licenses/netty-resolver-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+0e51db5568a881e0f9b013b35617c597dc32f130
diff --git a/solr/licenses/netty-transport-4.1.94.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.94.Final.jar.sha1
deleted file mode 100644
index 0934b80923d..00000000000
--- a/solr/licenses/netty-transport-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ec783a737f96991a87b1d5794e2f9eb2024d708a
diff --git a/solr/licenses/netty-transport-4.1.96.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..7d0cc889525
--- /dev/null
+++ b/solr/licenses/netty-transport-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+dbd15ca244be28e1a98ed29b9d755edbfa737e02
diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.94.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.94.Final.jar.sha1
deleted file mode 100644
index 120f42fad3b..00000000000
--- a/solr/licenses/netty-transport-classes-epoll-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-240e36cd5c2ffaf655913f8857f2d58b26394679
diff --git a/solr/licenses/netty-transport-classes-epoll-4.1.96.Final.jar.sha1 b/solr/licenses/netty-transport-classes-epoll-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..a05cc215dcc
--- /dev/null
+++ b/solr/licenses/netty-transport-classes-epoll-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+b0369501645f6e71f89ff7f77b5c5f52510a2e31
diff --git a/solr/licenses/netty-transport-native-epoll-4.1.94.Final.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.94.Final.jar.sha1
deleted file mode 100644
index b9e9bfe13df..00000000000
--- a/solr/licenses/netty-transport-native-epoll-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1f77c54f1877d9ed51f207eb64a5634bdcc7efa1
diff --git a/solr/licenses/netty-transport-native-epoll-4.1.96.Final.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..21a85fa4799
--- /dev/null
+++ b/solr/licenses/netty-transport-native-epoll-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+9faf365396c933f1b39b60d129391c6c6c43fb86
diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.94.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.94.Final.jar.sha1
deleted file mode 100644
index 95d73ae8259..00000000000
--- a/solr/licenses/netty-transport-native-unix-common-4.1.94.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3fa5f9d04b6b782d869d6e0657d896eeadca5866
diff --git a/solr/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1 b/solr/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1
new file mode 100644
index 00000000000..72071232dfb
--- /dev/null
+++ b/solr/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1
@@ -0,0 +1 @@
+daf8578cade63a01525ee9d70371fa78e6e91094
diff --git a/versions.lock b/versions.lock
index ee128a6f95d..97a8faa8d31 100644
--- a/versions.lock
+++ b/versions.lock
@@ -108,19 +108,19 @@ io.grpc:grpc-rls:1.56.0 (1 constraints: 20100fa6)
io.grpc:grpc-services:1.56.0 (1 constraints: 20100fa6)
io.grpc:grpc-stub:1.56.0 (2 constraints: 5d159cd7)
io.grpc:grpc-xds:1.56.0 (1 constraints: 20100fa6)
-io.netty:netty-buffer:4.1.94.Final (10 constraints: ac994cf0)
-io.netty:netty-codec:4.1.94.Final (5 constraints: 60455680)
-io.netty:netty-codec-http:4.1.94.Final (3 constraints: 522408ed)
-io.netty:netty-codec-http2:4.1.94.Final (1 constraints: ed0a94cb)
-io.netty:netty-codec-socks:4.1.94.Final (1 constraints: 140fab6c)
-io.netty:netty-common:4.1.94.Final (12 constraints: 24b37164)
-io.netty:netty-handler:4.1.94.Final (3 constraints: 6f2b2d3c)
-io.netty:netty-handler-proxy:4.1.94.Final (1 constraints: ed0a94cb)
-io.netty:netty-resolver:4.1.94.Final (2 constraints: 581a1732)
-io.netty:netty-transport:4.1.94.Final (9 constraints: f98bf530)
-io.netty:netty-transport-classes-epoll:4.1.94.Final (1 constraints: b112f81e)
-io.netty:netty-transport-native-epoll:4.1.94.Final (1 constraints: db0f188f)
-io.netty:netty-transport-native-unix-common:4.1.94.Final (4 constraints: 583daf95)
+io.netty:netty-buffer:4.1.96.Final (10 constraints: c0990f02)
+io.netty:netty-codec:4.1.96.Final (5 constraints: 6a45dc83)
+io.netty:netty-codec-http:4.1.96.Final (3 constraints: 582436ee)
+io.netty:netty-codec-http2:4.1.96.Final (1 constraints: ed0a94cb)
+io.netty:netty-codec-socks:4.1.96.Final (1 constraints: 160fb96c)
+io.netty:netty-common:4.1.96.Final (12 constraints: 3cb3817d)
+io.netty:netty-handler:4.1.96.Final (3 constraints: 732b553d)
+io.netty:netty-handler-proxy:4.1.96.Final (1 constraints: ed0a94cb)
+io.netty:netty-resolver:4.1.96.Final (2 constraints: 5c1a8332)
+io.netty:netty-transport:4.1.96.Final (9 constraints: 0b8c6f3f)
+io.netty:netty-transport-classes-epoll:4.1.96.Final (1 constraints: b312061f)
+io.netty:netty-transport-native-epoll:4.1.96.Final (1 constraints: db0f188f)
+io.netty:netty-transport-native-unix-common:4.1.96.Final (4 constraints: 5e3d1997)
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 afad823b7aa..9f7b6e400a5 100644
--- a/versions.props
+++ b/versions.props
@@ -22,7 +22,7 @@ commons-collections:commons-collections=3.2.2
commons-io:commons-io=2.11.0
io.dropwizard.metrics:*=4.2.19
io.grpc:grpc-*=1.56.0
-io.netty:*=4.1.94.Final
+io.netty:*=4.1.96.Final
io.opentelemetry:opentelemetry-bom-alpha=1.21.0-alpha
io.opentracing:*=0.33.0
io.prometheus:*=0.16.0