Skip to content

Commit

Permalink
Update to Netty 4.1.80.Final (#4359)
Browse files Browse the repository at this point in the history
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 236f2f6)
Signed-off-by: Andriy Redko <[email protected]>
  • Loading branch information
reta committed Sep 1, 2022
1 parent f98340e commit 44c59ec
Show file tree
Hide file tree
Showing 48 changed files with 38 additions and 23 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

### Changed
- Dependency updates (httpcore, mockito, slf4j, httpasyncclient, commons-codec) ([#4308](https://github.com/opensearch-project/OpenSearch/pull/4308))
- Update to Netty 4.1.80.Final ([#4359](https://github.com/opensearch-project/OpenSearch/pull/4359))

### Deprecated

Expand Down
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.79.Final
netty = 4.1.80.Final
joda = 2.10.12

# client dependencies
Expand Down
8 changes: 8 additions & 0 deletions modules/transport-netty4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,14 @@ thirdPartyAudit {
'org.apache.log4j.Level',
'org.apache.log4j.Logger',

// from io.netty.handler.ssl.OpenSslEngine (netty)
'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.OpenSslEngine (netty)
'io.netty.internal.tcnative.Buffer',
'io.netty.internal.tcnative.CertificateCompressionAlgo',
Expand Down

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
39e73b76a3ec65df731b371179e15f2c3e4e7575
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 @@
a087321a63d9991e25f7b7d24ef53edcbcb954ff

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

0 comments on commit 44c59ec

Please sign in to comment.