Browse Source

Upgrade to Netty 4.1.5

This commit upgrades the Netty dependencies from version 4.1.4 to
version 4.1.5. This upgrade brings several bug fixes including the
removal of a obnoxious and scary-looking log message when unsafe is
explicitly disabled.

Relates #20222
Jason Tedor 9 years ago
parent
commit
0df92a8da8

+ 14 - 10
modules/transport-netty4/build.gradle

@@ -33,13 +33,13 @@ compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-tr
 
 dependencies {
     // network stack
-    compile "io.netty:netty-buffer:4.1.4.Final"
-    compile "io.netty:netty-codec:4.1.4.Final"
-    compile "io.netty:netty-codec-http:4.1.4.Final"
-    compile "io.netty:netty-common:4.1.4.Final"
-    compile "io.netty:netty-handler:4.1.4.Final"
-    compile "io.netty:netty-resolver:4.1.4.Final"
-    compile "io.netty:netty-transport:4.1.4.Final"
+    compile "io.netty:netty-buffer:4.1.5.Final"
+    compile "io.netty:netty-codec:4.1.5.Final"
+    compile "io.netty:netty-codec-http:4.1.5.Final"
+    compile "io.netty:netty-common:4.1.5.Final"
+    compile "io.netty:netty-handler:4.1.5.Final"
+    compile "io.netty:netty-resolver:4.1.5.Final"
+    compile "io.netty:netty-transport:4.1.5.Final"
 }
 
 integTest {
@@ -114,9 +114,9 @@ thirdPartyAudit.excludes = [
         'com.ning.compress.lzf.LZFEncoder',
         'com.ning.compress.lzf.util.ChunkDecoderFactory',
         'com.ning.compress.lzf.util.ChunkEncoderFactory',
-        'javassist/ClassClassPath',
-        'javassist/ClassPath',
-        'javassist/ClassPool',
+        'javassist.ClassClassPath',
+        'javassist.ClassPath',
+        'javassist.ClassPool',
         'javassist.CtClass',
         'javassist.CtMethod',
         'lzma.sdk.lzma.Encoder',
@@ -127,7 +127,9 @@ thirdPartyAudit.excludes = [
         'net.jpountz.xxhash.XXHashFactory',
         'org.apache.logging.log4j.LogManager',
         'org.apache.logging.log4j.Logger',
+        'org.apache.tomcat.Apr',
         'org.apache.tomcat.jni.CertificateRequestedCallback',
+        'org.apache.tomcat.jni.CertificateRequestedCallback$KeyMaterial',
         'org.apache.tomcat.jni.CertificateVerifier',
         'org.apache.tomcat.jni.SessionTicketKey',
         'org.eclipse.jetty.alpn.ALPN$ClientProvider',
@@ -136,6 +138,8 @@ thirdPartyAudit.excludes = [
 
         'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator',
         'io.netty.util.internal.PlatformDependent0',
+        'io.netty.util.internal.PlatformDependent0$2',
+        'io.netty.util.internal.PlatformDependent0$3',
         'io.netty.util.internal.UnsafeAtomicIntegerFieldUpdater',
         'io.netty.util.internal.UnsafeAtomicLongFieldUpdater',
         'io.netty.util.internal.UnsafeAtomicReferenceFieldUpdater',

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

@@ -1 +0,0 @@
-5e199381c808377faeeb80e69f365246004d6f9f

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

@@ -0,0 +1 @@
+b5fb6bccda4d63d4a74c9faccdf32f77ab66abc1

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

@@ -1 +0,0 @@
-86fc9367492cdca25542fb037467ab853a77ff62

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

@@ -0,0 +1 @@
+66bbf9324fa36467d041083f89328e2a24ec4f67

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

@@ -1 +0,0 @@
-f6ef27ed46dd806dc27c1f0ed2e6bcfad12d28cc

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

@@ -0,0 +1 @@
+087bda1b9ec7e3f75ca721fc87735cbedad2aa1a

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

@@ -1 +0,0 @@
-e267ca463a0dc6292cf5e0528c4b59d6d5f76ff5

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

@@ -0,0 +1 @@
+607f8433d8782445e72abe34e43a7e57e86a5e6c

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

@@ -1 +0,0 @@
-5674b3bc1203d913da71ba98bb7d43832c7a71e7

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

@@ -0,0 +1 @@
+6262900ee9487e62560030a136160df953b1cd6b

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

@@ -1 +0,0 @@
-19f86688069a018cf5e45f7a9f9a02971b9e31ee

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

@@ -0,0 +1 @@
+5f367bedcdc185a727fda3296b9a18014cdc22c4

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

@@ -1 +0,0 @@
-6c99d2323d75d74b9571c4ddbdc411d96bf8d780

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

@@ -0,0 +1 @@
+37126b370722ff9631ee13c91139aacec0a71d1d

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

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-grant codeBase "${codebase.netty-transport-4.1.4.Final.jar}" {
+grant codeBase "${codebase.netty-transport-4.1.5.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";