From 4e6b1899df446073f810d6d38505eb5663197d85 Mon Sep 17 00:00:00 2001
From: Mairbek Khadikov <mairbek@google.com>
Date: Mon, 18 Sep 2017 15:03:51 -0700
Subject: [PATCH 1/4] Exclude grpc-google-common-protos:0.1.0 dependency that
 comes from grpc-google-pubsub-v1.

---
 pom.xml                                    | 5 +++++
 sdks/java/io/google-cloud-platform/pom.xml | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/pom.xml b/pom.xml
index a2d6aae0aecf..93663d9dd785 100644
--- a/pom.xml
+++ b/pom.xml
@@ -903,6 +903,11 @@
             <groupId>io.grpc</groupId>
             <artifactId>grpc-all</artifactId>
           </exclusion>
+          <!-- Version 0.1.0 is not compatible with Cloud Spanner. -->
+          <exclusion>
+            <groupId>com.google.api.grpc</groupId>
+            <artifactId>grpc-google-common-protos</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
 
diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml
index 7842bcd58e16..6d88abd3eb20 100644
--- a/sdks/java/io/google-cloud-platform/pom.xml
+++ b/sdks/java/io/google-cloud-platform/pom.xml
@@ -337,6 +337,11 @@
       <artifactId>proto-google-common-protos</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>grpc-google-common-protos</artifactId>
+    </dependency>
+
     <!--  Test dependencies -->
     <dependency>
       <groupId>org.apache.beam</groupId>

From 91deaafbee38c1a115babff061a6efd8642cb8c3 Mon Sep 17 00:00:00 2001
From: Mairbek Khadikov <mairbek@google.com>
Date: Mon, 18 Sep 2017 15:19:13 -0700
Subject: [PATCH 2/4] Runtime scope

---
 sdks/java/io/google-cloud-platform/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml
index 6d88abd3eb20..98651dbbbf30 100644
--- a/sdks/java/io/google-cloud-platform/pom.xml
+++ b/sdks/java/io/google-cloud-platform/pom.xml
@@ -340,6 +340,7 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>grpc-google-common-protos</artifactId>
+      <scope>runtime</scope>
     </dependency>
 
     <!--  Test dependencies -->

From 788d9d71e4a922e5a5f5f622167d6d58b82af925 Mon Sep 17 00:00:00 2001
From: Mairbek Khadikov <mairbek@google.com>
Date: Mon, 18 Sep 2017 18:21:12 -0700
Subject: [PATCH 3/4] Upgrading pubsub grpc library instead

---
 pom.xml                                    | 9 ++-------
 sdks/java/io/google-cloud-platform/pom.xml | 8 +-------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 93663d9dd785..b502c7b6afcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
     <bigquery.version>v2-rev355-1.22.0</bigquery.version>
     <bigtable.version>1.0.0-pre3</bigtable.version>
     <cloudresourcemanager.version>v1-rev6-1.22.0</cloudresourcemanager.version>
-    <pubsubgrpc.version>0.1.0</pubsubgrpc.version>
+    <pubsubgrpc.version>0.1.18</pubsubgrpc.version>
     <clouddebugger.version>v2-rev8-1.22.0</clouddebugger.version>
     <dataflow.version>v1b3-rev198-1.22.0</dataflow.version>
     <dataflow.proto.version>0.5.160222</dataflow.proto.version>
@@ -888,7 +888,7 @@
 
       <dependency>
         <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-pubsub-v1</artifactId>
+        <artifactId>grpc-google-cloud-pubsub-v1</artifactId>
         <version>${pubsubgrpc.version}</version>
         <exclusions>
           <!-- Exclude an old version of guava that is being pulled in by a transitive
@@ -903,11 +903,6 @@
             <groupId>io.grpc</groupId>
             <artifactId>grpc-all</artifactId>
           </exclusion>
-          <!-- Version 0.1.0 is not compatible with Cloud Spanner. -->
-          <exclusion>
-            <groupId>com.google.api.grpc</groupId>
-            <artifactId>grpc-google-common-protos</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
 
diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml
index 98651dbbbf30..b7454bebfd5c 100644
--- a/sdks/java/io/google-cloud-platform/pom.xml
+++ b/sdks/java/io/google-cloud-platform/pom.xml
@@ -187,7 +187,7 @@
 
     <dependency>
       <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-pubsub-v1</artifactId>
+      <artifactId>grpc-google-cloud-pubsub-v1</artifactId>
     </dependency>
 
     <dependency>
@@ -337,12 +337,6 @@
       <artifactId>proto-google-common-protos</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-common-protos</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-
     <!--  Test dependencies -->
     <dependency>
       <groupId>org.apache.beam</groupId>

From 8c54b6e59d6d844d9d7508c84754d4e9fc9a4836 Mon Sep 17 00:00:00 2001
From: Mairbek Khadikov <mairbek@google.com>
Date: Tue, 19 Sep 2017 12:25:29 -0700
Subject: [PATCH 4/4] Cleanup deps to make maven great again

---
 pom.xml                                    | 6 ++++++
 sdks/java/io/google-cloud-platform/pom.xml | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/pom.xml b/pom.xml
index b502c7b6afcf..236645cb9892 100644
--- a/pom.xml
+++ b/pom.xml
@@ -906,6 +906,12 @@
         </exclusions>
       </dependency>
 
+      <dependency>
+        <groupId>com.google.api.grpc</groupId>
+        <artifactId>proto-google-cloud-pubsub-v1</artifactId>
+        <version>${pubsubgrpc.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml
index b7454bebfd5c..1bce68339f70 100644
--- a/sdks/java/io/google-cloud-platform/pom.xml
+++ b/sdks/java/io/google-cloud-platform/pom.xml
@@ -190,6 +190,11 @@
       <artifactId>grpc-google-cloud-pubsub-v1</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>proto-google-cloud-pubsub-v1</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>com.google.cloud.bigdataoss</groupId>
       <artifactId>util</artifactId>