From 34c318ca1c5a39f6a1f6c13366d610dc212d93b5 Mon Sep 17 00:00:00 2001
From: Blake Li <blakeli@google.com>
Date: Tue, 2 Aug 2022 11:02:10 -0400
Subject: [PATCH 1/5] deps: upgrade shared config to 1.5.3, remove
 google-http-client and google-http-client-gson.

---
 google-cloud-bigtable/pom.xml | 8 --------
 pom.xml                       | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index 52de0112a6..18d97bc82a 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>
diff --git a/pom.xml b/pom.xml
index 29f91318a4..bdff73ae89 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>

From a68d5e968fd9562585a10067d3980326b6b01f8f Mon Sep 17 00:00:00 2001
From: Blake Li <blakeli@google.com>
Date: Tue, 2 Aug 2022 11:12:27 -0400
Subject: [PATCH 2/5] exclude google-http-client and google-http-client-gson
 from google-cloud-bigtable-stats.

---
 google-cloud-bigtable/pom.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index 18d97bc82a..77de24c0ba 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -64,6 +64,16 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-bigtable-stats</artifactId>
+      <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>
     <!-- Production dependencies -->
     <dependency>
@@ -262,6 +272,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>

From 1cbfa75dcfca66ad00b136629cdce602bf90bed0 Mon Sep 17 00:00:00 2001
From: Blake Li <blakeli@google.com>
Date: Tue, 2 Aug 2022 11:30:57 -0400
Subject: [PATCH 3/5] exclude google-http-client and google-http-client-gson
 from google-cloud-bigtable-stats.

---
 google-cloud-bigtable-stats/pom.xml | 10 ++++++++++
 google-cloud-bigtable/pom.xml       | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml
index c7c4a58748..b8261cc578 100644
--- a/google-cloud-bigtable-stats/pom.xml
+++ b/google-cloud-bigtable-stats/pom.xml
@@ -32,6 +32,16 @@
         <dependency>
             <groupId>com.google.api</groupId>
             <artifactId>gax</artifactId>
+            <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 77de24c0ba..de2ab8870e 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -64,16 +64,6 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-bigtable-stats</artifactId>
-      <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>
     <!-- Production dependencies -->
     <dependency>

From 014bf39cd3888b1cce6567fcb0b4a3a060180b52 Mon Sep 17 00:00:00 2001
From: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 15:44:44 +0000
Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?=
 =?UTF-8?q?st-processor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6348e79d25..8680353195 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-bigtable'
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-bigtable:2.10.0'
+implementation 'com.google.cloud:google-cloud-bigtable:2.10.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.10.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.10.1"
 ```
 
 ## Authentication

From 2703c0d7b2934a69b36d30cc41db8134b6518a4b Mon Sep 17 00:00:00 2001
From: Blake Li <blakeli@google.com>
Date: Tue, 2 Aug 2022 13:58:00 -0400
Subject: [PATCH 5/5] Add comments to explain excluded dependencies.

---
 google-cloud-bigtable-stats/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/google-cloud-bigtable-stats/pom.xml b/google-cloud-bigtable-stats/pom.xml
index b8261cc578..41e6c89237 100644
--- a/google-cloud-bigtable-stats/pom.xml
+++ b/google-cloud-bigtable-stats/pom.xml
@@ -32,6 +32,7 @@
         <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>