From 0a3ef390edf09898d88887eba236c793bcfb6dd5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 4 Jan 2023 17:16:14 +0000 Subject: [PATCH 01/24] chore(main): release 2.1.3-SNAPSHOT (#2218) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- google-api-client-android/pom.xml | 2 +- google-api-client-appengine/pom.xml | 2 +- google-api-client-assembly/pom.xml | 2 +- google-api-client-bom/pom.xml | 22 +++++++++++----------- google-api-client-gson/pom.xml | 2 +- google-api-client-jackson2/pom.xml | 2 +- google-api-client-java6/pom.xml | 2 +- google-api-client-protobuf/pom.xml | 2 +- google-api-client-servlet/pom.xml | 2 +- google-api-client-xml/pom.xml | 2 +- google-api-client/pom.xml | 2 +- pom.xml | 2 +- versions.txt | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index 99fbe5f3f..801b0eb07 100644 --- a/google-api-client-android/pom.xml +++ b/google-api-client-android/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.2 + 2.1.3-SNAPSHOT ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index ea6ec4215..7e8967d9e 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.2 + 2.1.3-SNAPSHOT ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 327335e63..8cc4800ba 100644 --- a/google-api-client-assembly/pom.xml +++ b/google-api-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.2 + 2.1.3-SNAPSHOT ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index 75e975003..29573562e 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api-client google-api-client-bom - 2.1.2 + 2.1.3-SNAPSHOT pom Google API Client Library for Java BOM @@ -63,53 +63,53 @@ com.google.api-client google-api-client - 2.1.2 + 2.1.3-SNAPSHOT com.google.api-client google-api-client-android - 2.1.2 + 2.1.3-SNAPSHOT com.google.api-client google-api-client-appengine - 2.1.2 + 2.1.3-SNAPSHOT com.google.api-client google-api-client-assembly - 2.1.2 + 2.1.3-SNAPSHOT pom com.google.api-client google-api-client-gson - 2.1.2 + 2.1.3-SNAPSHOT com.google.api-client google-api-client-jackson2 - 2.1.2 + 2.1.3-SNAPSHOT com.google.api-client google-api-client-java6 - 2.1.2 + 2.1.3-SNAPSHOT com.google.api-client google-api-client-protobuf - 2.1.2 + 2.1.3-SNAPSHOT com.google.api-client google-api-client-servlet - 2.1.2 + 2.1.3-SNAPSHOT com.google.api-client google-api-client-xml - 2.1.2 + 2.1.3-SNAPSHOT diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index 8c8dd5c07..03089f59d 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.2 + 2.1.3-SNAPSHOT ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index a7a7c4b2c..1dd2d619d 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.2 + 2.1.3-SNAPSHOT ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index 08dfa99cf..d9e8514a5 100644 --- a/google-api-client-java6/pom.xml +++ b/google-api-client-java6/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.2 + 2.1.3-SNAPSHOT ../pom.xml google-api-client-java6 diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index 1f10ce4c6..e41f87bf1 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.2 + 2.1.3-SNAPSHOT ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index 5ad7b47f7..40af231c8 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.2 + 2.1.3-SNAPSHOT ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index 548cbb9e8..b37e51a9a 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.2 + 2.1.3-SNAPSHOT ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 477e89299..e2dda4657 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.2 + 2.1.3-SNAPSHOT ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index ecf8edabc..f71d0fd43 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api-client google-api-client-parent - 2.1.2 + 2.1.3-SNAPSHOT pom Parent for the Google API Client Library for Java The Google APIs Client Library for Java is a Java client library diff --git a/versions.txt b/versions.txt index 60034d20d..523ae8a12 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:2.1.2:2.1.2 +google-api-client:2.1.2:2.1.3-SNAPSHOT From 6598fdeee6b28842c183f1e84560a4101a92f227 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 18 Jan 2023 15:14:13 +0000 Subject: [PATCH 02/24] chore(deps): update dependency google-auth to v2.16.0 (#2220) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google-auth](https://togithub.com/googleapis/google-auth-library-python) | `==2.14.1` -> `==2.16.0` | [![age](https://badges.renovateapi.com/packages/pypi/google-auth/2.16.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/google-auth/2.16.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/google-auth/2.16.0/compatibility-slim/2.14.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/google-auth/2.16.0/confidence-slim/2.14.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### ⚠ Dependency Lookup Warnings ⚠ Warnings were logged while processing this repo. Please check the Dependency Dashboard for more information. --- ### Release Notes
googleapis/google-auth-library-python ### [`v2.16.0`](https://togithub.com/googleapis/google-auth-library-python/blob/HEAD/CHANGELOG.md#​2160-httpsgithubcomgoogleapisgoogle-auth-library-pythoncomparev2150v2160-2023-01-09) [Compare Source](https://togithub.com/googleapis/google-auth-library-python/compare/v2.15.0...v2.16.0) ##### Features - AwsCredentials should not call metadata server if security creds and region are retrievable through the environment variables ([#​1195](https://togithub.com/googleapis/google-auth-library-python/issues/1195)) ([5e27c8f](https://togithub.com/googleapis/google-auth-library-python/commit/5e27c8f213b2e19ec504a04e1f95fc1333ea9e1e)) - Wrap all python built-in exceptions into library excpetions ([#​1191](https://togithub.com/googleapis/google-auth-library-python/issues/1191)) ([a83af39](https://togithub.com/googleapis/google-auth-library-python/commit/a83af399fe98764ee851997bf3078ec45a9b51c9)) ##### Bug Fixes - Allow get_project_id to take a request ([#​1203](https://togithub.com/googleapis/google-auth-library-python/issues/1203)) ([9a4d23a](https://togithub.com/googleapis/google-auth-library-python/commit/9a4d23a28eb4b9aa9e457ad053c087a0450eb298)) - Make OAUTH2.0 client resistant to string type 'expires_in' responses from non-compliant services ([#​1208](https://togithub.com/googleapis/google-auth-library-python/issues/1208)) ([9fc7b1c](https://togithub.com/googleapis/google-auth-library-python/commit/9fc7b1c5613366cc1ad7186f894cec26a5f2231e)) ### [`v2.15.0`](https://togithub.com/googleapis/google-auth-library-python/blob/HEAD/CHANGELOG.md#​2150-httpsgithubcomgoogleapisgoogle-auth-library-pythoncomparev2141v2150-2022-12-01) [Compare Source](https://togithub.com/googleapis/google-auth-library-python/compare/v2.14.1...v2.15.0) ##### Features - Add api_key credentials ([#​1184](https://togithub.com/googleapis/google-auth-library-python/issues/1184)) ([370293e](https://togithub.com/googleapis/google-auth-library-python/commit/370293e84a14af0d6c6b34287bdcad020e0580e4)) - Introduce a way to provide scopes granted by user ([#​1189](https://togithub.com/googleapis/google-auth-library-python/issues/1189)) ([189f504](https://togithub.com/googleapis/google-auth-library-python/commit/189f504cbdfe043949688dfe55f3f449befad991)) ##### Bug Fixes - Allow mtls sts endpoint for external account token urls. ([#​1185](https://togithub.com/googleapis/google-auth-library-python/issues/1185)) ([c86dd69](https://togithub.com/googleapis/google-auth-library-python/commit/c86dd69cf79809e2d532a745a236db840fd8bc5d)) - CI broken by removal of py.path ([#​1194](https://togithub.com/googleapis/google-auth-library-python/issues/1194)) ([f719415](https://togithub.com/googleapis/google-auth-library-python/commit/f719415475e10e5af9ec75b3b13c57c25682bea0)) - Ensure JWT segments have the right types ([#​1162](https://togithub.com/googleapis/google-auth-library-python/issues/1162)) ([fc843cd](https://togithub.com/googleapis/google-auth-library-python/commit/fc843cd318e4ac4f40cf83bbcd7c6eae2b597ff8)) - Updated the lower bound of interactive timeout and fix the kwarg… ([#​1182](https://togithub.com/googleapis/google-auth-library-python/issues/1182)) ([50c0fd2](https://togithub.com/googleapis/google-auth-library-python/commit/50c0fd29a3b6a4fd6dc4b801d883f5d2b6de88c6))
--- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-api-java-client). From 01c85611f370ba0420cf90ed78c25784d9b2717a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 15:14:18 +0000 Subject: [PATCH 03/24] chore(deps): bump certifi from 2022.9.24 to 2022.12.7 in /.kokoro (#2207) Bumps [certifi](https://togithub.com/certifi/python-certifi) from 2022.9.24 to 2022.12.7.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=certifi&package-manager=pip&previous-version=2022.9.24&new-version=2022.12.7)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://togithub.com/googleapis/google-api-java-client/network/alerts).
From 0d1e5dbf37dd45d6cb40abec72ae43eaa1dd1863 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 18 Jan 2023 15:16:14 +0000 Subject: [PATCH 04/24] chore(deps): update dependency googleapis-common-protos to v1.57.1 (#2219) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [googleapis-common-protos](https://togithub.com/googleapis/python-api-common-protos) | `==1.56.3` -> `==1.57.1` | [![age](https://badges.renovateapi.com/packages/pypi/googleapis-common-protos/1.57.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/googleapis-common-protos/1.57.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/googleapis-common-protos/1.57.1/compatibility-slim/1.56.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/googleapis-common-protos/1.57.1/confidence-slim/1.56.3)](https://docs.renovatebot.com/merge-confidence/) | --- ### ⚠ Dependency Lookup Warnings ⚠ Warnings were logged while processing this repo. Please check the Dependency Dashboard for more information. --- ### Release Notes
googleapis/python-api-common-protos ### [`v1.57.1`](https://togithub.com/googleapis/python-api-common-protos/blob/HEAD/CHANGELOG.md#​1571-httpsgithubcomgoogleapispython-api-common-protoscomparev1570v1571-2022-12-08) [Compare Source](https://togithub.com/googleapis/python-api-common-protos/compare/v1.57.0...v1.57.1) ##### Bug Fixes - Mark reference_docs_uri field in google/api/client.proto as deprecated ([#​150](https://togithub.com/googleapis/python-api-common-protos/issues/150)) ([52b5018](https://togithub.com/googleapis/python-api-common-protos/commit/52b5018abf0902a1e582a406c993b51e0d2aa3cd)) ### [`v1.57.0`](https://togithub.com/googleapis/python-api-common-protos/blob/HEAD/CHANGELOG.md#​1570-httpsgithubcomgoogleapispython-api-common-protoscomparev1564v1570-2022-11-15) [Compare Source](https://togithub.com/googleapis/python-api-common-protos/compare/v1.56.4...v1.57.0) ##### Features - Add support for Python 3.10 ([#​143](https://togithub.com/googleapis/python-api-common-protos/issues/143)) ([63ca888](https://togithub.com/googleapis/python-api-common-protos/commit/63ca888512be84508fcf95e4d5d40df036a85e18)) - Add support for Python 3.11 ([#​145](https://togithub.com/googleapis/python-api-common-protos/issues/145)) ([b9dbb21](https://togithub.com/googleapis/python-api-common-protos/commit/b9dbb219ea46abd9851af1fc41ea37f9d5631c0b)) - added google.api.JwtLocation.cookie ([6af2132](https://togithub.com/googleapis/python-api-common-protos/commit/6af21322879cba158e0a5992c9799e68c1744fac)) - added google.api.Service.publishing and client libraries settings ([6af2132](https://togithub.com/googleapis/python-api-common-protos/commit/6af21322879cba158e0a5992c9799e68c1744fac)) - new fields in enum google.api.ErrorReason ([6af2132](https://togithub.com/googleapis/python-api-common-protos/commit/6af21322879cba158e0a5992c9799e68c1744fac)) ##### Bug Fixes - deprecate google.api.BackendRule.min_deadline ([6af2132](https://togithub.com/googleapis/python-api-common-protos/commit/6af21322879cba158e0a5992c9799e68c1744fac)) - **deps:** Require protobuf >=3.19.5 ([#​141](https://togithub.com/googleapis/python-api-common-protos/issues/141)) ([9ea3530](https://togithub.com/googleapis/python-api-common-protos/commit/9ea3530b459269e964fcc98db1c5025e05d6495f)) ##### Documentation - minor updates to comments ([6af2132](https://togithub.com/googleapis/python-api-common-protos/commit/6af21322879cba158e0a5992c9799e68c1744fac)) ### [`v1.56.4`](https://togithub.com/googleapis/python-api-common-protos/blob/HEAD/CHANGELOG.md#​1564-httpsgithubcomgoogleapispython-api-common-protoscomparev1563v1564-2022-07-12) [Compare Source](https://togithub.com/googleapis/python-api-common-protos/compare/v1.56.3...v1.56.4) ##### Bug Fixes - require python 3.7+ ([#​119](https://togithub.com/googleapis/python-api-common-protos/issues/119)) ([507b58d](https://togithub.com/googleapis/python-api-common-protos/commit/507b58dfa0516aedf57880b384e92cda97152398))
--- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-api-java-client). From 2595de042b95fff8c6acc67f3427c0b8e4eee3bc Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 20 Jan 2023 13:56:38 -0500 Subject: [PATCH 05/24] fix: media upload to have applicationName as User-Agent (#2227) * Upload to have applicationName as User-Agent Test that fails * request initializer to set user-agent header --- .../services/AbstractGoogleClientRequest.java | 31 +++++++++++++++++-- .../services/AbstractGoogleClientTest.java | 31 +++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java index 3b8d3cc3d..cd6d12b65 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java @@ -351,15 +351,42 @@ public final MediaHttpUploader getMediaHttpUploader() { */ protected final void initializeMediaUpload(AbstractInputStreamContent mediaContent) { HttpRequestFactory requestFactory = abstractGoogleClient.getRequestFactory(); + String applicationName = abstractGoogleClient.getApplicationName(); + HttpRequestInitializer requestInitializer = + mediaUploadRequestUserAgentInitializer(applicationName, requestFactory.getInitializer()); this.uploader = - new MediaHttpUploader( - mediaContent, requestFactory.getTransport(), requestFactory.getInitializer()); + new MediaHttpUploader(mediaContent, requestFactory.getTransport(), requestInitializer); this.uploader.setInitiationRequestMethod(requestMethod); if (httpContent != null) { this.uploader.setMetadata(httpContent); } } + private static HttpRequestInitializer mediaUploadRequestUserAgentInitializer( + final String applicationName, final HttpRequestInitializer originalInitializer) { + if (applicationName == null) { + return originalInitializer; + } + if (originalInitializer == null) { + return new HttpRequestInitializer() { + @Override + public void initialize(HttpRequest request) { + HttpHeaders headers = request.getHeaders(); + headers.setUserAgent(applicationName); + } + }; + } else { + return new HttpRequestInitializer() { + @Override + public void initialize(HttpRequest request) throws IOException { + originalInitializer.initialize(request); + HttpHeaders headers = request.getHeaders(); + headers.setUserAgent(applicationName); + } + }; + } + } + /** Returns the media HTTP downloader or {@code null} for none. */ public final MediaHttpDownloader getMediaHttpDownloader() { return downloader; diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientTest.java index 2164af792..7d2ff6383 100644 --- a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientTest.java +++ b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientTest.java @@ -16,6 +16,7 @@ import com.google.api.client.googleapis.testing.services.MockGoogleClient; import com.google.api.client.googleapis.testing.services.MockGoogleClientRequest; import com.google.api.client.http.EmptyContent; +import com.google.api.client.http.GenericUrl; import com.google.api.client.http.HttpExecuteInterceptor; import com.google.api.client.http.HttpRequest; import com.google.api.client.http.HttpRequestInitializer; @@ -33,6 +34,8 @@ import com.google.api.client.util.Key; import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; import junit.framework.TestCase; /** @@ -132,6 +135,7 @@ private static class MediaTransport extends MockHttpTransport { int bytesUploaded; int contentLength = MediaHttpUploader.DEFAULT_CHUNK_SIZE; boolean contentLengthNotSpecified; + List userAgentsRecorded = new ArrayList<>(); protected MediaTransport() {} @@ -169,6 +173,7 @@ public LowLevelHttpResponse execute() { String expectedContentRange = "bytes " + bytesRange + "/" + contentLength; assertEquals(expectedContentRange, getFirstHeaderValue("Content-Range")); bytesUploaded += MediaHttpUploader.DEFAULT_CHUNK_SIZE; + userAgentsRecorded.add(getFirstHeaderValue("User-Agent")); if (bytesUploaded == contentLength) { // Return 200 since the upload is complete. @@ -207,6 +212,32 @@ public void testMediaUpload() throws Exception { assertEquals("somevalue", result.foo); } + public void testMediaUpload_applicationNameAsUserAgent() throws Exception { + MediaTransport fakeTransport = new MediaTransport(); + String applicationName = "Foo/1.0 (BAR:Baz/1.0) XYZ/1.0"; + AbstractGoogleClient client = + new MockGoogleClient.Builder( + fakeTransport, TEST_RESUMABLE_REQUEST_URL, "", JSON_OBJECT_PARSER, null) + .setApplicationName(applicationName) + .build(); + InputStream is = new ByteArrayInputStream(new byte[MediaHttpUploader.DEFAULT_CHUNK_SIZE]); + InputStreamContent mediaContent = new InputStreamContent(TEST_CONTENT_TYPE, is); + mediaContent.setLength(MediaHttpUploader.DEFAULT_CHUNK_SIZE); + MockGoogleClientRequest rq = + new MockGoogleClientRequest(client, "POST", "", null, A.class); + + rq.initializeMediaUpload(mediaContent); + MediaHttpUploader mediaHttpUploader = rq.getMediaHttpUploader(); + mediaHttpUploader.upload(new GenericUrl(TEST_RESUMABLE_REQUEST_URL)); + + assertEquals(1, fakeTransport.userAgentsRecorded.size()); + for (String userAgent : fakeTransport.userAgentsRecorded) { + assertTrue( + "UserAgent header does not have expected value in requests", + userAgent.contains(applicationName)); + } + } + private static class GZipCheckerInitializer implements HttpRequestInitializer { private boolean gzipDisabled; From a43b69eeb16177aeb2e8b30aa4d34c01cc8d19a1 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 13:58:13 -0500 Subject: [PATCH 06/24] build(deps): bump protobuf from 3.20.1 to 3.20.2 in /synthtool/gcp/templates/java_library/.kokoro (#1752) (#2225) build(deps): bump protobuf Bumps [protobuf](https://github.com/protocolbuffers/protobuf) from 3.20.1 to 3.20.2. - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/generate_changelog.py) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.20.1...v3.20.2) --- updated-dependencies: - dependency-name: protobuf dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Source-Link: https://github.com/googleapis/synthtool/commit/239f962d2e840d7ec319d33c5b9ab38302f0dce1 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:d5da32501662e4e53365220cc14cfb1d3b9446585397d57dac50171d92556ae7 Signed-off-by: dependabot[bot] Co-authored-by: Owl Bot Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/.OwlBot.lock.yaml | 4 +- .kokoro/requirements.in | 40 ++------- .kokoro/requirements.txt | 184 ++++++++++++++------------------------ 3 files changed, 76 insertions(+), 152 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 288e39489..81807f7c2 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:9de537d592b60e5eac73b374a28263969bae91ecdb29b445e894576fbf54851c + digest: sha256:d5da32501662e4e53365220cc14cfb1d3b9446585397d57dac50171d92556ae7 diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in index a5010f77d..b19a8dbfd 100644 --- a/.kokoro/requirements.in +++ b/.kokoro/requirements.in @@ -1,34 +1,6 @@ -gcp-docuploader==0.6.3 -google-crc32c==1.3.0 -googleapis-common-protos==1.56.3 -gcp-releasetool==1.9.1 -cryptography==38.0.3 -cachetools==4.2.4 -cffi==1.15.1 -jeepney==0.7.1 -jinja2==3.0.3 -markupsafe==2.0.1 -keyring==23.4.1 -packaging==21.3 -protobuf==3.19.5 -pyjwt==2.4.0 -pyparsing==3.0.9 -pycparser==2.21 -pyperclip==1.8.2 -python-dateutil==2.8.2 -requests==2.27.1 -certifi==2022.12.7 -importlib-metadata==4.8.3 -zipp==3.6.0 -google_api_core==2.8.2 -google-cloud-storage==2.0.0 -google-resumable-media==2.3.3 -google-cloud-core==2.3.1 -typing-extensions==4.1.1 -urllib3==1.26.12 -zipp==3.6.0 -rsa==4.9 -six==1.16.0 -attrs==22.1.0 -google-auth==2.14.1 -idna==3.4 \ No newline at end of file +gcp-docuploader +gcp-releasetool +wheel +setuptools +typing-extensions +click<8.1.0 \ No newline at end of file diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index 15c404aa5..4895c9631 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -1,27 +1,21 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: # -# pip-compile --generate-hashes requirements.in +# pip-compile --allow-unsafe --generate-hashes requirements.in # attrs==22.1.0 \ --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \ --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool cachetools==4.2.4 \ --hash=sha256:89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693 \ --hash=sha256:92971d3cb7d2a97efff7c7bb1657f21a8f5fb309a37530537c71b1774189f2d1 - # via - # -r requirements.in - # google-auth + # via google-auth certifi==2022.12.7 \ --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \ --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18 - # via - # -r requirements.in - # requests + # via requests cffi==1.15.1 \ --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \ @@ -87,9 +81,7 @@ cffi==1.15.1 \ --hash=sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b \ --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \ --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0 - # via - # -r requirements.in - # cryptography + # via cryptography charset-normalizer==2.0.12 \ --hash=sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597 \ --hash=sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df @@ -98,6 +90,7 @@ click==8.0.4 \ --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \ --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb # via + # -r requirements.in # gcp-docuploader # gcp-releasetool colorlog==6.7.0 \ @@ -132,12 +125,11 @@ cryptography==38.0.3 \ --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \ --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722 # via - # -r requirements.in # gcp-releasetool # secretstorage -gcp-docuploader==0.6.3 \ - --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \ - --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b +gcp-docuploader==0.6.4 \ + --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \ + --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf # via -r requirements.in gcp-releasetool==1.9.1 \ --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \ @@ -147,13 +139,12 @@ google-api-core==2.8.2 \ --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \ --hash=sha256:93c6a91ccac79079ac6bbf8b74ee75db970cc899278b97d53bc012f35908cf50 # via - # -r requirements.in # google-cloud-core # google-cloud-storage google-auth==2.14.1 \ + --hash=sha256:ccaa901f31ad5cbb562615eb8b664b3dd0bf5404a67618e642307f00613eda4d \ --hash=sha256:f5d8701633bebc12e0deea4df8abd8aff31c28b355360597f7f2ee60f2e4d016 # via - # -r requirements.in # gcp-releasetool # google-api-core # google-cloud-core @@ -161,15 +152,11 @@ google-auth==2.14.1 \ google-cloud-core==2.3.1 \ --hash=sha256:113ba4f492467d5bd442c8d724c1a25ad7384045c3178369038840ecdd19346c \ --hash=sha256:34334359cb04187bdc80ddcf613e462dfd7a3aabbc3fe4d118517ab4b9303d53 - # via - # -r requirements.in - # google-cloud-storage + # via google-cloud-storage google-cloud-storage==2.0.0 \ --hash=sha256:a57a15aead0f9dfbd4381f1bfdbe8bf89818a4bd75bab846cafcefb2db846c47 \ --hash=sha256:ec4be60bb223a3a960f0d01697d849b86d91cad815a84915a32ed3635e93a5e7 - # via - # -r requirements.in - # gcp-docuploader + # via gcp-docuploader google-crc32c==1.3.0 \ --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \ --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \ @@ -214,52 +201,37 @@ google-crc32c==1.3.0 \ --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \ --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \ --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3 - # via - # -r requirements.in - # google-resumable-media + # via google-resumable-media google-resumable-media==2.3.3 \ --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \ --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5 - # via - # -r requirements.in - # google-cloud-storage + # via google-cloud-storage googleapis-common-protos==1.56.3 \ --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \ --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461 - # via - # -r requirements.in - # google-api-core + # via google-api-core idna==3.4 \ --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \ --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2 - # via - # -r requirements.in - # requests + # via requests importlib-metadata==4.8.3 \ --hash=sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e \ --hash=sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668 + # via keyring +jeepney==0.8.0 \ + --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \ + --hash=sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755 # via - # -r requirements.in - # keyring -jeepney==0.7.1 \ - --hash=sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac \ - --hash=sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f - # via - # -r requirements.in # keyring # secretstorage jinja2==3.0.3 \ --hash=sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8 \ --hash=sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool keyring==23.4.1 \ --hash=sha256:17e49fb0d6883c2b4445359434dba95aad84aabb29bbff044ad0ed7100232eca \ --hash=sha256:89cbd74d4683ed164c8082fb38619341097741323b3786905c6dac04d6915a55 - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool markupsafe==2.0.1 \ --hash=sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298 \ --hash=sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64 \ @@ -330,49 +302,39 @@ markupsafe==2.0.1 \ --hash=sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509 \ --hash=sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51 \ --hash=sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872 - # via - # -r requirements.in - # jinja2 + # via jinja2 packaging==21.3 \ --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 + # via gcp-releasetool +protobuf==3.20.2 \ + --hash=sha256:03d76b7bd42ac4a6e109742a4edf81ffe26ffd87c5993126d894fe48a120396a \ + --hash=sha256:09e25909c4297d71d97612f04f41cea8fa8510096864f2835ad2f3b3df5a5559 \ + --hash=sha256:18e34a10ae10d458b027d7638a599c964b030c1739ebd035a1dfc0e22baa3bfe \ + --hash=sha256:291fb4307094bf5ccc29f424b42268640e00d5240bf0d9b86bf3079f7576474d \ + --hash=sha256:2c0b040d0b5d5d207936ca2d02f00f765906622c07d3fa19c23a16a8ca71873f \ + --hash=sha256:384164994727f274cc34b8abd41a9e7e0562801361ee77437099ff6dfedd024b \ + --hash=sha256:3cb608e5a0eb61b8e00fe641d9f0282cd0eedb603be372f91f163cbfbca0ded0 \ + --hash=sha256:5d9402bf27d11e37801d1743eada54372f986a372ec9679673bfcc5c60441151 \ + --hash=sha256:712dca319eee507a1e7df3591e639a2b112a2f4a62d40fe7832a16fd19151750 \ + --hash=sha256:7a5037af4e76c975b88c3becdf53922b5ffa3f2cddf657574a4920a3b33b80f3 \ + --hash=sha256:8228e56a865c27163d5d1d1771d94b98194aa6917bcfb6ce139cbfa8e3c27334 \ + --hash=sha256:84a1544252a933ef07bb0b5ef13afe7c36232a774affa673fc3636f7cee1db6c \ + --hash=sha256:84fe5953b18a383fd4495d375fe16e1e55e0a3afe7b4f7b4d01a3a0649fcda9d \ + --hash=sha256:9c673c8bfdf52f903081816b9e0e612186684f4eb4c17eeb729133022d6032e3 \ + --hash=sha256:a9e5ae5a8e8985c67e8944c23035a0dff2c26b0f5070b2f55b217a1c33bbe8b1 \ + --hash=sha256:b4fdb29c5a7406e3f7ef176b2a7079baa68b5b854f364c21abe327bbeec01cdb \ + --hash=sha256:c184485e0dfba4dfd451c3bd348c2e685d6523543a0f91b9fd4ae90eb09e8422 \ + --hash=sha256:c9cdf251c582c16fd6a9f5e95836c90828d51b0069ad22f463761d27c6c19019 \ + --hash=sha256:e39cf61bb8582bda88cdfebc0db163b774e7e03364bbf9ce1ead13863e81e359 \ + --hash=sha256:e8fbc522303e09036c752a0afcc5c0603e917222d8bedc02813fd73b4b4ed804 \ + --hash=sha256:f34464ab1207114e73bba0794d1257c150a2b89b7a9faf504e00af7c9fd58978 \ + --hash=sha256:f52dabc96ca99ebd2169dadbe018824ebda08a795c7684a0b7d203a290f3adb0 # via - # -r requirements.in - # gcp-releasetool -protobuf==3.19.5 \ - --hash=sha256:1867f93b06a183f87696871bb8d1e99ee71dbb69d468ce1f0cc8bf3d30f982f3 \ - --hash=sha256:3c4160b601220627f7e91154e572baf5e161a9c3f445a8242d536ee3d0b7b17c \ - --hash=sha256:4ee2af7051d3b10c8a4fe6fd1a2c69f201fea36aeee7086cf202a692e1b99ee1 \ - --hash=sha256:5266c36cc0af3bb3dbf44f199d225b33da66a9a5c3bdc2b14865ad10eddf0e37 \ - --hash=sha256:5470f892961af464ae6eaf0f3099e2c1190ae8c7f36f174b89491281341f79ca \ - --hash=sha256:66d14b5b90090353efe75c9fb1bf65ef7267383034688d255b500822e37d5c2f \ - --hash=sha256:67efb5d20618020aa9596e17bfc37ca068c28ec0c1507d9507f73c93d46c9855 \ - --hash=sha256:696e6cfab94cc15a14946f2bf72719dced087d437adbd994fff34f38986628bc \ - --hash=sha256:6a02172b9650f819d01fb8e224fc69b0706458fc1ab4f1c669281243c71c1a5e \ - --hash=sha256:6eca9ae238ba615d702387a2ddea635d535d769994a9968c09a4ca920c487ab9 \ - --hash=sha256:950abd6c00e7b51f87ae8b18a0ce4d69fea217f62f171426e77de5061f6d9850 \ - --hash=sha256:9e1d74032f56ff25f417cfe84c8147047732e5059137ca42efad20cbbd25f5e0 \ - --hash=sha256:9e42b1cf2ecd8a1bd161239e693f22035ba99905ae6d7efeac8a0546c7ec1a27 \ - --hash=sha256:9f957ef53e872d58a0afd3bf6d80d48535d28c99b40e75e6634cbc33ea42fd54 \ - --hash=sha256:a89aa0c042e61e11ade320b802d6db4ee5391d8d973e46d3a48172c1597789f8 \ - --hash=sha256:c0f80876a8ff0ae7064084ed094eb86497bd5a3812e6fc96a05318b92301674e \ - --hash=sha256:c44e3282cff74ad18c7e8a0375f407f69ee50c2116364b44492a196293e08b21 \ - --hash=sha256:d249519ba5ecf5dd6b18150c9b6bcde510b273714b696f3923ff8308fc11ae49 \ - --hash=sha256:d3973a2d58aefc7d1230725c2447ce7f86a71cbc094b86a77c6ee1505ac7cdb1 \ - --hash=sha256:dca2284378a5f2a86ffed35c6ac147d14c48b525eefcd1083e5a9ce28dfa8657 \ - --hash=sha256:e63b0b3c42e51c94add62b010366cd4979cb6d5f06158bcae8faac4c294f91e1 \ - --hash=sha256:f2b599a21c9a32e171ec29a2ac54e03297736c578698e11b099d031f79da114b \ - --hash=sha256:f2bde37667b18c2b5280df83bc799204394a5d2d774e4deaf9de0eb741df6833 \ - --hash=sha256:f4f909f4dde413dec435a44b0894956d55bb928ded7d6e3c726556ca4c796e84 \ - --hash=sha256:f976234e20ab2785f54224bcdafa027674e23663b132fa3ca0caa291a6cfbde7 \ - --hash=sha256:f9cebda093c2f6bfed88f1c17cdade09d4d96096421b344026feee236532d4de - # via - # -r requirements.in # gcp-docuploader # gcp-releasetool # google-api-core # google-cloud-storage - # googleapis-common-protos pyasn1==0.4.8 \ --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \ --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba @@ -386,71 +348,61 @@ pyasn1-modules==0.2.8 \ pycparser==2.21 \ --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 - # via - # -r requirements.in - # cffi + # via cffi pyjwt==2.4.0 \ --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \ --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool pyparsing==3.0.9 \ --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \ --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc - # via - # -r requirements.in - # packaging + # via packaging pyperclip==1.8.2 \ --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57 - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool python-dateutil==2.8.2 \ --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \ --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool requests==2.27.1 \ --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \ --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d # via - # -r requirements.in # gcp-releasetool # google-api-core # google-cloud-storage rsa==4.9 \ --hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \ --hash=sha256:e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21 - # via - # -r requirements.in - # google-auth + # via google-auth secretstorage==3.3.3 \ --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 # via keyring +setuptools==65.6.3 \ + --hash=sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54 \ + --hash=sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75 + # via -r requirements.in six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 # via - # -r requirements.in # gcp-docuploader # google-auth # python-dateutil -typing-extensions==4.1.1 \ - --hash=sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42 \ - --hash=sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2 +typing-extensions==4.4.0 \ + --hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \ + --hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e # via -r requirements.in urllib3==1.26.12 \ --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \ --hash=sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997 - # via - # -r requirements.in - # requests + # via requests +wheel==0.38.4 \ + --hash=sha256:965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac \ + --hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8 + # via -r requirements.in zipp==3.6.0 \ --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \ --hash=sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc - # via - # -r requirements.in - # importlib-metadata + # via importlib-metadata From 6a321645c695fa3ab2a8c3e5c95b4b2288218bd2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 20 Jan 2023 19:40:12 +0000 Subject: [PATCH 07/24] chore(deps): update dependency com.google.code.gson:gson to v2.10.1 (#2229) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.code.gson:gson](https://togithub.com/google/gson) | `2.10` -> `2.10.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.code.gson:gson/2.10.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.code.gson:gson/2.10.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.code.gson:gson/2.10.1/compatibility-slim/2.10)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.code.gson:gson/2.10.1/confidence-slim/2.10)](https://docs.renovatebot.com/merge-confidence/) | --- ### ⚠ Dependency Lookup Warnings ⚠ Warnings were logged while processing this repo. Please check the Dependency Dashboard for more information. --- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-api-java-client). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f71d0fd43..37cb0626b 100644 --- a/pom.xml +++ b/pom.xml @@ -521,7 +521,7 @@ 4.0.3 2.5 false - 2.10 + 2.10.1 From 1e7d0136aede89ad407815ce1913c08cbe1ebe36 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 20 Jan 2023 19:48:33 +0000 Subject: [PATCH 08/24] chore(deps): update dependency com.google.protobuf:protobuf-java to v3.21.12 (#2231) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37cb0626b..e66569117 100644 --- a/pom.xml +++ b/pom.xml @@ -511,7 +511,7 @@ 1.34.1 3.0.2 2.8.6 - 3.21.9 + 3.21.12 31.1-jre 2.0.10 1.1.4c From 4122e6195e1890e2b26d53c7d7e59c02b1b7ca94 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 20 Jan 2023 14:51:25 -0500 Subject: [PATCH 09/24] build: RenovateBot shouldn't touch requirements.txt (#2230) --- renovate.json | 1 + 1 file changed, 1 insertion(+) diff --git a/renovate.json b/renovate.json index 68e63ff15..d830b8c4e 100644 --- a/renovate.json +++ b/renovate.json @@ -2,6 +2,7 @@ "extends": [ "config:base" ], + "ignorePaths": [".kokoro/requirements.txt"], "packageRules": [ { "packagePatterns": ["^com.google.appengine:appengine-"], From c566bdefea6d1b0d960c2413ea1d45a3db01b71f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 20 Jan 2023 20:12:06 +0000 Subject: [PATCH 10/24] chore(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.4.2 (#2233) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e66569117..4923beaa3 100644 --- a/pom.xml +++ b/pom.xml @@ -328,7 +328,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.1 + 3.4.2 org.apache.maven.plugins From e707eed5da864ab71f5b5951e5fb2b1c936b547b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 20 Jan 2023 20:12:31 +0000 Subject: [PATCH 11/24] chore(deps): update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.2.1 (#2232) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4923beaa3..41274cde6 100644 --- a/pom.xml +++ b/pom.xml @@ -308,7 +308,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.2.0 + 3.2.1 org.codehaus.mojo From b29f3791baaf8e0ac18ea0b946cd396d3d3a379b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 15:20:32 -0500 Subject: [PATCH 12/24] chore(main): release 2.1.3 (#2228) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ google-api-client-android/pom.xml | 2 +- google-api-client-appengine/pom.xml | 2 +- google-api-client-assembly/pom.xml | 2 +- google-api-client-bom/pom.xml | 22 +++++++++++----------- google-api-client-gson/pom.xml | 2 +- google-api-client-jackson2/pom.xml | 2 +- google-api-client-java6/pom.xml | 2 +- google-api-client-protobuf/pom.xml | 2 +- google-api-client-servlet/pom.xml | 2 +- google-api-client-xml/pom.xml | 2 +- google-api-client/pom.xml | 2 +- pom.xml | 2 +- versions.txt | 2 +- 14 files changed, 30 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8965cc05..8b6ca3743 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.1.3](https://github.com/googleapis/google-api-java-client/compare/v2.1.2...v2.1.3) (2023-01-20) + + +### Bug Fixes + +* Media upload to have applicationName as User-Agent ([#2227](https://github.com/googleapis/google-api-java-client/issues/2227)) ([2595de0](https://github.com/googleapis/google-api-java-client/commit/2595de042b95fff8c6acc67f3427c0b8e4eee3bc)) + ## [2.1.2](https://github.com/googleapis/google-api-java-client/compare/v2.1.1...v2.1.2) (2023-01-03) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index 801b0eb07..28e3cced4 100644 --- a/google-api-client-android/pom.xml +++ b/google-api-client-android/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3-SNAPSHOT + 2.1.3 ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 7e8967d9e..50696f697 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3-SNAPSHOT + 2.1.3 ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 8cc4800ba..7209a8874 100644 --- a/google-api-client-assembly/pom.xml +++ b/google-api-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3-SNAPSHOT + 2.1.3 ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index 29573562e..a1a71c441 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api-client google-api-client-bom - 2.1.3-SNAPSHOT + 2.1.3 pom Google API Client Library for Java BOM @@ -63,53 +63,53 @@ com.google.api-client google-api-client - 2.1.3-SNAPSHOT + 2.1.3 com.google.api-client google-api-client-android - 2.1.3-SNAPSHOT + 2.1.3 com.google.api-client google-api-client-appengine - 2.1.3-SNAPSHOT + 2.1.3 com.google.api-client google-api-client-assembly - 2.1.3-SNAPSHOT + 2.1.3 pom com.google.api-client google-api-client-gson - 2.1.3-SNAPSHOT + 2.1.3 com.google.api-client google-api-client-jackson2 - 2.1.3-SNAPSHOT + 2.1.3 com.google.api-client google-api-client-java6 - 2.1.3-SNAPSHOT + 2.1.3 com.google.api-client google-api-client-protobuf - 2.1.3-SNAPSHOT + 2.1.3 com.google.api-client google-api-client-servlet - 2.1.3-SNAPSHOT + 2.1.3 com.google.api-client google-api-client-xml - 2.1.3-SNAPSHOT + 2.1.3 diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index 03089f59d..0307057c2 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3-SNAPSHOT + 2.1.3 ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 1dd2d619d..88450cde4 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3-SNAPSHOT + 2.1.3 ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index d9e8514a5..9691f70e0 100644 --- a/google-api-client-java6/pom.xml +++ b/google-api-client-java6/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3-SNAPSHOT + 2.1.3 ../pom.xml google-api-client-java6 diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index e41f87bf1..fd9389872 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3-SNAPSHOT + 2.1.3 ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index 40af231c8..fc0131d28 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3-SNAPSHOT + 2.1.3 ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index b37e51a9a..5b4b4fc95 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3-SNAPSHOT + 2.1.3 ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index e2dda4657..18a202e64 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3-SNAPSHOT + 2.1.3 ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index 41274cde6..5dfd16ffc 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api-client google-api-client-parent - 2.1.3-SNAPSHOT + 2.1.3 pom Parent for the Google API Client Library for Java The Google APIs Client Library for Java is a Java client library diff --git a/versions.txt b/versions.txt index 523ae8a12..aaa6b477f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:2.1.2:2.1.3-SNAPSHOT +google-api-client:2.1.3:2.1.3 From ba3b0e5c7229fb7361ce9192951ce4f94cfe23f5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 20:24:12 +0000 Subject: [PATCH 13/24] chore(main): release 2.1.4-SNAPSHOT (#2234) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- google-api-client-android/pom.xml | 2 +- google-api-client-appengine/pom.xml | 2 +- google-api-client-assembly/pom.xml | 2 +- google-api-client-bom/pom.xml | 22 +++++++++++----------- google-api-client-gson/pom.xml | 2 +- google-api-client-jackson2/pom.xml | 2 +- google-api-client-java6/pom.xml | 2 +- google-api-client-protobuf/pom.xml | 2 +- google-api-client-servlet/pom.xml | 2 +- google-api-client-xml/pom.xml | 2 +- google-api-client/pom.xml | 2 +- pom.xml | 2 +- versions.txt | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index 28e3cced4..558d645b6 100644 --- a/google-api-client-android/pom.xml +++ b/google-api-client-android/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3 + 2.1.4-SNAPSHOT ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 50696f697..7a7fe6f40 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3 + 2.1.4-SNAPSHOT ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 7209a8874..44120fb94 100644 --- a/google-api-client-assembly/pom.xml +++ b/google-api-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3 + 2.1.4-SNAPSHOT ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index a1a71c441..c478dd43f 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api-client google-api-client-bom - 2.1.3 + 2.1.4-SNAPSHOT pom Google API Client Library for Java BOM @@ -63,53 +63,53 @@ com.google.api-client google-api-client - 2.1.3 + 2.1.4-SNAPSHOT com.google.api-client google-api-client-android - 2.1.3 + 2.1.4-SNAPSHOT com.google.api-client google-api-client-appengine - 2.1.3 + 2.1.4-SNAPSHOT com.google.api-client google-api-client-assembly - 2.1.3 + 2.1.4-SNAPSHOT pom com.google.api-client google-api-client-gson - 2.1.3 + 2.1.4-SNAPSHOT com.google.api-client google-api-client-jackson2 - 2.1.3 + 2.1.4-SNAPSHOT com.google.api-client google-api-client-java6 - 2.1.3 + 2.1.4-SNAPSHOT com.google.api-client google-api-client-protobuf - 2.1.3 + 2.1.4-SNAPSHOT com.google.api-client google-api-client-servlet - 2.1.3 + 2.1.4-SNAPSHOT com.google.api-client google-api-client-xml - 2.1.3 + 2.1.4-SNAPSHOT diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index 0307057c2..aeff7f2f2 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3 + 2.1.4-SNAPSHOT ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 88450cde4..b3af9e76a 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3 + 2.1.4-SNAPSHOT ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index 9691f70e0..6a9fc2b55 100644 --- a/google-api-client-java6/pom.xml +++ b/google-api-client-java6/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3 + 2.1.4-SNAPSHOT ../pom.xml google-api-client-java6 diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index fd9389872..a26c4ddc7 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3 + 2.1.4-SNAPSHOT ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index fc0131d28..cb1dbc717 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3 + 2.1.4-SNAPSHOT ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index 5b4b4fc95..a7ec74feb 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3 + 2.1.4-SNAPSHOT ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 18a202e64..2634514bf 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.3 + 2.1.4-SNAPSHOT ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index 5dfd16ffc..3b1466752 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api-client google-api-client-parent - 2.1.3 + 2.1.4-SNAPSHOT pom Parent for the Google API Client Library for Java The Google APIs Client Library for Java is a Java client library diff --git a/versions.txt b/versions.txt index aaa6b477f..2d21111cf 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:2.1.3:2.1.3 +google-api-client:2.1.3:2.1.4-SNAPSHOT From e505c269078208dbce11c966189b2b4ca30956e7 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 26 Jan 2023 09:50:42 -0500 Subject: [PATCH 14/24] docs: adding deprecated annotation and guide for migration (#2244) --- .../extensions/java6/auth/oauth2/GooglePromptReceiver.java | 4 ++++ .../googleapis/auth/oauth2/GoogleOAuthConstants.java | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java b/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java index 4e8e580c9..0fcc8e336 100644 --- a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java +++ b/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java @@ -22,6 +22,10 @@ * Google OAuth 2.0 abstract verification code receiver that prompts user to paste the code copied * from the browser. * + *

This uses deprecated OAuth out-of-band (oob) flow. To migrate to an alternative flow, please + * refer to Making + * Google OAuth interactions safer by using more secure OAuth flows. + * *

Implementation is thread-safe. * * @since 1.11 diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java index 4d780e8da..2e4ea5733 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java @@ -44,8 +44,13 @@ public class GoogleOAuthConstants { * Redirect URI to use for an installed application as specified in Using OAuth 2.0 for * Mobile & Desktop Apps. + * + *

OAuth out-of-band (oob) flow has been deprecated. To migrate to an alternative flow, please + * refer to Making Google + * OAuth interactions safer by using more secure OAuth flows. */ - public static final String OOB_REDIRECT_URI = "urn:ietf:wg:oauth:2.0:oob"; + @Deprecated public static final String OOB_REDIRECT_URI = "urn:ietf:wg:oauth:2.0:oob"; private GoogleOAuthConstants() {} } From 5de8cc20727df41fd008b3ff2709a60c3755b984 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 26 Jan 2023 14:54:11 +0000 Subject: [PATCH 15/24] fix(deps): update dependency org.apache.httpcomponents:httpcore to v4.4.16 (#2237) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.httpcomponents:httpcore](http://hc.apache.org/httpcomponents-core-ga) | `4.4.15` -> `4.4.16` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.httpcomponents:httpcore/4.4.16/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.httpcomponents:httpcore/4.4.16/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.httpcomponents:httpcore/4.4.16/compatibility-slim/4.4.15)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.httpcomponents:httpcore/4.4.16/confidence-slim/4.4.15)](https://docs.renovatebot.com/merge-confidence/) | --- ### ⚠ Dependency Lookup Warnings ⚠ Warnings were logged while processing this repo. Please check the Dependency Dashboard for more information. --- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-api-java-client). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b1466752..6d0324309 100644 --- a/pom.xml +++ b/pom.xml @@ -505,7 +505,7 @@ UTF-8 1.42.3 - 4.4.15 + 4.4.16 4.5.13 1.15 1.34.1 From 18a75c74255f7a71dfc141c1c4a2065b99e2f1fb Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 26 Jan 2023 14:54:17 +0000 Subject: [PATCH 16/24] chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-m8 (#2235) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-surefire-plugin](https://maven.apache.org/surefire/) | `3.0.0-M7` -> `3.0.0-M8` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.0.0-M8/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.0.0-M8/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.0.0-M8/compatibility-slim/3.0.0-M7)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.0.0-M8/confidence-slim/3.0.0-M7)](https://docs.renovatebot.com/merge-confidence/) | --- ### ⚠ Dependency Lookup Warnings ⚠ Warnings were logged while processing this repo. Please check the Dependency Dashboard for more information. --- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-api-java-client). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d0324309..8485263cc 100644 --- a/pom.xml +++ b/pom.xml @@ -299,7 +299,7 @@ maven-surefire-plugin - 3.0.0-M7 + 3.0.0-M8 -Xmx1024m sponge_log From 710a5ade1068832df4cd949f31e8f319920c8d1b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 26 Jan 2023 14:56:11 +0000 Subject: [PATCH 17/24] fix(deps): update dependency com.google.cloud:libraries-bom to v26.4.0 (#2240) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://cloud.google.com/java/docs/bom) ([source](https://togithub.com/googleapis/java-cloud-bom)) | `26.1.4` -> `26.4.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.4.0/compatibility-slim/26.1.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/26.4.0/confidence-slim/26.1.4)](https://docs.renovatebot.com/merge-confidence/) | --- ### ⚠ Dependency Lookup Warnings ⚠ Warnings were logged while processing this repo. Please check the Dependency Dashboard for more information. --- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-api-java-client). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 320fefc14..aaf2b60fc 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 26.1.4 + 26.4.0 pom import From a83047687f9a2df4565ec33a8156af19cf97ffd3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 26 Jan 2023 14:57:41 +0000 Subject: [PATCH 18/24] fix(deps): update dependency com.google.api-client:google-api-client to v2.1.3 (#2239) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index db79cb898..6c6fb937f 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.api-client google-api-client - 2.0.1 + 2.1.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 36055ec21..4d7ab9e58 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.api-client google-api-client - 2.0.1 + 2.1.3 From 03102d0d9f0b91e7c8441f75daf5a6f77e0a91ac Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 26 Jan 2023 14:57:58 +0000 Subject: [PATCH 19/24] chore(deps): update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.5.0 (#2238) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8485263cc..fbf6b678d 100644 --- a/pom.xml +++ b/pom.xml @@ -343,7 +343,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.4.0 + 3.5.0 From aa2b08c599429551737e339df2742d7bfbf7ac2a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 26 Jan 2023 14:58:12 +0000 Subject: [PATCH 20/24] fix(deps): update dependency org.apache.httpcomponents:httpclient to v4.5.14 (#2236) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.httpcomponents:httpclient](http://hc.apache.org/httpcomponents-client-ga) | `4.5.13` -> `4.5.14` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.httpcomponents:httpclient/4.5.14/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.httpcomponents:httpclient/4.5.14/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.httpcomponents:httpclient/4.5.14/compatibility-slim/4.5.13)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.httpcomponents:httpclient/4.5.14/confidence-slim/4.5.13)](https://docs.renovatebot.com/merge-confidence/) | --- ### ⚠ Dependency Lookup Warnings ⚠ Warnings were logged while processing this repo. Please check the Dependency Dashboard for more information. --- ### Configuration πŸ“… **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. β™» **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. πŸ”• **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-api-java-client). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fbf6b678d..f57cf2ea8 100644 --- a/pom.xml +++ b/pom.xml @@ -506,7 +506,7 @@ UTF-8 1.42.3 4.4.16 - 4.5.13 + 4.5.14 1.15 1.34.1 3.0.2 From b5aa4b55a380dc42f9e861a9c79de91648642a40 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 10:26:01 -0500 Subject: [PATCH 21/24] chore(main): release 2.1.4 (#2245) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 15 +++++++++++++++ google-api-client-android/pom.xml | 2 +- google-api-client-appengine/pom.xml | 2 +- google-api-client-assembly/pom.xml | 2 +- google-api-client-bom/pom.xml | 22 +++++++++++----------- google-api-client-gson/pom.xml | 2 +- google-api-client-jackson2/pom.xml | 2 +- google-api-client-java6/pom.xml | 2 +- google-api-client-protobuf/pom.xml | 2 +- google-api-client-servlet/pom.xml | 2 +- google-api-client-xml/pom.xml | 2 +- google-api-client/pom.xml | 2 +- pom.xml | 2 +- versions.txt | 2 +- 14 files changed, 38 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b6ca3743..751a622d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [2.1.4](https://github.com/googleapis/google-api-java-client/compare/v2.1.3...v2.1.4) (2023-01-26) + + +### Bug Fixes + +* **deps:** Update dependency com.google.api-client:google-api-client to v2.1.3 ([#2239](https://github.com/googleapis/google-api-java-client/issues/2239)) ([a830476](https://github.com/googleapis/google-api-java-client/commit/a83047687f9a2df4565ec33a8156af19cf97ffd3)) +* **deps:** Update dependency com.google.cloud:libraries-bom to v26.4.0 ([#2240](https://github.com/googleapis/google-api-java-client/issues/2240)) ([710a5ad](https://github.com/googleapis/google-api-java-client/commit/710a5ade1068832df4cd949f31e8f319920c8d1b)) +* **deps:** Update dependency org.apache.httpcomponents:httpclient to v4.5.14 ([#2236](https://github.com/googleapis/google-api-java-client/issues/2236)) ([aa2b08c](https://github.com/googleapis/google-api-java-client/commit/aa2b08c599429551737e339df2742d7bfbf7ac2a)) +* **deps:** Update dependency org.apache.httpcomponents:httpcore to v4.4.16 ([#2237](https://github.com/googleapis/google-api-java-client/issues/2237)) ([5de8cc2](https://github.com/googleapis/google-api-java-client/commit/5de8cc20727df41fd008b3ff2709a60c3755b984)) + + +### Documentation + +* Adding deprecated annotation and guide for migration ([#2244](https://github.com/googleapis/google-api-java-client/issues/2244)) ([e505c26](https://github.com/googleapis/google-api-java-client/commit/e505c269078208dbce11c966189b2b4ca30956e7)) + ## [2.1.3](https://github.com/googleapis/google-api-java-client/compare/v2.1.2...v2.1.3) (2023-01-20) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index 558d645b6..0978829fd 100644 --- a/google-api-client-android/pom.xml +++ b/google-api-client-android/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4-SNAPSHOT + 2.1.4 ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 7a7fe6f40..506d1c4d3 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4-SNAPSHOT + 2.1.4 ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 44120fb94..59868f64f 100644 --- a/google-api-client-assembly/pom.xml +++ b/google-api-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4-SNAPSHOT + 2.1.4 ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index c478dd43f..6c7004f0c 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api-client google-api-client-bom - 2.1.4-SNAPSHOT + 2.1.4 pom Google API Client Library for Java BOM @@ -63,53 +63,53 @@ com.google.api-client google-api-client - 2.1.4-SNAPSHOT + 2.1.4 com.google.api-client google-api-client-android - 2.1.4-SNAPSHOT + 2.1.4 com.google.api-client google-api-client-appengine - 2.1.4-SNAPSHOT + 2.1.4 com.google.api-client google-api-client-assembly - 2.1.4-SNAPSHOT + 2.1.4 pom com.google.api-client google-api-client-gson - 2.1.4-SNAPSHOT + 2.1.4 com.google.api-client google-api-client-jackson2 - 2.1.4-SNAPSHOT + 2.1.4 com.google.api-client google-api-client-java6 - 2.1.4-SNAPSHOT + 2.1.4 com.google.api-client google-api-client-protobuf - 2.1.4-SNAPSHOT + 2.1.4 com.google.api-client google-api-client-servlet - 2.1.4-SNAPSHOT + 2.1.4 com.google.api-client google-api-client-xml - 2.1.4-SNAPSHOT + 2.1.4 diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index aeff7f2f2..dd0f03173 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4-SNAPSHOT + 2.1.4 ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index b3af9e76a..b601b3deb 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4-SNAPSHOT + 2.1.4 ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index 6a9fc2b55..875e525b3 100644 --- a/google-api-client-java6/pom.xml +++ b/google-api-client-java6/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4-SNAPSHOT + 2.1.4 ../pom.xml google-api-client-java6 diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index a26c4ddc7..aab6d870b 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4-SNAPSHOT + 2.1.4 ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index cb1dbc717..1bae767d2 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4-SNAPSHOT + 2.1.4 ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index a7ec74feb..c287dcac9 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4-SNAPSHOT + 2.1.4 ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 2634514bf..fed421cc8 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4-SNAPSHOT + 2.1.4 ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index f57cf2ea8..e6234bb5b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api-client google-api-client-parent - 2.1.4-SNAPSHOT + 2.1.4 pom Parent for the Google API Client Library for Java The Google APIs Client Library for Java is a Java client library diff --git a/versions.txt b/versions.txt index 2d21111cf..2a39fa645 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:2.1.3:2.1.4-SNAPSHOT +google-api-client:2.1.4:2.1.4 From 47cb4b8d41180f5a0480909c5d3a2b8858a0862b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 15:30:24 +0000 Subject: [PATCH 22/24] chore(main): release 2.1.5-SNAPSHOT (#2246) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- google-api-client-android/pom.xml | 2 +- google-api-client-appengine/pom.xml | 2 +- google-api-client-assembly/pom.xml | 2 +- google-api-client-bom/pom.xml | 22 +++++++++++----------- google-api-client-gson/pom.xml | 2 +- google-api-client-jackson2/pom.xml | 2 +- google-api-client-java6/pom.xml | 2 +- google-api-client-protobuf/pom.xml | 2 +- google-api-client-servlet/pom.xml | 2 +- google-api-client-xml/pom.xml | 2 +- google-api-client/pom.xml | 2 +- pom.xml | 2 +- versions.txt | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index 0978829fd..e50e6a764 100644 --- a/google-api-client-android/pom.xml +++ b/google-api-client-android/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4 + 2.1.5-SNAPSHOT ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 506d1c4d3..445254cab 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4 + 2.1.5-SNAPSHOT ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 59868f64f..34eebca7c 100644 --- a/google-api-client-assembly/pom.xml +++ b/google-api-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4 + 2.1.5-SNAPSHOT ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index 6c7004f0c..e0da65af9 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api-client google-api-client-bom - 2.1.4 + 2.1.5-SNAPSHOT pom Google API Client Library for Java BOM @@ -63,53 +63,53 @@ com.google.api-client google-api-client - 2.1.4 + 2.1.5-SNAPSHOT com.google.api-client google-api-client-android - 2.1.4 + 2.1.5-SNAPSHOT com.google.api-client google-api-client-appengine - 2.1.4 + 2.1.5-SNAPSHOT com.google.api-client google-api-client-assembly - 2.1.4 + 2.1.5-SNAPSHOT pom com.google.api-client google-api-client-gson - 2.1.4 + 2.1.5-SNAPSHOT com.google.api-client google-api-client-jackson2 - 2.1.4 + 2.1.5-SNAPSHOT com.google.api-client google-api-client-java6 - 2.1.4 + 2.1.5-SNAPSHOT com.google.api-client google-api-client-protobuf - 2.1.4 + 2.1.5-SNAPSHOT com.google.api-client google-api-client-servlet - 2.1.4 + 2.1.5-SNAPSHOT com.google.api-client google-api-client-xml - 2.1.4 + 2.1.5-SNAPSHOT diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index dd0f03173..fb49b1ecf 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4 + 2.1.5-SNAPSHOT ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index b601b3deb..a0da996c2 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4 + 2.1.5-SNAPSHOT ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index 875e525b3..72aa64920 100644 --- a/google-api-client-java6/pom.xml +++ b/google-api-client-java6/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4 + 2.1.5-SNAPSHOT ../pom.xml google-api-client-java6 diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index aab6d870b..99d5a9caf 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4 + 2.1.5-SNAPSHOT ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index 1bae767d2..bc87d0c7a 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4 + 2.1.5-SNAPSHOT ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index c287dcac9..f82dd2862 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4 + 2.1.5-SNAPSHOT ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index fed421cc8..54492a20e 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.4 + 2.1.5-SNAPSHOT ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index e6234bb5b..2df3abfa3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api-client google-api-client-parent - 2.1.4 + 2.1.5-SNAPSHOT pom Parent for the Google API Client Library for Java The Google APIs Client Library for Java is a Java client library diff --git a/versions.txt b/versions.txt index 2a39fa645..67bda5cf9 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:2.1.4:2.1.4 +google-api-client:2.1.4:2.1.5-SNAPSHOT From bb494ee28f806570e2de81f3e76678137512fab3 Mon Sep 17 00:00:00 2001 From: Mike Eltsufin Date: Thu, 26 Jan 2023 10:41:18 -0500 Subject: [PATCH 23/24] feat: remove deprecated OOB flow (#2242) Also remove `google-api-client-java6` module which is empty after removal of `GooglePromptReceiver.java`. --- docs/component-modules.md | 6 -- google-api-client-assembly/classpath-include | 1 - google-api-client-assembly/pom.xml | 4 - google-api-client-bom/pom.xml | 5 - google-api-client-java6/pom.xml | 96 ------------------- .../auth/oauth2/GooglePromptReceiver.java | 41 -------- .../java6/auth/oauth2/package-info.java | 21 ---- .../auth/oauth2/GoogleOAuthConstants.java | 12 --- pom.xml | 10 -- 9 files changed, 196 deletions(-) delete mode 100644 google-api-client-java6/pom.xml delete mode 100644 google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java delete mode 100644 google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/package-info.java diff --git a/docs/component-modules.md b/docs/component-modules.md index 264788217..7277febc0 100644 --- a/docs/component-modules.md +++ b/docs/component-modules.md @@ -43,12 +43,6 @@ Jackson2 extensions to the Google API Client Library for Java (`google-api-client-jackson2`). This module depends on `google-api-client` and `google-http-client-jackson2`. -## google-api-client-java6 - -Java 6 (and higher) extensions to the Google API Client Library for Java -(`google-api-client-java6`). This module depends on `google-api-client` and -`google-oauth-client-java6`. - ## google-api-client-protobuf [Protocol buffer][protobuf] extensions to the Google API Client Library for Java diff --git a/google-api-client-assembly/classpath-include b/google-api-client-assembly/classpath-include index c6e53b922..7753e19a6 100644 --- a/google-api-client-assembly/classpath-include +++ b/google-api-client-assembly/classpath-include @@ -3,7 +3,6 @@ - diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 34eebca7c..b9db66a92 100644 --- a/google-api-client-assembly/pom.xml +++ b/google-api-client-assembly/pom.xml @@ -37,10 +37,6 @@ com.google.api-client google-api-client-jackson2 - - com.google.api-client - google-api-client-java6 - com.google.api-client google-api-client-protobuf diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index e0da65af9..d225f0864 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -91,11 +91,6 @@ google-api-client-jackson2 2.1.5-SNAPSHOT - - com.google.api-client - google-api-client-java6 - 2.1.5-SNAPSHOT - com.google.api-client google-api-client-protobuf diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml deleted file mode 100644 index 72aa64920..000000000 --- a/google-api-client-java6/pom.xml +++ /dev/null @@ -1,96 +0,0 @@ - - 4.0.0 - - com.google.api-client - google-api-client-parent - 2.1.5-SNAPSHOT - ../pom.xml - - google-api-client-java6 - Java 6 (and higher) Extensions to the Google API Client Library for Java. - - - - maven-javadoc-plugin - - - http://download.oracle.com/javase/7/docs/api/ - https://googleapis.dev/java/google-http-client/${project.http.version}/ - - ${project.name} ${project.version} - ${project.artifactId} ${project.version} - - - - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - true - - - google.api.client.java6 - - - - - - org.apache.felix - maven-bundle-plugin - 5.1.8 - - - bundle-manifest - process-classes - - manifest - - - - - - https://googleapis.dev/java/google-api-client/${project.version}/index.html - Java 6 extensions to the Google APIs Client Library for Java - com.google.api.client.java6 - - - - - maven-source-plugin - - - source-jar - compile - - jar - - - - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - org.codehaus.mojo.signature - java17 - 1.0 - - - - - - - - com.google.api-client - google-api-client - - - com.google.oauth-client - google-oauth-client-java6 - - - diff --git a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java b/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java deleted file mode 100644 index 0fcc8e336..000000000 --- a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2012 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -package com.google.api.client.googleapis.extensions.java6.auth.oauth2; - -import com.google.api.client.extensions.java6.auth.oauth2.AbstractPromptReceiver; -import com.google.api.client.googleapis.auth.oauth2.GoogleOAuthConstants; -import java.io.IOException; - -/** - * Google OAuth 2.0 abstract verification code receiver that prompts user to paste the code copied - * from the browser. - * - *

This uses deprecated OAuth out-of-band (oob) flow. To migrate to an alternative flow, please - * refer to Making - * Google OAuth interactions safer by using more secure OAuth flows. - * - *

Implementation is thread-safe. - * - * @since 1.11 - * @author Yaniv Inbar - */ -@Deprecated -public class GooglePromptReceiver extends AbstractPromptReceiver { - - @Override - public String getRedirectUri() throws IOException { - return GoogleOAuthConstants.OOB_REDIRECT_URI; - } -} diff --git a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/package-info.java b/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/package-info.java deleted file mode 100644 index a07b65a90..000000000 --- a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2012 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except - * in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -/** - * Google OAuth 2.0 utilities that help simplify the authorization flow on Java 6. - * - * @since 1.11 - * @author Yaniv Inbar - */ -package com.google.api.client.googleapis.extensions.java6.auth.oauth2; diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java index 2e4ea5733..809c96dda 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java @@ -40,17 +40,5 @@ public class GoogleOAuthConstants { public static final String DEFAULT_PUBLIC_CERTS_ENCODED_URL = "https://www.googleapis.com/oauth2/v1/certs"; - /** - * Redirect URI to use for an installed application as specified in Using OAuth 2.0 for - * Mobile & Desktop Apps. - * - *

OAuth out-of-band (oob) flow has been deprecated. To migrate to an alternative flow, please - * refer to Making Google - * OAuth interactions safer by using more secure OAuth flows. - */ - @Deprecated public static final String OOB_REDIRECT_URI = "urn:ietf:wg:oauth:2.0:oob"; - private GoogleOAuthConstants() {} } diff --git a/pom.xml b/pom.xml index 2df3abfa3..cd0292910 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,6 @@ google-api-client-bom google-api-client-gson google-api-client-jackson2 - google-api-client-java6 google-api-client-protobuf google-api-client-xml @@ -178,11 +177,6 @@ google-api-client-android ${project.version} - - com.google.api-client - google-api-client-java6 - ${project.version} - com.google.api-client google-api-client-gson @@ -410,10 +404,6 @@ google-api-client-jackson2 com.google.api.client.googleapis.notifications.json.jackson2.* - - google-api-client-java6 - com.google.api.client.googleapis.extensions.java6.* - google-api-client-protobuf com.google.api.client.googleapis.services.protobuf*:com.google.api.client.googleapis.testing.services.protobuf* From 8f75dc6808d3c75a0486ca8b3ab7cc7a3104042b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 10:58:54 -0500 Subject: [PATCH 24/24] chore(main): release 2.2.0 (#2247) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ google-api-client-android/pom.xml | 2 +- google-api-client-appengine/pom.xml | 2 +- google-api-client-assembly/pom.xml | 2 +- google-api-client-bom/pom.xml | 20 ++++++++++---------- google-api-client-gson/pom.xml | 2 +- google-api-client-jackson2/pom.xml | 2 +- google-api-client-protobuf/pom.xml | 2 +- google-api-client-servlet/pom.xml | 2 +- google-api-client-xml/pom.xml | 2 +- google-api-client/pom.xml | 2 +- pom.xml | 2 +- versions.txt | 2 +- 13 files changed, 28 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 751a622d6..1977010cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.2.0](https://github.com/googleapis/google-api-java-client/compare/v2.1.4...v2.2.0) (2023-01-26) + + +### Features + +* Remove deprecated OOB flow ([#2242](https://github.com/googleapis/google-api-java-client/issues/2242)) ([bb494ee](https://github.com/googleapis/google-api-java-client/commit/bb494ee28f806570e2de81f3e76678137512fab3)) + ## [2.1.4](https://github.com/googleapis/google-api-java-client/compare/v2.1.3...v2.1.4) (2023-01-26) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index e50e6a764..8f8851fd1 100644 --- a/google-api-client-android/pom.xml +++ b/google-api-client-android/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.5-SNAPSHOT + 2.2.0 ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 445254cab..4d5917217 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.5-SNAPSHOT + 2.2.0 ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index b9db66a92..d07bf521b 100644 --- a/google-api-client-assembly/pom.xml +++ b/google-api-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.5-SNAPSHOT + 2.2.0 ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index d225f0864..656c8aa66 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api-client google-api-client-bom - 2.1.5-SNAPSHOT + 2.2.0 pom Google API Client Library for Java BOM @@ -63,48 +63,48 @@ com.google.api-client google-api-client - 2.1.5-SNAPSHOT + 2.2.0 com.google.api-client google-api-client-android - 2.1.5-SNAPSHOT + 2.2.0 com.google.api-client google-api-client-appengine - 2.1.5-SNAPSHOT + 2.2.0 com.google.api-client google-api-client-assembly - 2.1.5-SNAPSHOT + 2.2.0 pom com.google.api-client google-api-client-gson - 2.1.5-SNAPSHOT + 2.2.0 com.google.api-client google-api-client-jackson2 - 2.1.5-SNAPSHOT + 2.2.0 com.google.api-client google-api-client-protobuf - 2.1.5-SNAPSHOT + 2.2.0 com.google.api-client google-api-client-servlet - 2.1.5-SNAPSHOT + 2.2.0 com.google.api-client google-api-client-xml - 2.1.5-SNAPSHOT + 2.2.0 diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index fb49b1ecf..ff54eafda 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.5-SNAPSHOT + 2.2.0 ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index a0da996c2..859ab90be 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.5-SNAPSHOT + 2.2.0 ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index 99d5a9caf..30d96e61a 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.5-SNAPSHOT + 2.2.0 ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index bc87d0c7a..45ec9d71b 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.5-SNAPSHOT + 2.2.0 ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index f82dd2862..be32e6367 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.5-SNAPSHOT + 2.2.0 ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 54492a20e..3bb3dd0c8 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 2.1.5-SNAPSHOT + 2.2.0 ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index cd0292910..fe6c58dba 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api-client google-api-client-parent - 2.1.5-SNAPSHOT + 2.2.0 pom Parent for the Google API Client Library for Java The Google APIs Client Library for Java is a Java client library diff --git a/versions.txt b/versions.txt index 67bda5cf9..ffda2b44e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:2.1.4:2.1.5-SNAPSHOT +google-api-client:2.2.0:2.2.0