Skip to content

Commit a501d68

Browse files
Upgrade to Netty 4.1.38 (#45132) (#45364)
* A number of fixes to buffer handling in the .37 and .38 -> we should stay up to date
1 parent 2a99eaa commit a501d68

31 files changed

+18
-17
lines changed

buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ slf4j = 1.6.2
2020
# when updating the JNA version, also update the version in buildSrc/build.gradle
2121
jna = 4.5.1
2222

23-
netty = 4.1.36.Final
23+
netty = 4.1.38.Final
2424
joda = 2.10.2
2525

2626
# when updating this version, you need to ensure compatibility with:

modules/transport-netty4/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,13 @@ thirdPartyAudit {
144144
'net.jpountz.lz4.LZ4Compressor',
145145
'net.jpountz.lz4.LZ4Factory',
146146
'net.jpountz.lz4.LZ4FastDecompressor',
147-
'net.jpountz.xxhash.StreamingXXHash32',
147+
'net.jpountz.xxhash.XXHash32',
148148
'net.jpountz.xxhash.XXHashFactory',
149149
'io.netty.internal.tcnative.CertificateCallback',
150150
'io.netty.internal.tcnative.CertificateVerifier',
151151
'io.netty.internal.tcnative.SessionTicketKey',
152152
'io.netty.internal.tcnative.SniHostNameMatcher',
153+
'io.netty.internal.tcnative.SSL',
153154
'org.eclipse.jetty.alpn.ALPN$ClientProvider',
154155
'org.eclipse.jetty.alpn.ALPN$ServerProvider',
155156
'org.eclipse.jetty.alpn.ALPN',

modules/transport-netty4/licenses/netty-buffer-4.1.36.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d16cf15d29c409987cecde77407fbb6f1e16d262

modules/transport-netty4/licenses/netty-codec-4.1.36.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ccfbdfc727cbf702350572a0b12fe92185ebf162

modules/transport-netty4/licenses/netty-codec-http-4.1.36.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4d55b3cdb74cd140d262de96987ebd369125a64c

modules/transport-netty4/licenses/netty-common-4.1.36.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6f8aae763f743d91fb1ba1e9011dae0ef4f6ff34

modules/transport-netty4/licenses/netty-handler-4.1.36.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ebf1f2bd0dad5e16aa1fc48d32e5dbe507b38d53

modules/transport-netty4/licenses/netty-resolver-4.1.36.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b00be4aa309e9b56e498191aa8c73e4f393759ed

modules/transport-netty4/licenses/netty-transport-4.1.36.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cd8b612d5daa42d1be3bb3203e4857597d5db79b

plugins/transport-nio/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ thirdPartyAudit {
108108
'net.jpountz.lz4.LZ4Compressor',
109109
'net.jpountz.lz4.LZ4Factory',
110110
'net.jpountz.lz4.LZ4FastDecompressor',
111-
'net.jpountz.xxhash.StreamingXXHash32',
111+
'net.jpountz.xxhash.XXHash32',
112112
'net.jpountz.xxhash.XXHashFactory',
113113
'org.eclipse.jetty.alpn.ALPN$ClientProvider',
114114
'org.eclipse.jetty.alpn.ALPN$ServerProvider',

plugins/transport-nio/licenses/netty-buffer-4.1.36.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d16cf15d29c409987cecde77407fbb6f1e16d262

plugins/transport-nio/licenses/netty-codec-4.1.36.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ccfbdfc727cbf702350572a0b12fe92185ebf162

plugins/transport-nio/licenses/netty-codec-http-4.1.36.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4d55b3cdb74cd140d262de96987ebd369125a64c

plugins/transport-nio/licenses/netty-common-4.1.36.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6f8aae763f743d91fb1ba1e9011dae0ef4f6ff34

plugins/transport-nio/licenses/netty-handler-4.1.36.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ebf1f2bd0dad5e16aa1fc48d32e5dbe507b38d53

plugins/transport-nio/licenses/netty-resolver-4.1.36.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b00be4aa309e9b56e498191aa8c73e4f393759ed

plugins/transport-nio/licenses/netty-transport-4.1.36.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cd8b612d5daa42d1be3bb3203e4857597d5db79b

0 commit comments

Comments
 (0)