From ad707ef1ad4efeb7f937920a5963b8e453565b7b Mon Sep 17 00:00:00 2001
From: dpcollins-google <40498610+dpcollins-google@users.noreply.github.com>
Date: Thu, 24 Jun 2021 16:00:15 -0400
Subject: [PATCH 1/3] fix: Add common httpclient and oauth dependencies to
 java-shared-dependencies

---
 pom.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pom.xml b/pom.xml
index 07bdccb5..d08c621e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,6 +114,19 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      
+      
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>4.4.13</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>4.5.13</version>
+      </dependency>
+
       <dependency>
         <groupId>com.google.api</groupId>
         <artifactId>api-common</artifactId>
@@ -155,6 +168,16 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.oauth-client</groupId>
+        <artifactId>google-oauth-client</artifactId>
+        <version>1.31.5</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.oauth-client</groupId>
+        <artifactId>google-oauth-client-java6</artifactId>
+        <version>1.31.5</version>
+      </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client-bom</artifactId>

From 2b43d778da4b9e55821ca53a8e3f4b62852c80b1 Mon Sep 17 00:00:00 2001
From: dpcollins-google <40498610+dpcollins-google@users.noreply.github.com>
Date: Thu, 24 Jun 2021 16:11:01 -0400
Subject: [PATCH 2/3] fix: httpcore version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d08c621e..c5d64288 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
-        <version>4.4.13</version>
+        <version>4.4.14</version>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>

From 2022be24a02ebfa95734ff48c237baac87a0a931 Mon Sep 17 00:00:00 2001
From: dpcollins-google <40498610+dpcollins-google@users.noreply.github.com>
Date: Thu, 24 Jun 2021 17:20:11 -0400
Subject: [PATCH 3/3] fix: address comments

---
 pom.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index c5d64288..9374f962 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,7 @@
     <google.core.version>1.95.3</google.core.version>
     <google.auth.version>0.26.0</google.auth.version>
     <google.http-client.version>1.39.2</google.http-client.version>
+    <google.oauth-client.version>1.31.5</google.oauth-client.version>
     <google.api-client.version>1.31.5</google.api-client.version>
     <gson.version>2.8.7</gson.version>
     <threeten.version>1.5.1</threeten.version>
@@ -76,6 +77,8 @@
     <errorprone.version>2.7.1</errorprone.version>
     <jackson.version>2.12.3</jackson.version>
     <codec.version>1.15</codec.version>
+    <httpcomponents.httpcore.version>4.4.14</httpcomponents.httpcore.version>
+    <httpcomponents.httpclient.version>4.5.13</httpcomponents.httpclient.version>
   </properties>
 
   <dependencyManagement>
@@ -119,12 +122,12 @@
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
-        <version>4.4.14</version>
+        <version>${httpcomponents.httpcore.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
-        <version>4.5.13</version>
+        <version>${httpcomponents.httpclient.version}</version>
       </dependency>
 
       <dependency>
@@ -170,13 +173,10 @@
       </dependency>
       <dependency>
         <groupId>com.google.oauth-client</groupId>
-        <artifactId>google-oauth-client</artifactId>
-        <version>1.31.5</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.oauth-client</groupId>
-        <artifactId>google-oauth-client-java6</artifactId>
-        <version>1.31.5</version>
+        <artifactId>google-oauth-client-bom</artifactId>
+        <version>${google.oauth-client.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>