This is an automated email from the ASF dual-hosted git repository.
iemejia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
commit af9362168606df9ec11319fe706b72466413798c
Merge: 350da8e 137953b
Author: Ismaël Mejía <ieme...@gmail.com>
AuthorDate: Wed Jun 26 15:16:07 2019 +0200
Merge pull request #8942: [BEAM-4948, BEAM-6267, BEAM-5559, BEAM-7289]
Update the version of guava to 26.0-jre for vendored gRPC and guava
.../org/apache/beam/gradle/BeamModulePlugin.groovy | 4 +-
.../org/apache/beam/gradle/GrpcVendoring.groovy | 48 ++++++++++++----------
...rpcVendoring.groovy => GrpcVendoringOld.groovy} | 2 +-
.../org/apache/beam/gradle/VendorJavaPlugin.groovy | 6 +--
settings.gradle | 4 +-
vendor/{grpc-1_13_1 => grpc-1_21_0}/build.gradle | 6 +--
vendor/{guava-20_0 => guava-26_0-jre}/build.gradle | 10 ++---
7 files changed, 43 insertions(+), 37 deletions(-)
