From 53c155f9d70238f952a76d3909c305ceb6df76b2 Mon Sep 17 00:00:00 2001
From: Andrea Lin <andrealin@google.com>
Date: Wed, 11 Jul 2018 16:17:07 -0700
Subject: [PATCH] Bump protobuf java to 3.6.0 (#3449)

Artman uses protoc v3.6.0 (see Dockerfile) to generate the proto and grpc libraries.
---
 google-api-grpc/pom.xml      | 2 +-
 google-cloud-clients/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml
index 478f6b554611..15669c927d43 100644
--- a/google-api-grpc/pom.xml
+++ b/google-api-grpc/pom.xml
@@ -95,7 +95,7 @@
       <dependency>
         <groupId>com.google.protobuf</groupId>
         <artifactId>protobuf-java</artifactId>
-        <version>3.5.1</version>
+        <version>3.6.0</version>
       </dependency>
       <dependency>
         <groupId>io.grpc</groupId>
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 2a8aa9ddefae..e162b8f10db3 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -162,7 +162,7 @@
     <nettyssl.version>2.0.7.Final</nettyssl.version>
     <guava.version>20.0</guava.version>
     <http-client.version>1.23.0</http-client.version>
-    <protobuf.version>3.5.1</protobuf.version>
+    <protobuf.version>3.6.0</protobuf.version>
     <opencensus.version>0.12.3</opencensus.version>
     <!-- test dependency versions -->
     <easymock.version>3.4</easymock.version>