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 @@
pom
import
+
+
+
+ org.apache.httpcomponents
+ httpcore
+ 4.4.13
+
+
+ org.apache.httpcomponents
+ httpclient
+ 4.5.13
+
+
com.google.api
api-common
@@ -155,6 +168,16 @@
pom
import
+
+ com.google.oauth-client
+ google-oauth-client
+ 1.31.5
+
+
+ com.google.oauth-client
+ google-oauth-client-java6
+ 1.31.5
+
com.google.api-client
google-api-client-bom
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 @@
org.apache.httpcomponents
httpcore
- 4.4.13
+ 4.4.14
org.apache.httpcomponents
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 @@
1.95.3
0.26.0
1.39.2
+ 1.31.5
1.31.5
2.8.7
1.5.1
@@ -76,6 +77,8 @@
2.7.1
2.12.3
1.15
+ 4.4.14
+ 4.5.13
@@ -119,12 +122,12 @@
org.apache.httpcomponents
httpcore
- 4.4.14
+ ${httpcomponents.httpcore.version}
org.apache.httpcomponents
httpclient
- 4.5.13
+ ${httpcomponents.httpclient.version}
@@ -170,13 +173,10 @@
com.google.oauth-client
- google-oauth-client
- 1.31.5
-
-
- com.google.oauth-client
- google-oauth-client-java6
- 1.31.5
+ google-oauth-client-bom
+ ${google.oauth-client.version}
+ pom
+ import
com.google.api-client