Skip to content

Commit 98b3349

Browse files
deps: upgrade shared config to 1.5.3, exclude google-http-client and google-http-client-gson from gax in google-cloud-bigtable-stats (#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>
1 parent cb539b5 commit 98b3349

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

google-cloud-bigtable-stats/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@
3232
<dependency>
3333
<groupId>com.google.api</groupId>
3434
<artifactId>gax</artifactId>
35+
<!-- exclude these dependencies since they are not used and are causing conflict in google-cloud-bigtable -->
36+
<exclusions>
37+
<exclusion>
38+
<groupId>com.google.http-client</groupId>
39+
<artifactId>google-http-client</artifactId>
40+
</exclusion>
41+
<exclusion>
42+
<groupId>com.google.http-client</groupId>
43+
<artifactId>google-http-client-gson</artifactId>
44+
</exclusion>
45+
</exclusions>
3546
</dependency>
3647
<dependency>
3748
<groupId>com.google.api</groupId>

google-cloud-bigtable/pom.xml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,6 @@
122122
<groupId>com.google.guava</groupId>
123123
<artifactId>guava</artifactId>
124124
</dependency>
125-
<dependency>
126-
<groupId>com.google.http-client</groupId>
127-
<artifactId>google-http-client</artifactId>
128-
</dependency>
129-
<dependency>
130-
<groupId>com.google.http-client</groupId>
131-
<artifactId>google-http-client-gson</artifactId>
132-
</dependency>
133125
<dependency>
134126
<groupId>com.google.protobuf</groupId>
135127
<artifactId>protobuf-java</artifactId>
@@ -270,6 +262,16 @@
270262
<artifactId>opencensus-impl</artifactId>
271263
<scope>test</scope>
272264
</dependency>
265+
<dependency>
266+
<groupId>com.google.http-client</groupId>
267+
<artifactId>google-http-client</artifactId>
268+
<scope>test</scope>
269+
</dependency>
270+
<dependency>
271+
<groupId>com.google.http-client</groupId>
272+
<artifactId>google-http-client-gson</artifactId>
273+
<scope>test</scope>
274+
</dependency>
273275
<dependency>
274276
<groupId>junit</groupId>
275277
<artifactId>junit</artifactId>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>google-cloud-shared-config</artifactId>
17-
<version>1.5.1</version>
17+
<version>1.5.3</version>
1818
</parent>
1919

2020
<developers>

0 commit comments

Comments
 (0)