Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.0] Upgrade netty to 4.1.84.Final #4915

Merged
merged 1 commit into from
Oct 25, 2022
Merged

[Backport 2.0] Upgrade netty to 4.1.84.Final #4915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/version.properties
View file
Open in desktop
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
View file
Open in desktop
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
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-buffer-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-buffer-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a6b8cf57cfffc28d8e33f8175788a99401f576d9
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-codec-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-codec-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4f60f56c4cd17db114f01dc64aa465a2905240f5
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-codec-http-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-codec-http-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
78628e78087d3da6c3d2b22aa67798d3f3adcd68
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-common-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-common-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
90c84ec7f1108ae164810cf46694a5ec7ce738fc
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-handler-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-handler-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
69cd93e2c321f04fc0a18eb5af519565373d0873
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-resolver-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-resolver-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b6f808e331cf843d2a7ff62042cf9b5343e2ff25
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-transport-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-transport-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
acd9947d0a951b1f7021c7adc393df936b1ecbf0
1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e51601ddb88ee646a97ff04db38d45c22c29aee8
1 change: 0 additions & 1 deletion plugins/repository-azure/licenses/netty-codec-dns-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-azure/licenses/netty-codec-dns-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
48ce1da1bc12b830f6ffcdc5f0329639eb11e2fb
1 change: 0 additions & 1 deletion plugins/repository-azure/licenses/netty-codec-http2-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-azure/licenses/netty-codec-http2-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5a0178b9689493fd612cd40481034469f4bd14cc
1 change: 0 additions & 1 deletion plugins/repository-azure/licenses/netty-codec-socks-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-azure/licenses/netty-codec-socks-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8cef741b42de5a1b21a8313fffcf2b518138c00b
1 change: 0 additions & 1 deletion plugins/repository-azure/licenses/netty-handler-proxy-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-azure/licenses/netty-handler-proxy-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8d9f2282f4da2486eed7797bc8622437eda7ce65
1 change: 0 additions & 1 deletion plugins/repository-azure/licenses/netty-resolver-dns-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-azure/licenses/netty-resolver-dns-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3755d26967afca20b925c07d41e6ed3ec38c6822
1 change: 0 additions & 1 deletion plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e51601ddb88ee646a97ff04db38d45c22c29aee8
1 change: 0 additions & 1 deletion plugins/repository-hdfs/licenses/netty-all-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-hdfs/licenses/netty-all-4.1.84.Final.jar.sha1
View file
Open in desktop
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
View file
Open in desktop
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
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-buffer-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-buffer-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a6b8cf57cfffc28d8e33f8175788a99401f576d9
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-codec-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-codec-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4f60f56c4cd17db114f01dc64aa465a2905240f5
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-codec-http-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-codec-http-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
78628e78087d3da6c3d2b22aa67798d3f3adcd68
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-common-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-common-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
90c84ec7f1108ae164810cf46694a5ec7ce738fc
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-handler-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-handler-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
69cd93e2c321f04fc0a18eb5af519565373d0873
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-resolver-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-resolver-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b6f808e331cf843d2a7ff62042cf9b5343e2ff25
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-transport-4.1.79.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-transport-4.1.84.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
acd9947d0a951b1f7021c7adc393df936b1ecbf0