From 80334d5b2f1680dda0e216f1e77d17a5f152f051 Mon Sep 17 00:00:00 2001 From: Carl Mastrangelo Date: Mon, 25 Sep 2017 18:18:17 -0700 Subject: [PATCH] netty: update to 4.1.16 --- build.gradle | 2 +- .../io/grpc/netty/AbstractHttp2Headers.java | 5 +++ repositories.bzl | 40 +++++++++---------- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index 1b36e12774..ed5526c972 100644 --- a/build.gradle +++ b/build.gradle @@ -95,7 +95,7 @@ subprojects { protocPluginBaseName = 'protoc-gen-grpc-java' javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix" - nettyVersion = '4.1.15.Final' + nettyVersion = '4.1.16.Final' guavaVersion = '19.0' protobufVersion = '3.4.0' protocVersion = protobufVersion diff --git a/netty/src/main/java/io/grpc/netty/AbstractHttp2Headers.java b/netty/src/main/java/io/grpc/netty/AbstractHttp2Headers.java index 4a404180c2..00e5fa4f26 100644 --- a/netty/src/main/java/io/grpc/netty/AbstractHttp2Headers.java +++ b/netty/src/main/java/io/grpc/netty/AbstractHttp2Headers.java @@ -25,6 +25,11 @@ import java.util.Set; abstract class AbstractHttp2Headers implements Http2Headers { + @Override + public Iterator valueIterator(CharSequence name) { + throw new UnsupportedOperationException(); + } + @Override public int size() { throw new UnsupportedOperationException(); diff --git a/repositories.bzl b/repositories.bzl index acbc87d2cf..7fce939fa7 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -167,71 +167,71 @@ def com_squareup_okio(): def io_netty_codec_http2(): native.maven_jar( name = "io_netty_netty_codec_http2", - artifact = "io.netty:netty-codec-http2:4.1.14.Final", - sha1 = "00d2af27befab8e1abfbf37d1ac2a5185dce1dbe", + artifact = "io.netty:netty-codec-http2:4.1.16.Final", + sha1 = "45c27cddac120a4fcda8f699659e59389f7b9736", ) def io_netty_buffer(): native.maven_jar( name = "io_netty_netty_buffer", - artifact = "io.netty:netty-buffer:4.1.14.Final", - sha1 = "71f0a707209b1356d924d6f8b2f415f8b8e1cf82", + artifact = "io.netty:netty-buffer:4.1.16.Final", + sha1 = "63b5fa95c74785e16f2c30ce268bc222e35c8cb5", ) def io_netty_common(): native.maven_jar( name = "io_netty_netty_common", - artifact = "io.netty:netty-common:4.1.14.Final", - sha1 = "230ff063651295d2695c0b4e9411e22bbbb9c09d", + artifact = "io.netty:netty-common:4.1.16.Final", + sha1 = "177a6b30cca92f6f5f9873c9befd681377a4c328", ) def io_netty_transport(): native.maven_jar( name = "io_netty_netty_transport", - artifact = "io.netty:netty-transport:4.1.14.Final", - sha1 = "3ed6474f1289635fc0696ec37380e20f258950a2", + artifact = "io.netty:netty-transport:4.1.16.Final", + sha1 = "3c8ee2c4d4a1cbb947a5c184c7aeb2204260958b", ) def io_netty_codec(): native.maven_jar( name = "io_netty_netty_codec", - artifact = "io.netty:netty-codec:4.1.14.Final", - sha1 = "b8573ae401f17e6927f158e4c446311bf0646173", + artifact = "io.netty:netty-codec:4.1.16.Final", + sha1 = "d84a1f21768b7309c2954521cf5a1f46c2309eb1", ) def io_netty_codec_socks(): native.maven_jar( name = "io_netty_netty_codec_socks", - artifact = "io.netty:netty-codec-socks:4.1.14.Final", - sha1 = "b8d856c686ac960b9e9b9f8f9b4083978c161327", + artifact = "io.netty:netty-codec-socks:4.1.16.Final", + sha1 = "f42aabfb1dcae4eaf1700f2c2d047eab3c1b8523", ) def io_netty_codec_http(): native.maven_jar( name = "io_netty_netty_codec_http", - artifact = "io.netty:netty-codec-http:4.1.14.Final", - sha1 = "f287b593a37e516f98c9dae7337303e7254e8ea1", + artifact = "io.netty:netty-codec-http:4.1.16.Final", + sha1 = "d64312378b438dfdad84267c599a053327c6f02a", ) def io_netty_handler(): native.maven_jar( name = "io_netty_netty_handler", - artifact = "io.netty:netty-handler:4.1.14.Final", - sha1 = "626a48b846736c944eb35dd9b0fe0435b76ebf93", + artifact = "io.netty:netty-handler:4.1.16.Final", + sha1 = "fec0e63e7dd7f4eeef7ea8dc47a1ff32dfc7ebc2", ) def io_netty_handler_proxy(): native.maven_jar( name = "io_netty_netty_handler_proxy", - artifact = "io.netty:netty-handler-proxy:4.1.14.Final", - sha1 = "9dbedd6cc6ab9299c927d0c73791d3d8fd76ac20", + artifact = "io.netty:netty-handler-proxy:4.1.16.Final", + sha1 = "e3007ed3368748ccdc35c1f38c7d6c089768373a", ) def io_netty_resolver(): native.maven_jar( name = "io_netty_netty_resolver", - artifact = "io.netty:netty-resolver:4.1.14.Final", - sha1 = "f91e0197522e7d33fce84b3dfd86ade15edb0006", + artifact = "io.netty:netty-resolver:4.1.16.Final", + sha1 = "f6eb553b53fb3a90a8ac1170697093fed82eae28", ) def io_netty_tcnative_boringssl_static():