Skip to content

Commit

Permalink
Exclude old version of Google API client libraries
Browse files Browse the repository at this point in the history
Our com.google.apis:google-api-services-datastore-protobuf dependency
has a transitive dependency on a very old Google API client library.
This change suppresses that dependency and replaces it by depending
on a version that matches our other API dependencies.
  • Loading branch information
kennknowles committed Mar 1, 2016
1 parent 211e76a commit d92e83a
Showing 1 changed file with 58 additions and 0 deletions.
58 changes: 58 additions & 0 deletions sdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,28 @@
</exclusions>
</dependency>

<!-- Required by com.google.apis:google-api-services-datastore-protobuf,
but the version they depend on differs from our api-client versions -->
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-jackson</artifactId>
<version>${google-clients.version}</version>
<exclusions>
<!-- Exclude an old version of guava that is being pulled
in by a transitive dependency of google-api-client -->
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava-jdk5</artifactId>
</exclusion>
<!-- Exclude an old version of jackson-core-asl -->
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
</exclusions>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-jackson2</artifactId>
Expand All @@ -558,6 +580,21 @@
</exclusions>
</dependency>

<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-protobuf</artifactId>
<version>${google-clients.version}</version>
<exclusions>
<!-- Exclude an old version of guava that is being pulled
in by a transitive dependency of google-api-client -->
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava-jdk5</artifactId>
</exclusion>
</exclusions>
<scope>runtime</scope>
</dependency>

<dependency>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client-java6</artifactId>
Expand Down Expand Up @@ -597,6 +634,27 @@
<groupId>com.google.guava</groupId>
<artifactId>guava-jdk5</artifactId>
</exclusion>
<!-- Exclude old version of api client dependencies. -->
<exclusion>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.api-client</groupId>
<artifactId>google-api-client</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-jackson</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-protobuf</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down

0 comments on commit d92e83a

Please sign in to comment.