Skip to content

Commit 43784dd

Browse files
author
Ajay Kannan
committed
---
yaml --- r: 1251 b: refs/heads/master c: f87a394 h: refs/heads/master i: 1249: 1cb47eb 1247: 9fad53d v: v3
1 parent 1b885d9 commit 43784dd

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
@@ -1,4 +1,4 @@
11
---
2-
refs/heads/master: 2ef47e869450d14d4a1153bcbff17e1c9c36ea60
2+
refs/heads/master: f87a394379e3ecb662370da5dc5e2b0ddfa4a91f
33
refs/heads/travis: 0fa997e2fc9c6b61b2d91e6d163655aae67d44b6
44
refs/heads/gh-pages: 5a10432ecc75f29812e33a8236c900379509fe99

‎trunk/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>

‎trunk/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)