Skip to content

Commit

Permalink
Upgrade netty to 4.1.84.Final (#4915)
Browse files Browse the repository at this point in the history
Signed-off-by: Craig Perkins <[email protected]>

Signed-off-by: Craig Perkins <[email protected]>
  • Loading branch information
cwperks authored Oct 25, 2022
1 parent bc36497 commit 2681932
Show file tree
Hide file tree
Showing 46 changed files with 36 additions and 24 deletions.
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ slf4j = 1.6.2
# when updating the JNA version, also update the version in buildSrc/build.gradle
jna = 5.5.0

netty = 4.1.79.Final
netty = 4.1.84.Final
joda = 2.10.12

# when updating this version, you need to ensure compatibility with:
Expand Down
9 changes: 7 additions & 2 deletions modules/transport-netty4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ dependencies {
api "io.netty:netty-handler:${versions.netty}"
api "io.netty:netty-resolver:${versions.netty}"
api "io.netty:netty-transport:${versions.netty}"
api "io.netty:netty-transport-native-unix-common:${versions.netty}"
}

restResources {
Expand Down Expand Up @@ -150,6 +151,12 @@ thirdPartyAudit {
'org.bouncycastle.cert.X509v3CertificateBuilder',
'org.bouncycastle.cert.jcajce.JcaX509CertificateConverter',
'org.bouncycastle.operator.jcajce.JcaContentSignerBuilder',
'org.bouncycastle.openssl.PEMEncryptedKeyPair',
'org.bouncycastle.openssl.PEMParser',
'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter',
'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder',
'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder',
'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo',

// from io.netty.handler.ssl.JettyNpnSslEngine (netty)
'org.eclipse.jetty.npn.NextProtoNego$ClientProvider',
Expand Down Expand Up @@ -199,8 +206,6 @@ thirdPartyAudit {
'net.jpountz.lz4.LZ4FastDecompressor',
'net.jpountz.xxhash.XXHash32',
'net.jpountz.xxhash.XXHashFactory',
'io.netty.channel.unix.FileDescriptor',
'io.netty.channel.unix.UnixChannel',
'io.netty.internal.tcnative.AsyncSSLPrivateKeyMethod',
'io.netty.internal.tcnative.AsyncTask',
'io.netty.internal.tcnative.CertificateCompressionAlgo',
Expand Down

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f1a994d19e9971ba6f1b8abf4ebf912a21cec983
6 changes: 6 additions & 0 deletions plugins/transport-nio/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ thirdPartyAudit {
'org.bouncycastle.cert.X509v3CertificateBuilder',
'org.bouncycastle.cert.jcajce.JcaX509CertificateConverter',
'org.bouncycastle.operator.jcajce.JcaContentSignerBuilder',
'org.bouncycastle.openssl.PEMEncryptedKeyPair',
'org.bouncycastle.openssl.PEMParser',
'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter',
'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder',
'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder',
'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo',

// from io.netty.handler.ssl.JettyNpnSslEngine (netty)
'org.eclipse.jetty.npn.NextProtoNego$ClientProvider',
Expand Down

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

0 comments on commit 2681932

Please sign in to comment.