From 4b1e5d4b2df821c7a36fb86442d72d1faa246924 Mon Sep 17 00:00:00 2001 From: Chanseok Oh Date: Fri, 13 Aug 2021 10:18:54 -0400 Subject: [PATCH 1/5] Downgrade Google HTTP libraries --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 669d45106e..5353e05dea 100644 --- a/build.gradle +++ b/build.gradle @@ -58,9 +58,9 @@ subprojects { // For Google libraries, check the following boms for best compatibility. // - https://github.com/googleapis/java-shared-dependencies // - https://github.com/googleapis/java-cloud-bom - GOOGLE_HTTP_CLIENT: 'com.google.http-client:google-http-client:1.39.2', - GOOGLE_HTTP_CLIENT_APACHE_V2: 'com.google.http-client:google-http-client-apache-v2:1.39.2', - GOOGLE_AUTH_LIBRARY_OAUTH2_HTTP: 'com.google.auth:google-auth-library-oauth2-http:1.0.0', + GOOGLE_HTTP_CLIENT: 'com.google.http-client:google-http-client:1.34.0', + GOOGLE_HTTP_CLIENT_APACHE_V2: 'com.google.http-client:google-http-client-apache-v2:1.34.0', + GOOGLE_AUTH_LIBRARY_OAUTH2_HTTP: 'com.google.auth:google-auth-library-oauth2-http:0.18.0', GUAVA: 'com.google.guava:guava:30.1.1-jre', JSR305: 'com.google.code.findbugs:jsr305:3.0.2', // transitively pulled in by GUAVA From 89c36a37a636f9b13cb381acab5969aed99b33d9 Mon Sep 17 00:00:00 2001 From: Chanseok Oh Date: Fri, 13 Aug 2021 10:23:38 -0400 Subject: [PATCH 2/5] Downgrade Google HTTP libraries --- jib-cli/CHANGELOG.md | 2 +- jib-core/CHANGELOG.md | 2 +- jib-gradle-plugin/CHANGELOG.md | 2 ++ jib-maven-plugin-extension-api/CHANGELOG.md | 2 -- jib-maven-plugin/CHANGELOG.md | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/jib-cli/CHANGELOG.md b/jib-cli/CHANGELOG.md index 25acca1aec..995e334c98 100644 --- a/jib-cli/CHANGELOG.md +++ b/jib-cli/CHANGELOG.md @@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Upgraded Google HTTP libraries to 1.39.2. ([#3387](https://github.com/GoogleContainerTools/jib/pull/3387)) +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#xxxx](https://github.com/GoogleContainerTools/jib/pull/xxxx)) ### Fixed diff --git a/jib-core/CHANGELOG.md b/jib-core/CHANGELOG.md index 49baa22a14..d31d1af966 100644 --- a/jib-core/CHANGELOG.md +++ b/jib-core/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Upgraded Google HTTP libraries to 1.39.2. ([#3387](https://github.com/GoogleContainerTools/jib/pull/3387)) +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#xxxx](https://github.com/GoogleContainerTools/jib/pull/xxxx)) ### Fixed diff --git a/jib-gradle-plugin/CHANGELOG.md b/jib-gradle-plugin/CHANGELOG.md index c401b5733b..33120100cb 100644 --- a/jib-gradle-plugin/CHANGELOG.md +++ b/jib-gradle-plugin/CHANGELOG.md @@ -7,6 +7,8 @@ All notable changes to this project will be documented in this file. ### Changed +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#xxxx](https://github.com/GoogleContainerTools/jib/pull/xxxx)) + ### Fixed ## 3.1.3 diff --git a/jib-maven-plugin-extension-api/CHANGELOG.md b/jib-maven-plugin-extension-api/CHANGELOG.md index a74e522e2a..2a19f8f179 100644 --- a/jib-maven-plugin-extension-api/CHANGELOG.md +++ b/jib-maven-plugin-extension-api/CHANGELOG.md @@ -14,5 +14,3 @@ All notable changes to this project will be documented in this file. ### Changed - Upgraded jib-build-plan to 0.4.0. ([#2660](https://github.com/GoogleContainerTools/jib/pull/2660)) - - diff --git a/jib-maven-plugin/CHANGELOG.md b/jib-maven-plugin/CHANGELOG.md index aa16f586d7..7fd282ccdd 100644 --- a/jib-maven-plugin/CHANGELOG.md +++ b/jib-maven-plugin/CHANGELOG.md @@ -7,6 +7,8 @@ All notable changes to this project will be documented in this file. ### Changed +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#xxxx](https://github.com/GoogleContainerTools/jib/pull/xxxx)) + ### Fixed ## 3.1.3 From 2149d968244663a7bc78a25d9f639849cc146dde Mon Sep 17 00:00:00 2001 From: Chanseok Oh Date: Fri, 13 Aug 2021 10:27:40 -0400 Subject: [PATCH 3/5] Update CHANGELOGs --- jib-cli/CHANGELOG.md | 2 +- jib-core/CHANGELOG.md | 2 +- jib-gradle-plugin/CHANGELOG.md | 2 +- jib-maven-plugin/CHANGELOG.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jib-cli/CHANGELOG.md b/jib-cli/CHANGELOG.md index 995e334c98..c68d8176e4 100644 --- a/jib-cli/CHANGELOG.md +++ b/jib-cli/CHANGELOG.md @@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#xxxx](https://github.com/GoogleContainerTools/jib/pull/xxxx)) +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415)) ### Fixed diff --git a/jib-core/CHANGELOG.md b/jib-core/CHANGELOG.md index d31d1af966..5236508a24 100644 --- a/jib-core/CHANGELOG.md +++ b/jib-core/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#xxxx](https://github.com/GoogleContainerTools/jib/pull/xxxx)) +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415)) ### Fixed diff --git a/jib-gradle-plugin/CHANGELOG.md b/jib-gradle-plugin/CHANGELOG.md index 33120100cb..1ad46a45ca 100644 --- a/jib-gradle-plugin/CHANGELOG.md +++ b/jib-gradle-plugin/CHANGELOG.md @@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#xxxx](https://github.com/GoogleContainerTools/jib/pull/xxxx)) +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415)) ### Fixed diff --git a/jib-maven-plugin/CHANGELOG.md b/jib-maven-plugin/CHANGELOG.md index 7fd282ccdd..48696af889 100644 --- a/jib-maven-plugin/CHANGELOG.md +++ b/jib-maven-plugin/CHANGELOG.md @@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#xxxx](https://github.com/GoogleContainerTools/jib/pull/xxxx)) +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415)) ### Fixed From 61a0f1ec903a97c256927d7d7232e518220ab718 Mon Sep 17 00:00:00 2001 From: Chanseok Oh Date: Fri, 13 Aug 2021 10:30:39 -0400 Subject: [PATCH 4/5] Update CHANGELOGs --- jib-cli/CHANGELOG.md | 2 +- jib-core/CHANGELOG.md | 2 +- jib-gradle-plugin/CHANGELOG.md | 2 +- jib-maven-plugin/CHANGELOG.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jib-cli/CHANGELOG.md b/jib-cli/CHANGELOG.md index c68d8176e4..f0aa7fdcd1 100644 --- a/jib-cli/CHANGELOG.md +++ b/jib-cli/CHANGELOG.md @@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415)) +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415), [#3058](https://github.com/GoogleContainerTools/jib/issue/3058), [#3409](https://github.com/GoogleContainerTools/jib/issue/3409)) ### Fixed diff --git a/jib-core/CHANGELOG.md b/jib-core/CHANGELOG.md index 5236508a24..4eed874492 100644 --- a/jib-core/CHANGELOG.md +++ b/jib-core/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415)) +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415), [#3058](https://github.com/GoogleContainerTools/jib/issue/3058), [#3409](https://github.com/GoogleContainerTools/jib/issue/3409)) ### Fixed diff --git a/jib-gradle-plugin/CHANGELOG.md b/jib-gradle-plugin/CHANGELOG.md index 1ad46a45ca..ad964f815d 100644 --- a/jib-gradle-plugin/CHANGELOG.md +++ b/jib-gradle-plugin/CHANGELOG.md @@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415)) +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415), [#3058](https://github.com/GoogleContainerTools/jib/issue/3058), [#3409](https://github.com/GoogleContainerTools/jib/issue/3409)) ### Fixed diff --git a/jib-maven-plugin/CHANGELOG.md b/jib-maven-plugin/CHANGELOG.md index 48696af889..7ef74e5508 100644 --- a/jib-maven-plugin/CHANGELOG.md +++ b/jib-maven-plugin/CHANGELOG.md @@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3058](https://github.com/GoogleContainerTools/jib/issue/3058) and [#3409](https://github.com/GoogleContainerTools/jib/issue/3409])) ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415)) +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415), [#3058](https://github.com/GoogleContainerTools/jib/issue/3058), [#3409](https://github.com/GoogleContainerTools/jib/issue/3409)) ### Fixed From 078d0ebaf445962b2a6aa8287a10296ca4de6b6b Mon Sep 17 00:00:00 2001 From: Chanseok Oh Date: Fri, 13 Aug 2021 10:32:41 -0400 Subject: [PATCH 5/5] Update CHANGELOGs --- jib-cli/CHANGELOG.md | 2 +- jib-core/CHANGELOG.md | 2 +- jib-gradle-plugin/CHANGELOG.md | 2 +- jib-maven-plugin/CHANGELOG.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jib-cli/CHANGELOG.md b/jib-cli/CHANGELOG.md index f0aa7fdcd1..47ec75290f 100644 --- a/jib-cli/CHANGELOG.md +++ b/jib-cli/CHANGELOG.md @@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415), [#3058](https://github.com/GoogleContainerTools/jib/issue/3058), [#3409](https://github.com/GoogleContainerTools/jib/issue/3409)) +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415), [#3058](https://github.com/GoogleContainerTools/jib/issues/3058), [#3409](https://github.com/GoogleContainerTools/jib/issues/3409)) ### Fixed diff --git a/jib-core/CHANGELOG.md b/jib-core/CHANGELOG.md index 4eed874492..de302ef29f 100644 --- a/jib-core/CHANGELOG.md +++ b/jib-core/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415), [#3058](https://github.com/GoogleContainerTools/jib/issue/3058), [#3409](https://github.com/GoogleContainerTools/jib/issue/3409)) +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415), [#3058](https://github.com/GoogleContainerTools/jib/issues/3058), [#3409](https://github.com/GoogleContainerTools/jib/issues/3409)) ### Fixed diff --git a/jib-gradle-plugin/CHANGELOG.md b/jib-gradle-plugin/CHANGELOG.md index ad964f815d..5176aa9bd7 100644 --- a/jib-gradle-plugin/CHANGELOG.md +++ b/jib-gradle-plugin/CHANGELOG.md @@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415), [#3058](https://github.com/GoogleContainerTools/jib/issue/3058), [#3409](https://github.com/GoogleContainerTools/jib/issue/3409)) +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415), [#3058](https://github.com/GoogleContainerTools/jib/issues/3058), [#3409](https://github.com/GoogleContainerTools/jib/issues/3409)) ### Fixed diff --git a/jib-maven-plugin/CHANGELOG.md b/jib-maven-plugin/CHANGELOG.md index 7ef74e5508..846ceacff6 100644 --- a/jib-maven-plugin/CHANGELOG.md +++ b/jib-maven-plugin/CHANGELOG.md @@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415), [#3058](https://github.com/GoogleContainerTools/jib/issue/3058), [#3409](https://github.com/GoogleContainerTools/jib/issue/3409)) +- Downgraded Google HTTP libraries to 1.34.0 to resolve network issues. ([#3415](https://github.com/GoogleContainerTools/jib/pull/3415), [#3058](https://github.com/GoogleContainerTools/jib/issues/3058), [#3409](https://github.com/GoogleContainerTools/jib/issues/3409)) ### Fixed