Skip to content

Commit

Permalink
Revert to Netty 4.1.79.Final (opensearch-project#4428)
Browse files Browse the repository at this point in the history
Signed-off-by: Craig Perkins <cwperx@amazon.com>

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit fb64a85)
  • Loading branch information
cwperks committed Sep 7, 2022
1 parent e2c7f16 commit 1334341
Show file tree
Hide file tree
Showing 48 changed files with 24 additions and 37 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.80.Final
netty = 4.1.79.Final
joda = 2.10.12

# when updating this version, you need to ensure compatibility with:
Expand Down
8 changes: 0 additions & 8 deletions modules/transport-netty4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,6 @@ 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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6c014412b599489b1db27c6bc08d8a46da94e397

This file was deleted.

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

This file was deleted.

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0eeffab0cd5efb699d5e4ab9b694d32fef6694b3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2814bd465731355323aba0fdd22163bfce638a75

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

6 changes: 0 additions & 6 deletions plugins/transport-nio/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,6 @@ 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
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6c014412b599489b1db27c6bc08d8a46da94e397

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

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

This file was deleted.

0 comments on commit 1334341

Please sign in to comment.