Skip to content

Commit

Permalink
Upgrade Netty to 4.1.87.Final (#3766)
Browse files Browse the repository at this point in the history 
- Brings Netty Tcnative 2.0.56.Final
- Also upgraded Netty's io_uring support to a compatible version

Release notes:
https://netty.io/news/2023/01/12/4-1-87-Final.html
https://netty.io/news/2023/02/02/multiple_releases_incubator.html

Some relevant Netty bug fixes:

Improves compatibility with newer Linux distros:
netty/netty#13112

TLS 1.3 handshake issue fix:
netty/netty#13073 fixed by netty/netty#13095
  • Loading branch information
@lhotari
lhotari authored Feb 10, 2023
1 parent b85ac48 commit 7303cf1
Show file tree
Hide file tree
Showing 38 changed files with 320 additions and 320 deletions.
2 changes: 1 addition & 1 deletion bookkeeper-dist/src/assemble/bin-all.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<include>javax.servlet-api-4.0.0/CDDL+GPL-1.1</include>
<include>bouncycastle-1.0.2.3/LICENSE.html</include>
<include>jsr-305/LICENSE</include>
<include>netty-4.1.86.Final/*</include>
<include>netty-4.1.87.Final/*</include>
<include>paranamer-2.8/LICENSE.txt</include>
<include>protobuf-3.14.0/LICENSE</include>
<include>protobuf-3.12.0/LICENSE</include>
Expand Down
2 changes: 1 addition & 1 deletion bookkeeper-dist/src/assemble/bin-server.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<include>checker-qual-3.5.0/LICENSE</include>
<include>google-auth-library-credentials-0.20.0/LICENSE</include>
<include>javax.servlet-api-4.0.0/CDDL+GPL-1.1</include>
<include>netty-4.1.86.Final/*</include>
<include>netty-4.1.87.Final/*</include>
<include>bouncycastle-1.0.2.3/LICENSE.html</include>
<include>protobuf-3.14.0/LICENSE</include>
<include>protobuf-3.12.0/LICENSE</include>
Expand Down
2 changes: 1 addition & 1 deletion bookkeeper-dist/src/assemble/bkctl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<includes>
<include>checker-qual-3.5.0/LICENSE</include>
<include>google-auth-library-credentials-0.20.0/LICENSE</include>
<include>netty-4.1.86.Final/*</include>
<include>netty-4.1.87.Final/*</include>
<include>bouncycastle-1.0.2.3/LICENSE.html</include>
<include>protobuf-3.14.0/LICENSE</include>
<include>protobuf-3.12.0/LICENSE</include>
Expand Down
164 changes: 82 additions & 82 deletions bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt
View file

Large diffs are not rendered by default.

160 changes: 80 additions & 80 deletions bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt
View file

Large diffs are not rendered by default.

164 changes: 82 additions & 82 deletions bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt
View file

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions bookkeeper-dist/src/main/resources/NOTICE-all.bin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,30 @@ LongAdder), which was released with the following comments:
http://creativecommons.org/publicdomain/zero/1.0/

------------------------------------------------------------------------------------
- lib/io.netty-netty-buffer-4.1.86.Final.jar
- lib/io.netty-netty-codec-4.1.86.Final.jar
- lib/io.netty-netty-codec-dns-4.1.86.Final.jar
- lib/io.netty-netty-codec-http-4.1.86.Final.jar
- lib/io.netty-netty-codec-http2-4.1.86.Final.jar
- lib/io.netty-netty-codec-socks-4.1.86.Final.jar
- lib/io.netty-netty-common-4.1.86.Final.jar
- lib/io.netty-netty-handler-4.1.86.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.86.Final.jar
- lib/io.netty-netty-resolver-4.1.86.Final.jar
- lib/io.netty-netty-resolver-dns-4.1.86.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.54.Final.jar
- lib/io.netty-netty-transport-4.1.86.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.86.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.16.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.16.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.86.Final.jar
- lib/io.netty-netty-buffer-4.1.87.Final.jar
- lib/io.netty-netty-codec-4.1.87.Final.jar
- lib/io.netty-netty-codec-dns-4.1.87.Final.jar
- lib/io.netty-netty-codec-http-4.1.87.Final.jar
- lib/io.netty-netty-codec-http2-4.1.87.Final.jar
- lib/io.netty-netty-codec-socks-4.1.87.Final.jar
- lib/io.netty-netty-common-4.1.87.Final.jar
- lib/io.netty-netty-handler-4.1.87.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.87.Final.jar
- lib/io.netty-netty-resolver-4.1.87.Final.jar
- lib/io.netty-netty-resolver-dns-4.1.87.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.56.Final.jar
- lib/io.netty-netty-transport-4.1.87.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.87.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.87.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.17.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.17.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.87.Final.jar


The Netty Project
Expand Down
44 changes: 22 additions & 22 deletions bookkeeper-dist/src/main/resources/NOTICE-bkctl.bin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,28 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

------------------------------------------------------------------------------------
- lib/io.netty-netty-buffer-4.1.86.Final.jar
- lib/io.netty-netty-codec-4.1.86.Final.jar
- lib/io.netty-netty-codec-http-4.1.86.Final.jar
- lib/io.netty-netty-codec-http2-4.1.86.Final.jar
- lib/io.netty-netty-codec-socks-4.1.86.Final.jar
- lib/io.netty-netty-common-4.1.86.Final.jar
- lib/io.netty-netty-handler-4.1.86.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.86.Final.jar
- lib/io.netty-netty-resolver-4.1.86.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.54.Final.jar
- lib/io.netty-netty-transport-4.1.86.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.86.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.16.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.16.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.86.Final.jar
- lib/io.netty-netty-buffer-4.1.87.Final.jar
- lib/io.netty-netty-codec-4.1.87.Final.jar
- lib/io.netty-netty-codec-http-4.1.87.Final.jar
- lib/io.netty-netty-codec-http2-4.1.87.Final.jar
- lib/io.netty-netty-codec-socks-4.1.87.Final.jar
- lib/io.netty-netty-common-4.1.87.Final.jar
- lib/io.netty-netty-handler-4.1.87.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.87.Final.jar
- lib/io.netty-netty-resolver-4.1.87.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.56.Final.jar
- lib/io.netty-netty-transport-4.1.87.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.87.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.87.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.17.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.17.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.87.Final.jar


The Netty Project
Expand Down
48 changes: 24 additions & 24 deletions bookkeeper-dist/src/main/resources/NOTICE-server.bin.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,30 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

------------------------------------------------------------------------------------
- lib/io.netty-netty-buffer-4.1.86.Final.jar
- lib/io.netty-netty-codec-4.1.86.Final.jar
- lib/io.netty-netty-codec-dns-4.1.86.Final.jar
- lib/io.netty-netty-codec-http-4.1.86.Final.jar
- lib/io.netty-netty-codec-http2-4.1.86.Final.jar
- lib/io.netty-netty-codec-socks-4.1.86.Final.jar
- lib/io.netty-netty-common-4.1.86.Final.jar
- lib/io.netty-netty-handler-4.1.86.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.86.Final.jar
- lib/io.netty-netty-resolver-4.1.86.Final.jar
- lib/io.netty-netty-resolver-dns-4.1.86.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.54.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.54.Final.jar
- lib/io.netty-netty-transport-4.1.86.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.86.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.16.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.16.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.86.Final.jar
- lib/io.netty-netty-buffer-4.1.87.Final.jar
- lib/io.netty-netty-codec-4.1.87.Final.jar
- lib/io.netty-netty-codec-dns-4.1.87.Final.jar
- lib/io.netty-netty-codec-http-4.1.87.Final.jar
- lib/io.netty-netty-codec-http2-4.1.87.Final.jar
- lib/io.netty-netty-codec-socks-4.1.87.Final.jar
- lib/io.netty-netty-common-4.1.87.Final.jar
- lib/io.netty-netty-handler-4.1.87.Final.jar
- lib/io.netty-netty-handler-proxy-4.1.87.Final.jar
- lib/io.netty-netty-resolver-4.1.87.Final.jar
- lib/io.netty-netty-resolver-dns-4.1.87.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final.jar
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-linux-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-aarch_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-osx-x86_64.jar [11]
- lib/io.netty-netty-tcnative-boringssl-static-2.0.56.Final-windows-x86_64.jar [11]
- lib/io.netty-netty-tcnative-classes-2.0.56.Final.jar
- lib/io.netty-netty-transport-4.1.87.Final.jar
- lib/io.netty-netty-transport-classes-epoll-4.1.87.Final.jar
- lib/io.netty-netty-transport-native-epoll-4.1.87.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.17.Final-linux-x86_64.jar
- lib/io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.17.Final-linux-aarch_64.jar
- lib/io.netty-netty-transport-native-unix-common-4.1.87.Final.jar


The Netty Project
Expand Down
0 .../netty-4.1.86.Final/LICENSE.aalto-xml.txt → .../netty-4.1.87.Final/LICENSE.aalto-xml.txt
View file
File renamed without changes.
0 ...eps/netty-4.1.86.Final/LICENSE.base64.txt → ...eps/netty-4.1.87.Final/LICENSE.base64.txt
View file
File renamed without changes.
0 ...tty-4.1.86.Final/LICENSE.bouncycastle.txt → ...tty-4.1.87.Final/LICENSE.bouncycastle.txt
View file
File renamed without changes.
0 ...ps/netty-4.1.86.Final/LICENSE.caliper.txt → ...ps/netty-4.1.87.Final/LICENSE.caliper.txt
View file
File renamed without changes.
0 ...tty-4.1.86.Final/LICENSE.commons-lang.txt → ...tty-4.1.87.Final/LICENSE.commons-lang.txt
View file
File renamed without changes.
0 ...-4.1.86.Final/LICENSE.commons-logging.txt → ...-4.1.87.Final/LICENSE.commons-logging.txt
View file
File renamed without changes.
0 ...tty-4.1.86.Final/LICENSE.compress-lzf.txt → ...tty-4.1.87.Final/LICENSE.compress-lzf.txt
View file
File renamed without changes.
0 ...ps/netty-4.1.86.Final/LICENSE.dnsinfo.txt → ...ps/netty-4.1.87.Final/LICENSE.dnsinfo.txt
View file
File renamed without changes.
0 ...ps/netty-4.1.86.Final/LICENSE.harmony.txt → ...ps/netty-4.1.87.Final/LICENSE.harmony.txt
View file
File renamed without changes.
0 ...deps/netty-4.1.86.Final/LICENSE.hpack.txt → ...deps/netty-4.1.87.Final/LICENSE.hpack.txt
View file
File renamed without changes.
0 ...etty-4.1.86.Final/LICENSE.hyper-hpack.txt → ...etty-4.1.87.Final/LICENSE.hyper-hpack.txt
View file
File renamed without changes.
0 ....1.86.Final/LICENSE.jboss-marshalling.txt → ....1.87.Final/LICENSE.jboss-marshalling.txt
View file
File renamed without changes.
0 ...eps/netty-4.1.86.Final/LICENSE.jbzip2.txt → ...eps/netty-4.1.87.Final/LICENSE.jbzip2.txt
View file
File renamed without changes.
0 ...ps/netty-4.1.86.Final/LICENSE.jctools.txt → ...ps/netty-4.1.87.Final/LICENSE.jctools.txt
View file
File renamed without changes.
0 ...ps/netty-4.1.86.Final/LICENSE.jfastlz.txt → ...ps/netty-4.1.87.Final/LICENSE.jfastlz.txt
View file
File renamed without changes.
0 ...ps/netty-4.1.86.Final/LICENSE.jsr166y.txt → ...ps/netty-4.1.87.Final/LICENSE.jsr166y.txt
View file
File renamed without changes.
0 ...deps/netty-4.1.86.Final/LICENSE.jzlib.txt → ...deps/netty-4.1.87.Final/LICENSE.jzlib.txt
View file
File renamed without changes.
0 ...ty-4.1.86.Final/LICENSE.libdivsufsort.txt → ...ty-4.1.87.Final/LICENSE.libdivsufsort.txt
View file
File renamed without changes.
0 ...deps/netty-4.1.86.Final/LICENSE.log4j.txt → ...deps/netty-4.1.87.Final/LICENSE.log4j.txt
View file
File renamed without changes.
0 ...s/deps/netty-4.1.86.Final/LICENSE.lz4.txt → ...s/deps/netty-4.1.87.Final/LICENSE.lz4.txt
View file
File renamed without changes.
0 .../netty-4.1.86.Final/LICENSE.lzma-java.txt → .../netty-4.1.87.Final/LICENSE.lzma-java.txt
View file
File renamed without changes.
0 ...etty-4.1.86.Final/LICENSE.mvn-wrapper.txt → ...etty-4.1.87.Final/LICENSE.mvn-wrapper.txt
View file
File renamed without changes.
0 ...ty-4.1.86.Final/LICENSE.nghttp2-hpack.txt → ...ty-4.1.87.Final/LICENSE.nghttp2-hpack.txt
View file
File renamed without changes.
0 ...s/netty-4.1.86.Final/LICENSE.protobuf.txt → ...s/netty-4.1.87.Final/LICENSE.protobuf.txt
View file
File renamed without changes.
0 ...deps/netty-4.1.86.Final/LICENSE.slf4j.txt → ...deps/netty-4.1.87.Final/LICENSE.slf4j.txt
View file
File renamed without changes.
0 ...eps/netty-4.1.86.Final/LICENSE.snappy.txt → ...eps/netty-4.1.87.Final/LICENSE.snappy.txt
View file
File renamed without changes.
0 ...eps/netty-4.1.86.Final/LICENSE.webbit.txt → ...eps/netty-4.1.87.Final/LICENSE.webbit.txt
View file
File renamed without changes.
0 ...eps/netty-4.1.86.Final/NOTICE.harmony.txt → ...eps/netty-4.1.87.Final/NOTICE.harmony.txt
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@
<log4j.version>2.18.0</log4j.version>
<lz4.version>1.3.0</lz4.version>
<mockito.version>3.12.4</mockito.version>
<netty.version>4.1.86.Final</netty.version>
<netty-boringssl.version>2.0.54.Final</netty-boringssl.version>
<netty-iouring.version>0.0.16.Final</netty-iouring.version>
<netty.version>4.1.87.Final</netty.version>
<netty-boringssl.version>2.0.56.Final</netty-boringssl.version>
<netty-iouring.version>0.0.17.Final</netty-iouring.version>
<ostrich.version>9.1.3</ostrich.version>
<powermock.version>2.0.9</powermock.version>
<prometheus.version>0.15.0</prometheus.version>
Expand Down

0 comments on commit 7303cf1

Please sign in to comment.