From 98b33498d85325d22737fb4bd66826519e96755a Mon Sep 17 00:00:00 2001
From: Blake Li <blakeli@google.com>
Date: Tue, 2 Aug 2022 19:38:31 +0000
Subject: [PATCH] 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)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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>
---
 google-cloud-bigtable-stats/pom.xml | 11 +++++++++++
 google-cloud-bigtable/pom.xml       | 18 ++++++++++--------
 pom.xml                             |  2 +-
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml
index 513bbce44f..f16f2c211b 100644
--- a/google-cloud-bigtable-stats/pom.xml
+++ b/google-cloud-bigtable-stats/pom.xml
@@ -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>
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index d286cc436e..e5a8496295 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -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>
@@ -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>
diff --git a/pom.xml b/pom.xml
index 3b98f6cb5d..11db087d5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>