From d6dde574ce539b11279fd4694de2304da9482a47 Mon Sep 17 00:00:00 2001 From: Jakob Buchgraber Date: Fri, 17 Nov 2017 13:29:41 +0100 Subject: third_party/grpc: Update to version 1.7.0 Change-Id: I9ae0c56844db45e28eb5a08e8180514aa2729fdf --- scripts/bootstrap/compile.sh | 2 +- third_party/BUILD | 6 +++--- third_party/grpc/BUILD | 14 +++++++------- third_party/grpc/README.bazel.md | 2 +- third_party/grpc/grpc-auth-1.6.1.jar | Bin 12420 -> 0 bytes third_party/grpc/grpc-auth-1.7.0.jar | Bin 0 -> 12596 bytes third_party/grpc/grpc-context-1.6.1.jar | Bin 20590 -> 0 bytes third_party/grpc/grpc-context-1.7.0.jar | Bin 0 -> 27302 bytes third_party/grpc/grpc-core-1.6.1.jar | Bin 482507 -> 0 bytes third_party/grpc/grpc-core-1.7.0.jar | Bin 0 -> 501185 bytes third_party/grpc/grpc-netty-1.6.1.jar | Bin 177437 -> 0 bytes third_party/grpc/grpc-netty-1.7.0.jar | Bin 0 -> 179318 bytes third_party/grpc/grpc-protobuf-1.6.1.jar | Bin 5903 -> 0 bytes third_party/grpc/grpc-protobuf-1.7.0.jar | Bin 0 -> 6732 bytes third_party/grpc/grpc-protobuf-lite-1.6.1.jar | Bin 7684 -> 0 bytes third_party/grpc/grpc-protobuf-lite-1.7.0.jar | Bin 0 -> 8024 bytes third_party/grpc/grpc-stub-1.6.1.jar | Bin 37205 -> 0 bytes third_party/grpc/grpc-stub-1.7.0.jar | Bin 0 -> 37147 bytes third_party/netty/README.bazel.md | 2 +- third_party/netty/netty-all-4.1.14.Final.jar | Bin 3690637 -> 0 bytes third_party/netty/netty-all-4.1.16.Final.jar | Bin 0 -> 3765129 bytes .../netty-tcnative-boringssl-static-2.0.5.Final.jar | Bin 2447203 -> 0 bytes .../netty-tcnative-boringssl-static-2.0.6.Final.jar | Bin 0 -> 2713616 bytes third_party/opencensus/README.md | 2 +- third_party/opencensus/opencensus-api-0.5.1.jar | Bin 108344 -> 0 bytes third_party/opencensus/opencensus-api-0.6.0.jar | Bin 0 -> 109541 bytes 26 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 third_party/grpc/grpc-auth-1.6.1.jar create mode 100644 third_party/grpc/grpc-auth-1.7.0.jar delete mode 100644 third_party/grpc/grpc-context-1.6.1.jar create mode 100644 third_party/grpc/grpc-context-1.7.0.jar delete mode 100644 third_party/grpc/grpc-core-1.6.1.jar create mode 100644 third_party/grpc/grpc-core-1.7.0.jar delete mode 100644 third_party/grpc/grpc-netty-1.6.1.jar create mode 100644 third_party/grpc/grpc-netty-1.7.0.jar delete mode 100644 third_party/grpc/grpc-protobuf-1.6.1.jar create mode 100644 third_party/grpc/grpc-protobuf-1.7.0.jar delete mode 100644 third_party/grpc/grpc-protobuf-lite-1.6.1.jar create mode 100644 third_party/grpc/grpc-protobuf-lite-1.7.0.jar delete mode 100644 third_party/grpc/grpc-stub-1.6.1.jar create mode 100644 third_party/grpc/grpc-stub-1.7.0.jar delete mode 100644 third_party/netty/netty-all-4.1.14.Final.jar create mode 100644 third_party/netty/netty-all-4.1.16.Final.jar delete mode 100644 third_party/netty_tcnative/netty-tcnative-boringssl-static-2.0.5.Final.jar create mode 100644 third_party/netty_tcnative/netty-tcnative-boringssl-static-2.0.6.Final.jar delete mode 100644 third_party/opencensus/opencensus-api-0.5.1.jar create mode 100644 third_party/opencensus/opencensus-api-0.6.0.jar diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index a6a411f787..a12b2e356b 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -18,7 +18,7 @@ PROTO_FILES=$(ls src/main/protobuf/*.proto src/main/java/com/google/devtools/build/lib/buildeventstream/proto/*.proto) LIBRARY_JARS=$(find third_party -name '*.jar' | grep -Fv /javac-9-dev-r3297-4.jar | grep -Fv /javac-9-dev-4023-3.jar | grep -Fv /javac7.jar | grep -Fv JavaBuilder | grep -Fv third_party/guava | grep -Fv third_party/guava | grep -ve third_party/grpc/grpc.*jar | tr "\n" " ") -GRPC_JAVA_VERSION=1.6.1 +GRPC_JAVA_VERSION=1.7.0 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e .*${GRPC_JAVA_VERSION}.*jar | tr "\n" " ") GUAVA_VERSIONE=23.1 GUAVA_JARS=$(find third_party/guava -name '*.jar' | grep -e .*${GUAVA_VERSION}.*jar | tr "\n" " ") diff --git a/third_party/BUILD b/third_party/BUILD index 6dd8bb7e71..23f781a791 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -389,7 +389,7 @@ java_import( java_import( name = "opencensus-api", jars = [ - "opencensus/opencensus-api-0.5.1.jar", + "opencensus/opencensus-api-0.6.0.jar", ], ) @@ -452,12 +452,12 @@ java_import( java_import( name = "netty", - jars = ["netty/netty-all-4.1.14.Final.jar"], + jars = ["netty/netty-all-4.1.16.Final.jar"], ) java_import( name = "netty_tcnative", - jars = ["netty_tcnative/netty-tcnative-boringssl-static-2.0.5.Final.jar"], + jars = ["netty_tcnative/netty-tcnative-boringssl-static-2.0.6.Final.jar"], ) java_import( diff --git a/third_party/grpc/BUILD b/third_party/grpc/BUILD index e262b31218..a860113085 100644 --- a/third_party/grpc/BUILD +++ b/third_party/grpc/BUILD @@ -20,13 +20,13 @@ config_setting( filegroup( name = "bootstrap-grpc-jars", srcs = [ - "grpc-auth-1.6.1.jar", - "grpc-netty-1.6.1.jar", - "grpc-protobuf-1.6.1.jar", - "grpc-protobuf-lite-1.6.1.jar", - "grpc-stub-1.6.1.jar", - "grpc-core-1.6.1.jar", - "grpc-context-1.6.1.jar", + "grpc-auth-1.7.0.jar", + "grpc-netty-1.7.0.jar", + "grpc-protobuf-1.7.0.jar", + "grpc-protobuf-lite-1.7.0.jar", + "grpc-stub-1.7.0.jar", + "grpc-core-1.7.0.jar", + "grpc-context-1.7.0.jar", ], ) diff --git a/third_party/grpc/README.bazel.md b/third_party/grpc/README.bazel.md index 4ab44e05da..afdcaf245a 100644 --- a/third_party/grpc/README.bazel.md +++ b/third_party/grpc/README.bazel.md @@ -16,4 +16,4 @@ # How to update the Java code: -Download the necessary jars at version `1.3.0` from maven central. +Download the necessary jars at version `1.7.0` from maven central. diff --git a/third_party/grpc/grpc-auth-1.6.1.jar b/third_party/grpc/grpc-auth-1.6.1.jar deleted file mode 100644 index e39f6bc348..0000000000 Binary files a/third_party/grpc/grpc-auth-1.6.1.jar and /dev/null differ diff --git a/third_party/grpc/grpc-auth-1.7.0.jar b/third_party/grpc/grpc-auth-1.7.0.jar new file mode 100644 index 0000000000..d471b05259 Binary files /dev/null and b/third_party/grpc/grpc-auth-1.7.0.jar differ diff --git a/third_party/grpc/grpc-context-1.6.1.jar b/third_party/grpc/grpc-context-1.6.1.jar deleted file mode 100644 index f6660b4b15..0000000000 Binary files a/third_party/grpc/grpc-context-1.6.1.jar and /dev/null differ diff --git a/third_party/grpc/grpc-context-1.7.0.jar b/third_party/grpc/grpc-context-1.7.0.jar new file mode 100644 index 0000000000..06858e0987 Binary files /dev/null and b/third_party/grpc/grpc-context-1.7.0.jar differ diff --git a/third_party/grpc/grpc-core-1.6.1.jar b/third_party/grpc/grpc-core-1.6.1.jar deleted file mode 100644 index 397af7e95b..0000000000 Binary files a/third_party/grpc/grpc-core-1.6.1.jar and /dev/null differ diff --git a/third_party/grpc/grpc-core-1.7.0.jar b/third_party/grpc/grpc-core-1.7.0.jar new file mode 100644 index 0000000000..e6b6968c85 Binary files /dev/null and b/third_party/grpc/grpc-core-1.7.0.jar differ diff --git a/third_party/grpc/grpc-netty-1.6.1.jar b/third_party/grpc/grpc-netty-1.6.1.jar deleted file mode 100644 index 2ed7a4513a..0000000000 Binary files a/third_party/grpc/grpc-netty-1.6.1.jar and /dev/null differ diff --git a/third_party/grpc/grpc-netty-1.7.0.jar b/third_party/grpc/grpc-netty-1.7.0.jar new file mode 100644 index 0000000000..c73f94dc8b Binary files /dev/null and b/third_party/grpc/grpc-netty-1.7.0.jar differ diff --git a/third_party/grpc/grpc-protobuf-1.6.1.jar b/third_party/grpc/grpc-protobuf-1.6.1.jar deleted file mode 100644 index ef1fe6bbd5..0000000000 Binary files a/third_party/grpc/grpc-protobuf-1.6.1.jar and /dev/null differ diff --git a/third_party/grpc/grpc-protobuf-1.7.0.jar b/third_party/grpc/grpc-protobuf-1.7.0.jar new file mode 100644 index 0000000000..4e25a3117c Binary files /dev/null and b/third_party/grpc/grpc-protobuf-1.7.0.jar differ diff --git a/third_party/grpc/grpc-protobuf-lite-1.6.1.jar b/third_party/grpc/grpc-protobuf-lite-1.6.1.jar deleted file mode 100644 index af60539aaa..0000000000 Binary files a/third_party/grpc/grpc-protobuf-lite-1.6.1.jar and /dev/null differ diff --git a/third_party/grpc/grpc-protobuf-lite-1.7.0.jar b/third_party/grpc/grpc-protobuf-lite-1.7.0.jar new file mode 100644 index 0000000000..6d7b992d9f Binary files /dev/null and b/third_party/grpc/grpc-protobuf-lite-1.7.0.jar differ diff --git a/third_party/grpc/grpc-stub-1.6.1.jar b/third_party/grpc/grpc-stub-1.6.1.jar deleted file mode 100644 index b33e4d7c85..0000000000 Binary files a/third_party/grpc/grpc-stub-1.6.1.jar and /dev/null differ diff --git a/third_party/grpc/grpc-stub-1.7.0.jar b/third_party/grpc/grpc-stub-1.7.0.jar new file mode 100644 index 0000000000..f247141dd8 Binary files /dev/null and b/third_party/grpc/grpc-stub-1.7.0.jar differ diff --git a/third_party/netty/README.bazel.md b/third_party/netty/README.bazel.md index 4ca2527525..c865746bf8 100644 --- a/third_party/netty/README.bazel.md +++ b/third_party/netty/README.bazel.md @@ -1,2 +1,2 @@ -To reproduce this tree, download `netty-4.1.14.Final.jar` from Maven Central. It's under the path +To reproduce this tree, download `netty-4.1.16.Final.jar` from Maven Central. It's under the path `io.netty / netty-all` . diff --git a/third_party/netty/netty-all-4.1.14.Final.jar b/third_party/netty/netty-all-4.1.14.Final.jar deleted file mode 100644 index e5c81377a7..0000000000 Binary files a/third_party/netty/netty-all-4.1.14.Final.jar and /dev/null differ diff --git a/third_party/netty/netty-all-4.1.16.Final.jar b/third_party/netty/netty-all-4.1.16.Final.jar new file mode 100644 index 0000000000..3414576c00 Binary files /dev/null and b/third_party/netty/netty-all-4.1.16.Final.jar differ diff --git a/third_party/netty_tcnative/netty-tcnative-boringssl-static-2.0.5.Final.jar b/third_party/netty_tcnative/netty-tcnative-boringssl-static-2.0.5.Final.jar deleted file mode 100644 index b37e274526..0000000000 Binary files a/third_party/netty_tcnative/netty-tcnative-boringssl-static-2.0.5.Final.jar and /dev/null differ diff --git a/third_party/netty_tcnative/netty-tcnative-boringssl-static-2.0.6.Final.jar b/third_party/netty_tcnative/netty-tcnative-boringssl-static-2.0.6.Final.jar new file mode 100644 index 0000000000..1c4320f4f0 Binary files /dev/null and b/third_party/netty_tcnative/netty-tcnative-boringssl-static-2.0.6.Final.jar differ diff --git a/third_party/opencensus/README.md b/third_party/opencensus/README.md index 0ebb0b90fc..7aca97a558 100644 --- a/third_party/opencensus/README.md +++ b/third_party/opencensus/README.md @@ -1,2 +1,2 @@ Download the opencensus-api artifact from maven central. We currently use -version 0.5.1. +version 0.6.0. diff --git a/third_party/opencensus/opencensus-api-0.5.1.jar b/third_party/opencensus/opencensus-api-0.5.1.jar deleted file mode 100644 index 9d0fae693e..0000000000 Binary files a/third_party/opencensus/opencensus-api-0.5.1.jar and /dev/null differ diff --git a/third_party/opencensus/opencensus-api-0.6.0.jar b/third_party/opencensus/opencensus-api-0.6.0.jar new file mode 100644 index 0000000000..aeff41cee0 Binary files /dev/null and b/third_party/opencensus/opencensus-api-0.6.0.jar differ -- cgit v1.2.3