datastore: force import grpc-google-common-protos:0.1.9

pongad · pongad · commit 198591826d76 · 2017-05-03T12:51:38.000+10:00
Also removes grpc-all dependency from top-level pom.xml; it is unused.

Datastore is tested with `mvn verify`.
Depedency versions are shown to not conflict by
creating and compiling a test project that depends
only on google-cloud.
Since it does not inherit the version resolution
from google-cloud-java/pom.xml,
it more closely resembles user project.
diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
@@ -38,11 +38,16 @@
       <version>1.3.0</version>
       <exclusions>
         <exclusion>
-          <artifactId>guava-jdk5</artifactId>
           <groupId>com.google.guava</groupId>
+          <artifactId>guava-jdk5</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>grpc-google-common-protos</artifactId>
+      <version>0.1.9</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -466,11 +466,6 @@
         <artifactId>grpc-protobuf</artifactId>
         <version>${grpc.version}</version>
       </dependency>
-      <dependency>
-          <groupId>io.grpc</groupId>
-          <artifactId>grpc-all</artifactId>
-          <version>${grpc.version}</version>
-      </dependency>
       <dependency>
         <groupId>joda-time</groupId>
         <artifactId>joda-time</artifactId>
