Skip to content

Commit 54b1740

Browse files
cwperkspranikum
cwperks
authored and
pranikum
committed
Revert to Netty 4.1.79.Final (opensearch-project#4428)
Signed-off-by: Craig Perkins <cwperx@amazon.com> Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent b27b4ea commit 54b1740

File tree

50 files changed

+24
-39
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

+24
-39
lines changed

‎CHANGELOG.md

-1

‎buildSrc/version.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ asm = 9.3
2121
# when updating the JNA version, also update the version in buildSrc/build.gradle
2222
jna = 5.5.0
2323

24-
netty = 4.1.80.Final
24+
netty = 4.1.79.Final
2525
joda = 2.10.13
2626

2727
# client dependencies

‎modules/transport-netty4/build.gradle

-8
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,6 @@ thirdPartyAudit {
144144
'org.apache.log4j.Level',
145145
'org.apache.log4j.Logger',
146146

147-
// from io.netty.handler.ssl.OpenSslEngine (netty)
148-
'org.bouncycastle.openssl.PEMEncryptedKeyPair',
149-
'org.bouncycastle.openssl.PEMParser',
150-
'org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter',
151-
'org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder',
152-
'org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder',
153-
'org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo',
154-
155147
// from io.netty.handler.ssl.OpenSslEngine (netty)
156148
'io.netty.internal.tcnative.Buffer',
157149
'io.netty.internal.tcnative.CertificateCompressionAlgo',

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6c014412b599489b1db27c6bc08d8a46da94e397

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

‎plugins/transport-nio/build.gradle

-6
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,6 @@ 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',
9286

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

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

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6c014412b599489b1db27c6bc08d8a46da94e397

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

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

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

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

-1
This file was deleted.

0 commit comments

Comments
 (0)