You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2023/01/26 09:12:30 UTC
[lucene-solr] branch branch_8_11 updated: SOLR-16626: Upgrade to Netty 4.1.87.Final (#2676)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_8_11
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8_11 by this push:
new fa59ad491c5 SOLR-16626: Upgrade to Netty 4.1.87.Final (#2676)
fa59ad491c5 is described below
commit fa59ad491c5b672f13081a82475bd1abdda4caef
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Thu Jan 26 10:12:18 2023 +0100
SOLR-16626: Upgrade to Netty 4.1.87.Final (#2676)
---
lucene/ivy-versions.properties | 2 +-
solr/CHANGES.txt | 2 +-
solr/licenses/netty-all-4.1.82.Final.jar.sha1 | 1 -
solr/licenses/netty-all-4.1.87.Final.jar.sha1 | 1 +
solr/licenses/netty-buffer-4.1.82.Final.jar.sha1 | 1 -
solr/licenses/netty-buffer-4.1.87.Final.jar.sha1 | 1 +
solr/licenses/netty-codec-4.1.82.Final.jar.sha1 | 1 -
solr/licenses/netty-codec-4.1.87.Final.jar.sha1 | 1 +
solr/licenses/netty-common-4.1.82.Final.jar.sha1 | 1 -
solr/licenses/netty-common-4.1.87.Final.jar.sha1 | 1 +
solr/licenses/netty-handler-4.1.82.Final.jar.sha1 | 1 -
solr/licenses/netty-handler-4.1.87.Final.jar.sha1 | 1 +
solr/licenses/netty-resolver-4.1.82.Final.jar.sha1 | 1 -
solr/licenses/netty-resolver-4.1.87.Final.jar.sha1 | 1 +
solr/licenses/netty-transport-4.1.82.Final.jar.sha1 | 1 -
solr/licenses/netty-transport-4.1.87.Final.jar.sha1 | 1 +
solr/licenses/netty-transport-native-epoll-4.1.82.Final.jar.sha1 | 1 -
solr/licenses/netty-transport-native-epoll-4.1.87.Final.jar.sha1 | 1 +
solr/licenses/netty-transport-native-unix-common-4.1.82.Final.jar.sha1 | 1 -
solr/licenses/netty-transport-native-unix-common-4.1.87.Final.jar.sha1 | 1 +
20 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 7cbdd601179..116261a301f 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -116,7 +116,7 @@ io.jaegertracing.version = 1.6.0
/io.micrometer/micrometer-core = 1.5.14
-io.netty.netty.version = 4.1.82.Final
+io.netty.netty.version = 4.1.87.Final
/io.netty/netty-all = ${io.netty.netty.version}
/io.netty/netty-buffer = ${io.netty.netty.version}
/io.netty/netty-codec = ${io.netty.netty.version}
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 5e738f42073..fa9c129aa79 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -34,7 +34,7 @@ Other Changes
* SOLR-16332: Upgrade Jetty to 9.4.48.v20220622 (Kevin Risden)
-* SOLR-16424: Upgrade Netty to 4.1.82.Final (Kevin Risden)
+* SOLR-16626, SOLR-16424: Upgrade to Netty 4.1.87.Final (Kevin Risden, janhoy)
* SOLR-16421: Upgrade Apache Calcite to 1.32.0 and Avatica to 1.22.0 (Kevin Risden)
diff --git a/solr/licenses/netty-all-4.1.82.Final.jar.sha1 b/solr/licenses/netty-all-4.1.82.Final.jar.sha1
deleted file mode 100644
index 8037693f932..00000000000
--- a/solr/licenses/netty-all-4.1.82.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-62a4896c164f4095cfcf7c7b58f35741e092b3eb
diff --git a/solr/licenses/netty-all-4.1.87.Final.jar.sha1 b/solr/licenses/netty-all-4.1.87.Final.jar.sha1
new file mode 100644
index 00000000000..583a50337ef
--- /dev/null
+++ b/solr/licenses/netty-all-4.1.87.Final.jar.sha1
@@ -0,0 +1 @@
+39de92ea74a05da937343695f780e59addb8b8ea
diff --git a/solr/licenses/netty-buffer-4.1.82.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.82.Final.jar.sha1
deleted file mode 100644
index 62af64ff6fd..00000000000
--- a/solr/licenses/netty-buffer-4.1.82.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a544270cf1ae8b8077082f5036436a9a9971ea71
diff --git a/solr/licenses/netty-buffer-4.1.87.Final.jar.sha1 b/solr/licenses/netty-buffer-4.1.87.Final.jar.sha1
new file mode 100644
index 00000000000..629efb541eb
--- /dev/null
+++ b/solr/licenses/netty-buffer-4.1.87.Final.jar.sha1
@@ -0,0 +1 @@
+8942174141fb0586e7fffefc8ae48e1458293696
diff --git a/solr/licenses/netty-codec-4.1.82.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.82.Final.jar.sha1
deleted file mode 100644
index e0922f08a34..00000000000
--- a/solr/licenses/netty-codec-4.1.82.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b77200379acb345a9ffdece1c605e591ac3e4e0a
diff --git a/solr/licenses/netty-codec-4.1.87.Final.jar.sha1 b/solr/licenses/netty-codec-4.1.87.Final.jar.sha1
new file mode 100644
index 00000000000..fdbc004af7c
--- /dev/null
+++ b/solr/licenses/netty-codec-4.1.87.Final.jar.sha1
@@ -0,0 +1 @@
+d7ab7363f736114e6324ccf802d094529b30b8d8
diff --git a/solr/licenses/netty-common-4.1.82.Final.jar.sha1 b/solr/licenses/netty-common-4.1.82.Final.jar.sha1
deleted file mode 100644
index eb6b46d832d..00000000000
--- a/solr/licenses/netty-common-4.1.82.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-022d148e85c3f5ebdacc0ce1f5aabb1d420f73f3
diff --git a/solr/licenses/netty-common-4.1.87.Final.jar.sha1 b/solr/licenses/netty-common-4.1.87.Final.jar.sha1
new file mode 100644
index 00000000000..0396efda392
--- /dev/null
+++ b/solr/licenses/netty-common-4.1.87.Final.jar.sha1
@@ -0,0 +1 @@
+3e7e80dd6e604144781fcb859b79cfe8d3730079
diff --git a/solr/licenses/netty-handler-4.1.82.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.82.Final.jar.sha1
deleted file mode 100644
index 30491668014..00000000000
--- a/solr/licenses/netty-handler-4.1.82.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-644041d1fa96a5d3130a29e8978630d716d76e38
diff --git a/solr/licenses/netty-handler-4.1.87.Final.jar.sha1 b/solr/licenses/netty-handler-4.1.87.Final.jar.sha1
new file mode 100644
index 00000000000..7f73a4c47e4
--- /dev/null
+++ b/solr/licenses/netty-handler-4.1.87.Final.jar.sha1
@@ -0,0 +1 @@
+2bd97491c22ebea4670c00f1bd5dbf65a8a1cfe7
diff --git a/solr/licenses/netty-resolver-4.1.82.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.82.Final.jar.sha1
deleted file mode 100644
index f69a761e112..00000000000
--- a/solr/licenses/netty-resolver-4.1.82.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-38f665ae8dcd29032eea31245ba7806bed2e0fa8
diff --git a/solr/licenses/netty-resolver-4.1.87.Final.jar.sha1 b/solr/licenses/netty-resolver-4.1.87.Final.jar.sha1
new file mode 100644
index 00000000000..b2771e9cf9b
--- /dev/null
+++ b/solr/licenses/netty-resolver-4.1.87.Final.jar.sha1
@@ -0,0 +1 @@
+eaa964e16a67914c8d9b814d29a4b969635d72a0
diff --git a/solr/licenses/netty-transport-4.1.82.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.82.Final.jar.sha1
deleted file mode 100644
index e29568699ea..00000000000
--- a/solr/licenses/netty-transport-4.1.82.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e431a218d91acb6476ccad5f5aafde50aa3945ca
diff --git a/solr/licenses/netty-transport-4.1.87.Final.jar.sha1 b/solr/licenses/netty-transport-4.1.87.Final.jar.sha1
new file mode 100644
index 00000000000..74f63bfcad8
--- /dev/null
+++ b/solr/licenses/netty-transport-4.1.87.Final.jar.sha1
@@ -0,0 +1 @@
+30c78c8ced3417f35e2a55f7533dc2bb43fef2aa
diff --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.sha1
deleted file mode 100644
index 3d14c6a8a09..00000000000
--- a/solr/licenses/netty-transport-native-epoll-4.1.82.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9a9e7b32e3fc07d0760e15c28fe5f751d3d36377
diff --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.sha1
new file mode 100644
index 00000000000..ec39d26241c
--- /dev/null
+++ b/solr/licenses/netty-transport-native-epoll-4.1.87.Final.jar.sha1
@@ -0,0 +1 @@
+230b9502593b2cde954b89e28b410d937dd9e048
diff --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.sha1
deleted file mode 100644
index 602c6f22e10..00000000000
--- a/solr/licenses/netty-transport-native-unix-common-4.1.82.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3e895b35ca1b8a0eca56cacff4c2dde5d2c6abce
diff --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.sha1
new file mode 100644
index 00000000000..2868e8600f5
--- /dev/null
+++ b/solr/licenses/netty-transport-native-unix-common-4.1.87.Final.jar.sha1
@@ -0,0 +1 @@
+4bf8308dc7d6ba2570681eaeddb16f8d1196b438