Skip to content

Commit 14287c0

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 6567 b: refs/heads/tswast-patch-1 c: f87a394 h: refs/heads/master i: 6565: 65e5e24 6563: 305ff41 6559: 9cc1d75
1 parent 585f3ea commit 14287c0

3 files changed

Lines changed: 11 additions & 1 deletion

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 2ef47e869450d14d4a1153bcbff17e1c9c36ea60
60+
refs/heads/tswast-patch-1: f87a394379e3ecb662370da5dc5e2b0ddfa4a91f
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

branches/tswast-patch-1/gcloud-java-datastore/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
<artifactId>google-api-services-datastore-protobuf</artifactId>
2828
<version>v1beta2-rev1-2.1.2</version>
2929
<scope>compile</scope>
30+
<exclusions>
31+
<exclusion>
32+
<groupId>com.google.api-client</groupId>
33+
<artifactId>google-api-client</artifactId>
34+
</exclusion>
35+
</exclusions>
3036
</dependency>
3137
<dependency>
3238
<groupId>junit</groupId>

branches/tswast-patch-1/gcloud-java-storage/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
<groupId>com.google.guava</groupId>
3333
<artifactId>guava-jdk5</artifactId>
3434
</exclusion>
35+
<exclusion>
36+
<groupId>com.google.api-client</groupId>
37+
<artifactId>google-api-client</artifactId>
38+
</exclusion>
3539
</exclusions>
3640
</dependency>
3741
<dependency>

0 commit comments

Comments
 (0)