Skip to content

Commit

Permalink
deps: upgrade shared config to 1.5.3, exclude google-http-client and …
Browse files Browse the repository at this point in the history
…google-http-client-gson from gax in google-cloud-bigtable-stats (googleapis#1336)

* deps: upgrade shared config to 1.5.3, remove google-http-client and google-http-client-gson.

* exclude google-http-client and google-http-client-gson from google-cloud-bigtable-stats.

* exclude google-http-client and google-http-client-gson from google-cloud-bigtable-stats.

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* Add comments to explain excluded dependencies.

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
  • Loading branch information
blakeli0 and gcf-owl-bot[bot] authored Aug 2, 2022
1 parent cb539b5 commit 98b3349
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 9 deletions.
11 changes: 11 additions & 0 deletions google-cloud-bigtable-stats/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax</artifactId>
<!-- exclude these dependencies since they are not used and are causing conflict in google-cloud-bigtable -->
<exclusions>
<exclusion>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-gson</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
Expand Down
18 changes: 10 additions & 8 deletions google-cloud-bigtable/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,6 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-gson</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Expand Down Expand Up @@ -270,6 +262,16 @@
<artifactId>opencensus-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-gson</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-shared-config</artifactId>
<version>1.5.1</version>
<version>1.5.3</version>
</parent>

<developers>
Expand Down

0 comments on commit 98b3349

Please sign in to comment.