Skip to content

Commit 8fda187

Browse files
cwperkscwperks
authored
Upgrade netty to 4.1.84.Final (opensearch-project#4893)
* Upgrade netty to 4.1.84.Final Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add line in CHANGELOG Signed-off-by: Craig Perkins <cwperx@amazon.com> Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent 272f1d1 commit 8fda187

File tree

50 files changed

+38
-25
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+38
-25
lines changed

‎CHANGELOG.md

+2-1

‎buildSrc/version.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jettison = 1.5.1
2222
# when updating the JNA version, also update the version in buildSrc/build.gradle
2323
jna = 5.12.1
2424

25-
netty = 4.1.79.Final
25+
netty = 4.1.84.Final
2626
joda = 2.10.13
2727

2828
# client dependencies

‎modules/transport-netty4/build.gradle

+6
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,12 @@ thirdPartyAudit {
156156
'org.bouncycastle.cert.X509v3CertificateBuilder',
157157
'org.bouncycastle.cert.jcajce.JcaX509CertificateConverter',
158158
'org.bouncycastle.operator.jcajce.JcaContentSignerBuilder',
159+
'org.bouncycastle.openssl.PEMEncryptedKeyPair',
160+
'org.bouncycastle.openssl.PEMParser',
161+
'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter',
162+
'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder',
163+
'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder',
164+
'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo',
159165

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

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

-1
This file was deleted.

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a6b8cf57cfffc28d8e33f8175788a99401f576d9

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

‎modules/transport-netty4/licenses/netty-codec-http2-4.1.79.Final.jar.sha1

-1
This file was deleted.

‎modules/transport-netty4/licenses/netty-codec-http2-4.1.84.Final.jar.sha1

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b6f808e331cf843d2a7ff62042cf9b5343e2ff25

‎modules/transport-netty4/licenses/netty-transport-4.1.79.Final.jar.sha1

-1
This file was deleted.

‎modules/transport-netty4/licenses/netty-transport-4.1.84.Final.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
acd9947d0a951b1f7021c7adc393df936b1ecbf0

‎modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.79.Final.jar.sha1

-1
This file was deleted.

‎modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.84.Final.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e51601ddb88ee646a97ff04db38d45c22c29aee8

‎plugins/repository-azure/licenses/netty-codec-dns-4.1.79.Final.jar.sha1

-1
This file was deleted.

‎plugins/repository-azure/licenses/netty-codec-dns-4.1.84.Final.jar.sha1

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

‎plugins/repository-azure/licenses/netty-codec-http2-4.1.79.Final.jar.sha1

-1
This file was deleted.

‎plugins/repository-azure/licenses/netty-codec-http2-4.1.84.Final.jar.sha1

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

‎plugins/repository-azure/licenses/netty-codec-socks-4.1.79.Final.jar.sha1

-1
This file was deleted.

‎plugins/repository-azure/licenses/netty-codec-socks-4.1.84.Final.jar.sha1

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

‎plugins/repository-azure/licenses/netty-handler-proxy-4.1.79.Final.jar.sha1

-1
This file was deleted.

‎plugins/repository-azure/licenses/netty-handler-proxy-4.1.84.Final.jar.sha1

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

‎plugins/repository-azure/licenses/netty-resolver-dns-4.1.79.Final.jar.sha1

-1
This file was deleted.

‎plugins/repository-azure/licenses/netty-resolver-dns-4.1.84.Final.jar.sha1

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

‎plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.79.Final.jar.sha1

-1
This file was deleted.

‎plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.84.Final.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e51601ddb88ee646a97ff04db38d45c22c29aee8

‎plugins/repository-hdfs/licenses/netty-all-4.1.79.Final.jar.sha1

-1
This file was deleted.

‎plugins/repository-hdfs/licenses/netty-all-4.1.84.Final.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f1a994d19e9971ba6f1b8abf4ebf912a21cec983

‎plugins/transport-nio/build.gradle

+6
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ thirdPartyAudit {
8383
'org.bouncycastle.cert.X509v3CertificateBuilder',
8484
'org.bouncycastle.cert.jcajce.JcaX509CertificateConverter',
8585
'org.bouncycastle.operator.jcajce.JcaContentSignerBuilder',
86+
'org.bouncycastle.openssl.PEMEncryptedKeyPair',
87+
'org.bouncycastle.openssl.PEMParser',
88+
'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter',
89+
'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder',
90+
'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder',
91+
'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo',
8692

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

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

-1
This file was deleted.

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a6b8cf57cfffc28d8e33f8175788a99401f576d9

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b6f808e331cf843d2a7ff62042cf9b5343e2ff25

‎plugins/transport-nio/licenses/netty-transport-4.1.79.Final.jar.sha1

-1
This file was deleted.

‎plugins/transport-nio/licenses/netty-transport-4.1.84.Final.jar.sha1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
acd9947d0a951b1f7021c7adc393df936b1ecbf0

0 commit comments

Comments
 (0)