Browse Source

Upgrade Netty to 4.1.10.Final

This commit upgrades the Netty dependency from version 4.1.9.Final to
version 4.1.10.Final.

Relates #24414
Jason Tedor 8 years ago
parent
commit
eefcad94b8

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

@@ -34,13 +34,13 @@ compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-tr
 
 dependencies {
     // network stack
-    compile "io.netty:netty-buffer:4.1.9.Final"
-    compile "io.netty:netty-codec:4.1.9.Final"
-    compile "io.netty:netty-codec-http:4.1.9.Final"
-    compile "io.netty:netty-common:4.1.9.Final"
-    compile "io.netty:netty-handler:4.1.9.Final"
-    compile "io.netty:netty-resolver:4.1.9.Final"
-    compile "io.netty:netty-transport:4.1.9.Final"
+    compile "io.netty:netty-buffer:4.1.10.Final"
+    compile "io.netty:netty-codec:4.1.10.Final"
+    compile "io.netty:netty-codec-http:4.1.10.Final"
+    compile "io.netty:netty-common:4.1.10.Final"
+    compile "io.netty:netty-handler:4.1.10.Final"
+    compile "io.netty:netty-resolver:4.1.10.Final"
+    compile "io.netty:netty-transport:4.1.10.Final"
 }
 
 dependencyLicenses {
@@ -121,6 +121,7 @@ thirdPartyAudit.excludes = [
         'io.netty.internal.tcnative.CertificateRequestedCallback$KeyMaterial',
         'io.netty.internal.tcnative.CertificateVerifier',
         'io.netty.internal.tcnative.SessionTicketKey',
+        'io.netty.internal.tcnative.SniHostNameMatcher',
         'org.eclipse.jetty.alpn.ALPN$ClientProvider',
         'org.eclipse.jetty.alpn.ALPN$ServerProvider',
         'org.eclipse.jetty.alpn.ALPN',
@@ -143,4 +144,7 @@ thirdPartyAudit.excludes = [
         'io.netty.util.internal.shaded.org.jctools.util.JvmInfo',
         'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
         'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
+
+        'org.conscrypt.Conscrypt$Engines',
+        'org.conscrypt.HandshakeListener'
 ]

+ 1 - 0
modules/transport-netty4/licenses/netty-buffer-4.1.10.Final.jar.sha1

@@ -0,0 +1 @@
+62b25bb39c22f5a4c267b9ff1d9915f8c0191c3a

+ 0 - 1
modules/transport-netty4/licenses/netty-buffer-4.1.9.Final.jar.sha1

@@ -1 +0,0 @@
-6ec75e26374569ec0120c63c50fb930c48270e0d

+ 1 - 0
modules/transport-netty4/licenses/netty-codec-4.1.10.Final.jar.sha1

@@ -0,0 +1 @@
+1fd4a9d3a8d1ded1e1620ce16ae4afe0b3746c41

+ 0 - 1
modules/transport-netty4/licenses/netty-codec-4.1.9.Final.jar.sha1

@@ -1 +0,0 @@
-f41b5fdaaaf7b1e8de4e05be5f5b540f3b205959

+ 1 - 0
modules/transport-netty4/licenses/netty-codec-http-4.1.10.Final.jar.sha1

@@ -0,0 +1 @@
+38cbc4d4a0d40dd6f94ff722d76f6f3ea07a6ca6

+ 0 - 1
modules/transport-netty4/licenses/netty-codec-http-4.1.9.Final.jar.sha1

@@ -1 +0,0 @@
-efb68f8ce201d180fdbbec8ade5e25684cae12bc

+ 1 - 0
modules/transport-netty4/licenses/netty-common-4.1.10.Final.jar.sha1

@@ -0,0 +1 @@
+93eba0a663a990b8350c0949870b0db29d4d4f38

+ 0 - 1
modules/transport-netty4/licenses/netty-common-4.1.9.Final.jar.sha1

@@ -1 +0,0 @@
-7c6ba17f3b9e08fbbfc000fa3ce46208446a0019

+ 1 - 0
modules/transport-netty4/licenses/netty-handler-4.1.10.Final.jar.sha1

@@ -0,0 +1 @@
+c984b5d37563f15f10a0de0f4927d4a0dcb675de

+ 0 - 1
modules/transport-netty4/licenses/netty-handler-4.1.9.Final.jar.sha1

@@ -1 +0,0 @@
-e8caa6945995ccd03b232d6b31ee698668b47a1f

+ 1 - 0
modules/transport-netty4/licenses/netty-resolver-4.1.10.Final.jar.sha1

@@ -0,0 +1 @@
+dd05aa176779768dde2562283b0df3c39b92767b

+ 0 - 1
modules/transport-netty4/licenses/netty-resolver-4.1.9.Final.jar.sha1

@@ -1 +0,0 @@
-9e1f26ad1988fcbe0fc824940dfe6de9d2f438da

+ 1 - 0
modules/transport-netty4/licenses/netty-transport-4.1.10.Final.jar.sha1

@@ -0,0 +1 @@
+7a2be072e9962c751f90307379c2edb86d0b61a7

+ 0 - 1
modules/transport-netty4/licenses/netty-transport-4.1.9.Final.jar.sha1

@@ -1 +0,0 @@
-aaeed88d6a5c0bfc8d7a78225f4f093544470f5a

+ 2 - 2
modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-grant codeBase "${codebase.netty-common-4.1.9.Final.jar}" {
+grant codeBase "${codebase.netty-common-4.1.10.Final.jar}" {
    // for reading the system-wide configuration for the backlog of established sockets
    permission java.io.FilePermission "/proc/sys/net/core/somaxconn", "read";
 
@@ -25,7 +25,7 @@ grant codeBase "${codebase.netty-common-4.1.9.Final.jar}" {
    permission java.net.SocketPermission "*", "accept,connect";
 };
 
-grant codeBase "${codebase.netty-transport-4.1.9.Final.jar}" {
+grant codeBase "${codebase.netty-transport-4.1.10.Final.jar}" {
    // Netty NioEventLoop wants to change this, because of https://bugs.openjdk.java.net/browse/JDK-6427854
    // the bug says it only happened rarely, and that its fixed, but apparently it still happens rarely!
    permission java.util.PropertyPermission "sun.nio.ch.bugLevel", "write";