Browse Source

Upgrade to Netty 4.1.82.Final (#90604)

Upgrade to Netty 4.1.82.Final
Armin Braun 3 years ago
parent
commit
30185053bf

+ 1 - 1
build-tools-internal/version.properties

@@ -17,7 +17,7 @@ ecsLogging        = 1.2.0
 
 jna               = 5.10.0
 
-netty             = 4.1.77.Final
+netty             = 4.1.82.Final
 
 commons_lang3                   = 3.9
 

+ 5 - 0
docs/changelog/90604.yaml

@@ -0,0 +1,5 @@
+pr: 90604
+summary: Upgrade to Netty 4.1.82.Final
+area: Network
+type: upgrade
+issues: []

+ 39 - 39
gradle/verification-metadata.xml

@@ -1169,9 +1169,9 @@
             <sha256 value="7b0171a4e8bcd573e08d9f2bba053c67b557ab5012106a5982ccbae5743814c0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-buffer" version="4.1.77.Final">
-         <artifact name="netty-buffer-4.1.77.Final.jar">
-            <sha256 value="41b7ddc4dd124c7e75af33a13a426fda4e1ec87c387cd234971e7df4c0b51c26" origin="Generated by Gradle"/>
+      <component group="io.netty" name="netty-buffer" version="4.1.82.Final">
+         <artifact name="netty-buffer-4.1.82.Final.jar">
+            <sha256 value="a7ce7f6d8c1e82b044cd56765dab4338251596416de03b1f9a05d7402429c29d" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.netty" name="netty-codec" version="4.1.42.Final">
@@ -1179,29 +1179,29 @@
             <sha256 value="e96ced697fb7df589da7c20c995e01f75a9cb246be242bbc4cd3b4af424ff189" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-codec" version="4.1.77.Final">
-         <artifact name="netty-codec-4.1.77.Final.jar">
-            <sha256 value="84e4e01dd5b345311e971289b5bc08c0dfd6054a28d16853f0416943c9a3e458" origin="Generated by Gradle"/>
+      <component group="io.netty" name="netty-codec" version="4.1.82.Final">
+         <artifact name="netty-codec-4.1.82.Final.jar">
+            <sha256 value="170c0ce091c2e1cc1d952d87a6a30deb773922507bbc609b962b539f03f53407" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-codec-dns" version="4.1.77.Final">
-         <artifact name="netty-codec-dns-4.1.77.Final.jar">
-            <sha256 value="fa5ec958f02c2c52c470789afa7e5a5d9b49068dbf51ea87608704ad3fe3ee4d" origin="Generated by Gradle"/>
+      <component group="io.netty" name="netty-codec-dns" version="4.1.82.Final">
+         <artifact name="netty-codec-dns-4.1.82.Final.jar">
+            <sha256 value="463f80707bd2275f46349b6f542c31adaf1fcbd8a0661e79f7ff9cc2be46c7a6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-codec-http" version="4.1.77.Final">
-         <artifact name="netty-codec-http-4.1.77.Final.jar">
-            <sha256 value="96f6726f1f47273415665e8bf18f3b4ae28572fcb8845a7fe6e6d7ffdb8c48d2" origin="Generated by Gradle"/>
+      <component group="io.netty" name="netty-codec-http" version="4.1.82.Final">
+         <artifact name="netty-codec-http-4.1.82.Final.jar">
+            <sha256 value="1e94af48085ec503d69520b58913888f9546b4b4ed2efc8bcb33eb718333edb3" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-codec-http2" version="4.1.77.Final">
-         <artifact name="netty-codec-http2-4.1.77.Final.jar">
-            <sha256 value="f2c3c1dc919fd694d1c4015143316811ed3c70edc6b0586851190305c2723296" origin="Generated by Gradle"/>
+      <component group="io.netty" name="netty-codec-http2" version="4.1.82.Final">
+         <artifact name="netty-codec-http2-4.1.82.Final.jar">
+            <sha256 value="00a29471304c56738c4016f8e811ba63390b79b74459bffecf0571998a8cc52f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-codec-socks" version="4.1.77.Final">
-         <artifact name="netty-codec-socks-4.1.77.Final.jar">
-            <sha256 value="e16610cdb4e51ed85f1b7f6e935e98a45cb42774f4693aa8e71a5fdf6ba652a7" origin="Generated by Gradle"/>
+      <component group="io.netty" name="netty-codec-socks" version="4.1.82.Final">
+         <artifact name="netty-codec-socks-4.1.82.Final.jar">
+            <sha256 value="defd4672c4dbf3d0fef4307cedee39fe7766c3e7baf77adae5fa069b18f0c7b3" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.netty" name="netty-common" version="4.1.42.Final">
@@ -1209,9 +1209,9 @@
             <sha256 value="3d0a918d78292eeca02a7bb2188daa4e5053b6e29b71e6308309033e121242b5" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-common" version="4.1.77.Final">
-         <artifact name="netty-common-4.1.77.Final.jar">
-            <sha256 value="40dd9b5ef14878f050a1f7f4d5647d53473f134e349665b47243bde56de7a51f" origin="Generated by Gradle"/>
+      <component group="io.netty" name="netty-common" version="4.1.82.Final">
+         <artifact name="netty-common-4.1.82.Final.jar">
+            <sha256 value="d5923db1cc68b26baf5368f1f76ec2c6100d12db8406c6de00eb6dbc08052550" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.netty" name="netty-handler" version="4.1.42.Final">
@@ -1219,14 +1219,14 @@
             <sha256 value="11eda86500c33b9d386719b5419f513fd9c097d13894f25dd0c75b610d636e03" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-handler" version="4.1.77.Final">
-         <artifact name="netty-handler-4.1.77.Final.jar">
-            <sha256 value="7911becd4850ff3fc3d93b4be7c468a2f6444fb48c17eec03c807856faf11e0a" origin="Generated by Gradle"/>
+      <component group="io.netty" name="netty-handler" version="4.1.82.Final">
+         <artifact name="netty-handler-4.1.82.Final.jar">
+            <sha256 value="31015505983dc57eec491ad4873411ba51f0f3beb24d22d509336c72511019cb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-handler-proxy" version="4.1.77.Final">
-         <artifact name="netty-handler-proxy-4.1.77.Final.jar">
-            <sha256 value="e708ea428347a6489a3c8d090b02237ea7dca365836f0a8aabfe7ca453f46662" origin="Generated by Gradle"/>
+      <component group="io.netty" name="netty-handler-proxy" version="4.1.82.Final">
+         <artifact name="netty-handler-proxy-4.1.82.Final.jar">
+            <sha256 value="1776ada44536c021c31f18dc2915d48be84585bad9ca4dd7c7bff8205b318df7" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.netty" name="netty-resolver" version="4.1.42.Final">
@@ -1234,14 +1234,14 @@
             <sha256 value="89768242b6b7cce9bd9f5945ad21d1b4bae515c6b1bf03a8af5d1899779cebc9" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-resolver" version="4.1.77.Final">
-         <artifact name="netty-resolver-4.1.77.Final.jar">
-            <sha256 value="0161cfe9544b3656ed0de67d8937828101859e94bcd0caaf58d21ac7011eabd4" origin="Generated by Gradle"/>
+      <component group="io.netty" name="netty-resolver" version="4.1.82.Final">
+         <artifact name="netty-resolver-4.1.82.Final.jar">
+            <sha256 value="4cfeba7ec535964a35722178aeecc87ec186dba0203d04389a850e8e62575383" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-resolver-dns" version="4.1.77.Final">
-         <artifact name="netty-resolver-dns-4.1.77.Final.jar">
-            <sha256 value="2468177423bd814fa363f741ad2434a989e429078714dfd729b5b896a14b501c" origin="Generated by Gradle"/>
+      <component group="io.netty" name="netty-resolver-dns" version="4.1.82.Final">
+         <artifact name="netty-resolver-dns-4.1.82.Final.jar">
+            <sha256 value="a40c38730dbba50b93ca7741ca1e5a024a995795c2de7dd267747be91f096989" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.netty" name="netty-transport" version="4.1.42.Final">
@@ -1249,9 +1249,9 @@
             <sha256 value="dfa817a156ea263aa9ad8364a2e226527665c9722aca40a7945f228c2c14f1da" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-transport" version="4.1.77.Final">
-         <artifact name="netty-transport-4.1.77.Final.jar">
-            <sha256 value="034cdf7d81feaad9977c3d8b4fc05611952bc9861dfb9085b8962e2c1de582aa" origin="Generated by Gradle"/>
+      <component group="io.netty" name="netty-transport" version="4.1.82.Final">
+         <artifact name="netty-transport-4.1.82.Final.jar">
+            <sha256 value="c210069be4ab4120f5ac7cb5e4a126d3a007e78a64fd44c9971220e013dbaef1" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.netty" name="netty-transport-native-epoll" version="4.1.42.Final">
@@ -1264,9 +1264,9 @@
             <sha256 value="508fba9128da78bd775ba854d71917ceb2b00b95a7600254f54a277a06761a86" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="io.netty" name="netty-transport-native-unix-common" version="4.1.77.Final">
-         <artifact name="netty-transport-native-unix-common-4.1.77.Final.jar">
-            <sha256 value="108d27f325fa9ce9a914fa53638fbeeb1a384148fb3a13389bd09a5e38e4ac1e" origin="Generated by Gradle"/>
+      <component group="io.netty" name="netty-transport-native-unix-common" version="4.1.82.Final">
+         <artifact name="netty-transport-native-unix-common-4.1.82.Final.jar">
+            <sha256 value="1096f16527a51dd5f44ced90636110a429cc7359a9a8a91db25000b747793429" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="io.opencensus" name="opencensus-api" version="0.28.0">

+ 6 - 0
modules/repository-azure/build.gradle

@@ -183,6 +183,12 @@ tasks.named("thirdPartyAudit").configure {
     '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',

+ 7 - 0
modules/transport-netty4/build.gradle

@@ -42,6 +42,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 {
@@ -121,6 +122,12 @@ tasks.named("thirdPartyAudit").configure {
     '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',