Skip to content

Commit

Permalink
Upgrade netty from 4.1.73.Final to 4.1.78.Final
Browse files Browse the repository at this point in the history
Signed-off-by: Craig Perkins <[email protected]>
  • Loading branch information
cwperks committed Jul 5, 2022
1 parent daef729 commit 7e248b4
Show file tree
Hide file tree
Showing 46 changed files with 39 additions and 27 deletions.
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ asm = 9.3
# when updating the JNA version, also update the version in buildSrc/build.gradle
jna = 5.5.0

netty = 4.1.73.Final
netty = 4.1.78.Final
joda = 2.10.12

# client dependencies
Expand Down
10 changes: 8 additions & 2 deletions modules/transport-netty4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ thirdPartyAudit {
'com.aayushatharva.brotli4j.Brotli4jLoader',
'com.aayushatharva.brotli4j.decoder.DecoderJNI$Status',
'com.aayushatharva.brotli4j.decoder.DecoderJNI$Wrapper',
'com.aayushatharva.brotli4j.encoder.Encoder',
'com.aayushatharva.brotli4j.encoder.Encoders',
'com.aayushatharva.brotli4j.encoder.Encoder$Mode',
'com.aayushatharva.brotli4j.encoder.Encoder$Parameters',
// classes are missing
Expand All @@ -141,11 +141,16 @@ thirdPartyAudit {

// from io.netty.handler.ssl.OpenSslEngine (netty)
'io.netty.internal.tcnative.Buffer',
'io.netty.internal.tcnative.CertificateCompressionAlgo',
'io.netty.internal.tcnative.Library',
'io.netty.internal.tcnative.SSL',
'io.netty.internal.tcnative.SSLContext',
'io.netty.internal.tcnative.SSLPrivateKeyMethod',

// from io.netty.channel.unix (netty)
'io.netty.channel.unix.FileDescriptor',
'io.netty.channel.unix.UnixChannel',

// from io.netty.handler.ssl.util.BouncyCastleSelfSignedCertGenerator (netty)
'org.bouncycastle.cert.X509v3CertificateBuilder',
'org.bouncycastle.cert.jcajce.JcaX509CertificateConverter',
Expand Down Expand Up @@ -227,7 +232,8 @@ thirdPartyAudit {
'io.netty.util.internal.PlatformDependent0$1',
'io.netty.util.internal.PlatformDependent0$2',
'io.netty.util.internal.PlatformDependent0$3',
'io.netty.util.internal.PlatformDependent0$5',
'io.netty.util.internal.PlatformDependent0$4',
'io.netty.util.internal.PlatformDependent0$6',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6c0c2d805a2c8ea30223677d8219235f9ec14c38

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e8486c8923fc0914df4562a8e0923462e885f88a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b636591e973418479f2d08e881b12be61845aa6f

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d6f560098050f88ba11750aa856edd955e4a7707

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7e902b6018378bb700ec9364b1d0fba6eefd99fd

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
691170d70a979757d50f60e16121ced5f411a9b8

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b1639d431e43622d6cbfdd45c30d3fb810fa9101
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void testBadRequest() throws IOException {
() -> client().performRequest(new Request(randomFrom("GET", "POST", "PUT"), path))
);
assertThat(e.getResponse().getStatusLine().getStatusCode(), equalTo(BAD_REQUEST.getStatus()));
assertThat(e, hasToString(containsString("too_long_frame_exception")));
assertThat(e, hasToString(containsString("too_long_http_line_exception")));
assertThat(e, hasToString(matches("An HTTP line is larger than \\d+ bytes")));
}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6b51ce00cfe34adbe93171088f1c7fbd2a517308

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9a4e44bebe5979b59c9bf4cd879e65c4c52bf869

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0a8b9c0e9819e4e2c6c938e8f079683a65d85faf

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f9e5ad080d1d1a9a82ba598814e6f5a229db4594

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
84fc82d8ff839d85c81979a5dc2525857b9a8837

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
62c64e182a11e31ad80e68a94f0b02b45344df23

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c64dedb62484d9fe9dfe1d1e877ef480fd1d0957
10 changes: 8 additions & 2 deletions plugins/transport-nio/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ thirdPartyAudit {
'com.aayushatharva.brotli4j.Brotli4jLoader',
'com.aayushatharva.brotli4j.decoder.DecoderJNI$Status',
'com.aayushatharva.brotli4j.decoder.DecoderJNI$Wrapper',
'com.aayushatharva.brotli4j.encoder.Encoder',
'com.aayushatharva.brotli4j.encoder.Encoders',
'com.aayushatharva.brotli4j.encoder.Encoder$Mode',
'com.aayushatharva.brotli4j.encoder.Encoder$Parameters',

Expand Down Expand Up @@ -145,6 +145,7 @@ thirdPartyAudit {
'io.netty.internal.tcnative.AsyncSSLPrivateKeyMethod',
'io.netty.internal.tcnative.AsyncTask',
'io.netty.internal.tcnative.Buffer',
'io.netty.internal.tcnative.CertificateCompressionAlgo',
'io.netty.internal.tcnative.Library',
'io.netty.internal.tcnative.ResultCallback',
'io.netty.internal.tcnative.SSL',
Expand All @@ -157,6 +158,10 @@ thirdPartyAudit {
'io.netty.internal.tcnative.SessionTicketKey',
'io.netty.internal.tcnative.SniHostNameMatcher',

// from io.netty.channel.unix (netty)
'io.netty.channel.unix.FileDescriptor',
'io.netty.channel.unix.UnixChannel',

'reactor.blockhound.BlockHound$Builder',
'reactor.blockhound.integration.BlockHoundIntegration'
)
Expand All @@ -167,7 +172,8 @@ thirdPartyAudit {
'io.netty.util.internal.PlatformDependent0$1',
'io.netty.util.internal.PlatformDependent0$2',
'io.netty.util.internal.PlatformDependent0$3',
'io.netty.util.internal.PlatformDependent0$5',
'io.netty.util.internal.PlatformDependent0$4',
'io.netty.util.internal.PlatformDependent0$6',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6c0c2d805a2c8ea30223677d8219235f9ec14c38

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e8486c8923fc0914df4562a8e0923462e885f88a

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b636591e973418479f2d08e881b12be61845aa6f

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d6f560098050f88ba11750aa856edd955e4a7707

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7e902b6018378bb700ec9364b1d0fba6eefd99fd

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
691170d70a979757d50f60e16121ced5f411a9b8

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b1639d431e43622d6cbfdd45c30d3fb810fa9101

0 comments on commit 7e248b4

Please sign in to comment.