Skip to content

Commit f87a394

Browse files
author
Ajay Kannan
committed
Fix dependency on two different versions of the GoogleCredential class
1 parent 2ef47e8 commit f87a394

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

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

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