From 7ba320d5b22e515c28389d2d22db10553250798f Mon Sep 17 00:00:00 2001 From: Armin Braun Date: Fri, 12 Oct 2018 16:13:28 +0100 Subject: [PATCH] NETWORKING: Upgrade Netty to 4.1.30 (#34417) * closes #34411 --- buildSrc/version.properties | 2 ++ modules/transport-netty4/build.gradle | 16 +++++++++------- .../licenses/netty-buffer-4.1.29.Final.jar.sha1 | 1 - .../licenses/netty-buffer-4.1.30.Final.jar.sha1 | 1 + .../licenses/netty-codec-4.1.29.Final.jar.sha1 | 1 - .../licenses/netty-codec-4.1.30.Final.jar.sha1 | 1 + .../netty-codec-http-4.1.29.Final.jar.sha1 | 1 - .../netty-codec-http-4.1.30.Final.jar.sha1 | 1 + .../licenses/netty-common-4.1.29.Final.jar.sha1 | 1 - .../licenses/netty-common-4.1.30.Final.jar.sha1 | 1 + .../licenses/netty-handler-4.1.29.Final.jar.sha1 | 1 - .../licenses/netty-handler-4.1.30.Final.jar.sha1 | 1 + .../netty-resolver-4.1.29.Final.jar.sha1 | 1 - .../netty-resolver-4.1.30.Final.jar.sha1 | 1 + .../netty-transport-4.1.29.Final.jar.sha1 | 1 - .../netty-transport-4.1.30.Final.jar.sha1 | 1 + plugins/transport-nio/build.gradle | 16 +++++++++------- .../licenses/netty-buffer-4.1.29.Final.jar.sha1 | 1 - .../licenses/netty-buffer-4.1.30.Final.jar.sha1 | 1 + .../licenses/netty-codec-4.1.29.Final.jar.sha1 | 1 - .../licenses/netty-codec-4.1.30.Final.jar.sha1 | 1 + .../netty-codec-http-4.1.29.Final.jar.sha1 | 1 - .../netty-codec-http-4.1.30.Final.jar.sha1 | 1 + .../licenses/netty-common-4.1.29.Final.jar.sha1 | 1 - .../licenses/netty-common-4.1.30.Final.jar.sha1 | 1 + .../licenses/netty-handler-4.1.29.Final.jar.sha1 | 1 - .../licenses/netty-handler-4.1.30.Final.jar.sha1 | 1 + .../netty-resolver-4.1.29.Final.jar.sha1 | 1 - .../netty-resolver-4.1.30.Final.jar.sha1 | 1 + .../netty-transport-4.1.29.Final.jar.sha1 | 1 - .../netty-transport-4.1.30.Final.jar.sha1 | 1 + 31 files changed, 34 insertions(+), 28 deletions(-) delete mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.29.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.30.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.29.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.30.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.29.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.30.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.29.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.30.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.29.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.30.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.29.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.30.Final.jar.sha1 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.29.Final.jar.sha1 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.30.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.29.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.30.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.29.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.30.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.29.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.30.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-common-4.1.29.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-common-4.1.30.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.29.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.30.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.29.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.30.Final.jar.sha1 delete mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.29.Final.jar.sha1 create mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.30.Final.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 5b611980f1c..5f76b232ecb 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -15,6 +15,8 @@ slf4j = 1.6.2 # when updating the JNA version, also update the version in buildSrc/build.gradle jna = 4.5.1 +netty = 4.1.30.Final + # test dependencies randomizedrunner = 2.7.0 junit = 4.12 diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index 05e3b1807f0..210b440ebb9 100644 --- a/modules/transport-netty4/build.gradle +++ b/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.29.Final" - compile "io.netty:netty-codec:4.1.29.Final" - compile "io.netty:netty-codec-http:4.1.29.Final" - compile "io.netty:netty-common:4.1.29.Final" - compile "io.netty:netty-handler:4.1.29.Final" - compile "io.netty:netty-resolver:4.1.29.Final" - compile "io.netty:netty-transport:4.1.29.Final" + compile "io.netty:netty-buffer:${versions.netty}" + compile "io.netty:netty-codec:${versions.netty}" + compile "io.netty:netty-codec-http:${versions.netty}" + compile "io.netty:netty-common:${versions.netty}" + compile "io.netty:netty-handler:${versions.netty}" + compile "io.netty:netty-resolver:${versions.netty}" + compile "io.netty:netty-transport:${versions.netty}" } dependencyLicenses { @@ -111,6 +111,7 @@ thirdPartyAudit.excludes = [ // from io.netty.util.internal.logging.InternalLoggerFactory (netty) - it's optional 'org.slf4j.Logger', 'org.slf4j.LoggerFactory', + 'org.slf4j.spi.LocationAwareLogger', 'com.google.protobuf.ExtensionRegistryLite', 'com.google.protobuf.MessageLiteOrBuilder', @@ -145,6 +146,7 @@ thirdPartyAudit.excludes = [ 'io.netty.util.internal.PlatformDependent0$1', 'io.netty.util.internal.PlatformDependent0$2', 'io.netty.util.internal.PlatformDependent0$3', + 'io.netty.util.internal.PlatformDependent0$5', 'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef', 'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef', 'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields', diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.29.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.29.Final.jar.sha1 deleted file mode 100644 index 17798a82aa7..00000000000 --- a/modules/transport-netty4/licenses/netty-buffer-4.1.29.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c3809f72e4b535b343b7dfa3c0c8210dad2fa5ea \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.30.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.30.Final.jar.sha1 new file mode 100644 index 00000000000..070bb3f8332 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-buffer-4.1.30.Final.jar.sha1 @@ -0,0 +1 @@ +597adb653306470fb3ec1af3c0f3f30a37b1310a \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.29.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.29.Final.jar.sha1 deleted file mode 100644 index f892420795b..00000000000 --- a/modules/transport-netty4/licenses/netty-codec-4.1.29.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1651bc2e279216773c234cafe402d68d2a5adc90 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.30.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.30.Final.jar.sha1 new file mode 100644 index 00000000000..cd0786f3e9f --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-4.1.30.Final.jar.sha1 @@ -0,0 +1 @@ +515c8f609aaca28a94f984d89a9667dd3359c1b1 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.29.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.29.Final.jar.sha1 deleted file mode 100644 index aa97345bad1..00000000000 --- a/modules/transport-netty4/licenses/netty-codec-http-4.1.29.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -454688b88cea27a4d407202d1fc79a6522345b5e \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.30.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.30.Final.jar.sha1 new file mode 100644 index 00000000000..e795cce1ba0 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.30.Final.jar.sha1 @@ -0,0 +1 @@ +1384c630e8a0eeef33ad12a28791dce6e1d8767c \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.1.29.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.29.Final.jar.sha1 deleted file mode 100644 index 47140876e6a..00000000000 --- a/modules/transport-netty4/licenses/netty-common-4.1.29.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a5d6a735ed07d8f197daa48db7f097cfc971ee5e \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-common-4.1.30.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.30.Final.jar.sha1 new file mode 100644 index 00000000000..079e35ecc4c --- /dev/null +++ b/modules/transport-netty4/licenses/netty-common-4.1.30.Final.jar.sha1 @@ -0,0 +1 @@ +5dca0c34d8f38af51a2398614e81888f51cf811a \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.29.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.29.Final.jar.sha1 deleted file mode 100644 index 7c2d407f75e..00000000000 --- a/modules/transport-netty4/licenses/netty-handler-4.1.29.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1acf1d94799296a2517533ec75ce7e155e9c4ea7 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.30.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.30.Final.jar.sha1 new file mode 100644 index 00000000000..50b87cdac13 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-handler-4.1.30.Final.jar.sha1 @@ -0,0 +1 @@ +ecc076332ed103411347f4806a44ee32d9d9cb5f \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.29.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.29.Final.jar.sha1 deleted file mode 100644 index bac08f57079..00000000000 --- a/modules/transport-netty4/licenses/netty-resolver-4.1.29.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bbec1dc913732e4773893c14d795b15d6c1e878e \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.30.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.30.Final.jar.sha1 new file mode 100644 index 00000000000..2ef4d895143 --- /dev/null +++ b/modules/transport-netty4/licenses/netty-resolver-4.1.30.Final.jar.sha1 @@ -0,0 +1 @@ +5106fd687066ffd712e5295d32af4e2ac6482613 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.29.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.29.Final.jar.sha1 deleted file mode 100644 index 0ce64132afb..00000000000 --- a/modules/transport-netty4/licenses/netty-transport-4.1.29.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c190b90f70e2ae8a48c068afad709e8728fcaa39 \ No newline at end of file diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.30.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.30.Final.jar.sha1 new file mode 100644 index 00000000000..e4febd661cb --- /dev/null +++ b/modules/transport-netty4/licenses/netty-transport-4.1.30.Final.jar.sha1 @@ -0,0 +1 @@ +3d27bb432a3b125167ac161b26415ad29ec17f02 \ No newline at end of file diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle index d6d1793066a..97ce4330fb5 100644 --- a/plugins/transport-nio/build.gradle +++ b/plugins/transport-nio/build.gradle @@ -29,13 +29,13 @@ dependencies { compile "org.elasticsearch:elasticsearch-nio:${version}" // network stack - compile "io.netty:netty-buffer:4.1.29.Final" - compile "io.netty:netty-codec:4.1.29.Final" - compile "io.netty:netty-codec-http:4.1.29.Final" - compile "io.netty:netty-common:4.1.29.Final" - compile "io.netty:netty-handler:4.1.29.Final" - compile "io.netty:netty-resolver:4.1.29.Final" - compile "io.netty:netty-transport:4.1.29.Final" + compile "io.netty:netty-buffer:${versions.netty}" + compile "io.netty:netty-codec:${versions.netty}" + compile "io.netty:netty-codec-http:${versions.netty}" + compile "io.netty:netty-common:${versions.netty}" + compile "io.netty:netty-handler:${versions.netty}" + compile "io.netty:netty-resolver:${versions.netty}" + compile "io.netty:netty-transport:${versions.netty}" } dependencyLicenses { @@ -90,6 +90,7 @@ thirdPartyAudit.excludes = [ // from io.netty.util.internal.logging.InternalLoggerFactory (netty) - it's optional 'org.slf4j.Logger', 'org.slf4j.LoggerFactory', + 'org.slf4j.spi.LocationAwareLogger', 'com.google.protobuf.ExtensionRegistryLite', 'com.google.protobuf.MessageLiteOrBuilder', @@ -124,6 +125,7 @@ thirdPartyAudit.excludes = [ 'io.netty.util.internal.PlatformDependent0$1', 'io.netty.util.internal.PlatformDependent0$2', 'io.netty.util.internal.PlatformDependent0$3', + 'io.netty.util.internal.PlatformDependent0$5', 'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef', 'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef', 'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields', diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.29.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.29.Final.jar.sha1 deleted file mode 100644 index 17798a82aa7..00000000000 --- a/plugins/transport-nio/licenses/netty-buffer-4.1.29.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c3809f72e4b535b343b7dfa3c0c8210dad2fa5ea \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.30.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.30.Final.jar.sha1 new file mode 100644 index 00000000000..070bb3f8332 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-buffer-4.1.30.Final.jar.sha1 @@ -0,0 +1 @@ +597adb653306470fb3ec1af3c0f3f30a37b1310a \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.29.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.29.Final.jar.sha1 deleted file mode 100644 index f892420795b..00000000000 --- a/plugins/transport-nio/licenses/netty-codec-4.1.29.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1651bc2e279216773c234cafe402d68d2a5adc90 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.30.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.30.Final.jar.sha1 new file mode 100644 index 00000000000..cd0786f3e9f --- /dev/null +++ b/plugins/transport-nio/licenses/netty-codec-4.1.30.Final.jar.sha1 @@ -0,0 +1 @@ +515c8f609aaca28a94f984d89a9667dd3359c1b1 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.29.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.29.Final.jar.sha1 deleted file mode 100644 index aa97345bad1..00000000000 --- a/plugins/transport-nio/licenses/netty-codec-http-4.1.29.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -454688b88cea27a4d407202d1fc79a6522345b5e \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.30.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.30.Final.jar.sha1 new file mode 100644 index 00000000000..e795cce1ba0 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.30.Final.jar.sha1 @@ -0,0 +1 @@ +1384c630e8a0eeef33ad12a28791dce6e1d8767c \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-common-4.1.29.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.29.Final.jar.sha1 deleted file mode 100644 index 47140876e6a..00000000000 --- a/plugins/transport-nio/licenses/netty-common-4.1.29.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a5d6a735ed07d8f197daa48db7f097cfc971ee5e \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-common-4.1.30.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.30.Final.jar.sha1 new file mode 100644 index 00000000000..079e35ecc4c --- /dev/null +++ b/plugins/transport-nio/licenses/netty-common-4.1.30.Final.jar.sha1 @@ -0,0 +1 @@ +5dca0c34d8f38af51a2398614e81888f51cf811a \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.29.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.29.Final.jar.sha1 deleted file mode 100644 index 7c2d407f75e..00000000000 --- a/plugins/transport-nio/licenses/netty-handler-4.1.29.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1acf1d94799296a2517533ec75ce7e155e9c4ea7 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.30.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.30.Final.jar.sha1 new file mode 100644 index 00000000000..50b87cdac13 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-handler-4.1.30.Final.jar.sha1 @@ -0,0 +1 @@ +ecc076332ed103411347f4806a44ee32d9d9cb5f \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.29.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.29.Final.jar.sha1 deleted file mode 100644 index bac08f57079..00000000000 --- a/plugins/transport-nio/licenses/netty-resolver-4.1.29.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bbec1dc913732e4773893c14d795b15d6c1e878e \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.30.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.30.Final.jar.sha1 new file mode 100644 index 00000000000..2ef4d895143 --- /dev/null +++ b/plugins/transport-nio/licenses/netty-resolver-4.1.30.Final.jar.sha1 @@ -0,0 +1 @@ +5106fd687066ffd712e5295d32af4e2ac6482613 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.29.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.29.Final.jar.sha1 deleted file mode 100644 index 0ce64132afb..00000000000 --- a/plugins/transport-nio/licenses/netty-transport-4.1.29.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c190b90f70e2ae8a48c068afad709e8728fcaa39 \ No newline at end of file diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.30.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.30.Final.jar.sha1 new file mode 100644 index 00000000000..e4febd661cb --- /dev/null +++ b/plugins/transport-nio/licenses/netty-transport-4.1.30.Final.jar.sha1 @@ -0,0 +1 @@ +3d27bb432a3b125167ac161b26415ad29ec17f02 \ No newline at end of file