From 1411efc27a2113408bafb52da9b61d409ebe7790 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 24 Jun 2021 16:00:11 +0000 Subject: [PATCH 01/39] chore: release 1.32.2-SNAPSHOT (#1842) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.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 b1eb186ad..778045245 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 - 1.32.1 + 1.32.2-SNAPSHOT ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 5855aa308..c4b828478 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 - 1.32.1 + 1.32.2-SNAPSHOT ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index c7b1499ea..c77188c75 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 - 1.32.1 + 1.32.2-SNAPSHOT ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index 14f523c98..88e76c114 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 - 1.32.1 + 1.32.2-SNAPSHOT pom Google API Client Library for Java BOM @@ -63,53 +63,53 @@ com.google.api-client google-api-client - 1.32.1 + 1.32.2-SNAPSHOT com.google.api-client google-api-client-android - 1.32.1 + 1.32.2-SNAPSHOT com.google.api-client google-api-client-appengine - 1.32.1 + 1.32.2-SNAPSHOT com.google.api-client google-api-client-assembly - 1.32.1 + 1.32.2-SNAPSHOT pom com.google.api-client google-api-client-gson - 1.32.1 + 1.32.2-SNAPSHOT com.google.api-client google-api-client-jackson2 - 1.32.1 + 1.32.2-SNAPSHOT com.google.api-client google-api-client-java6 - 1.32.1 + 1.32.2-SNAPSHOT com.google.api-client google-api-client-protobuf - 1.32.1 + 1.32.2-SNAPSHOT com.google.api-client google-api-client-servlet - 1.32.1 + 1.32.2-SNAPSHOT com.google.api-client google-api-client-xml - 1.32.1 + 1.32.2-SNAPSHOT diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index 913d2daf3..d6e557cfc 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 - 1.32.1 + 1.32.2-SNAPSHOT ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 33568b65d..d8cf6146c 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 - 1.32.1 + 1.32.2-SNAPSHOT ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index a573ba6ab..2c7cf31be 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 - 1.32.1 + 1.32.2-SNAPSHOT ../pom.xml google-api-client-java6 diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index 52b823e4a..06fa8ffba 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 - 1.32.1 + 1.32.2-SNAPSHOT ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index af897e8b6..983ea69f0 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 - 1.32.1 + 1.32.2-SNAPSHOT ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index df6603144..e8a06eaa0 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 - 1.32.1 + 1.32.2-SNAPSHOT ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index db4ca4d69..940d2c640 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 - 1.32.1 + 1.32.2-SNAPSHOT ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index 3c5b84437..c4f791b42 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api-client google-api-client-parent - 1.32.1 + 1.32.2-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 708ae916c..d8a9ca9cc 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:1.32.1:1.32.1 +google-api-client:1.32.1:1.32.2-SNAPSHOT From a617a1082b9752dd489cbc8c2d50fcee7df7c440 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 25 Jun 2021 18:12:36 +0200 Subject: [PATCH 02/39] chore(deps): update dependency com.google.api-client:google-api-client to v1.32.1 (#1843) --- 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 e3dde2ad6..bc9522a1e 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 - 1.31.5 + 1.32.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 64890ba77..da7d5c676 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.api-client google-api-client - 1.31.5 + 1.32.1 From 2e186dd56456cce7d96f212f4d941e198593892a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 9 Jul 2021 17:36:10 +0200 Subject: [PATCH 03/39] chore(deps): update dependency com.google.cloud:libraries-bom to v20.8.0 (#1848) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource 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://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `20.7.0` -> `20.8.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.8.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.8.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.8.0/compatibility-slim/20.7.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.8.0/confidence-slim/20.7.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration πŸ“… **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 66a09abce..53531498e 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.7.0 + 20.8.0 pom import From e898cddb8764a093c9862e59148e28b50beb8752 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 22 Jul 2021 14:08:45 +0200 Subject: [PATCH 04/39] chore(deps): update dependency com.google.appengine:appengine-api-1.0-sdk to v1.9.90 (#1849) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c4f791b42..78ebaf165 100644 --- a/pom.xml +++ b/pom.xml @@ -501,7 +501,7 @@ 2.8.6 3.17.3 30.1.1-android - 1.9.89 + 1.9.90 1.1.4c 2.3-eb 3.2.2 From eeddd6625c3a30e1182a70a541aae804a2381c85 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 28 Jul 2021 01:08:29 +0200 Subject: [PATCH 05/39] chore(deps): update dependency com.google.cloud:libraries-bom to v20.9.0 (#1850) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource 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://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `20.8.0` -> `20.9.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.9.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.9.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.9.0/compatibility-slim/20.8.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/20.9.0/confidence-slim/20.8.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration πŸ“… **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 53531498e..bffba77b0 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.8.0 + 20.9.0 pom import From a1e3a863c7e8a43d979f77ff6112f63d7f47c6dd Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 12 Aug 2021 22:38:35 +0200 Subject: [PATCH 06/39] chore(deps): update dependency com.google.googlejavaformat:google-java-format to v1.11.0 (#1851) --- google-api-client-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index 88e76c114..a571a11b4 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -154,7 +154,7 @@ com.google.googlejavaformat google-java-format - 1.10.0 + 1.11.0 diff --git a/pom.xml b/pom.xml index 78ebaf165..279287d4b 100644 --- a/pom.xml +++ b/pom.xml @@ -485,7 +485,7 @@ com.google.googlejavaformat google-java-format - 1.10.0 + 1.11.0 From 21fa63514c2a365811aca425d60e8572be5df596 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 16 Aug 2021 15:10:34 -0700 Subject: [PATCH 07/39] build(java): use ENABLE_FLAKYBOT env variable (#1854) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/2ca78ed9-c85f-44d6-82c3-97435febc333/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/ff01716e16d2c6e87eaf87197b753ac9fcbbed5d --- .kokoro/build.sh | 2 +- .kokoro/nightly/integration.cfg | 2 +- .kokoro/nightly/samples.cfg | 2 +- synth.metadata | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index b615ef989..5bcd551cf 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -115,7 +115,7 @@ fi # fix output location of logs bash .kokoro/coerce_logs.sh -if [[ "${ENABLE_BUILD_COP}" == "true" ]] +if [[ "${ENABLE_FLAKYBOT}" == "true" ]] then chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/google-api-java-client diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index 0048c8ece..e51c7b4c6 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -22,7 +22,7 @@ env_vars: { } env_vars: { - key: "ENABLE_BUILD_COP" + key: "ENABLE_FLAKYBOT" value: "true" } diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg index f25429314..9761fd864 100644 --- a/.kokoro/nightly/samples.cfg +++ b/.kokoro/nightly/samples.cfg @@ -33,6 +33,6 @@ env_vars: { } env_vars: { - key: "ENABLE_BUILD_COP" + key: "ENABLE_FLAKYBOT" value: "true" } diff --git a/synth.metadata b/synth.metadata index d4287aee8..f2282c99f 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/google-api-java-client.git", - "sha": "d979c5bfdeaf8bd85cd7295abf5695dc6095bad6" + "sha": "a1e3a863c7e8a43d979f77ff6112f63d7f47c6dd" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "87254ac89a9559864c0a245d6b150406439ce3d8" + "sha": "ff01716e16d2c6e87eaf87197b753ac9fcbbed5d" } } ], From 4290f2574780faa990402ba0575480ce26f7a403 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 17 Aug 2021 16:56:28 +0200 Subject: [PATCH 08/39] chore(deps): update dependency com.google.cloud:libraries-bom to v21 (#1856) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource 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://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `20.9.0` -> `21.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/21.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/21.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/21.0.0/compatibility-slim/20.9.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/21.0.0/confidence-slim/20.9.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration πŸ“… **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 bffba77b0..69de3447c 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.9.0 + 21.0.0 pom import From b6002625bf53c91c6e105ac0500603129b4ba0b9 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 19 Aug 2021 18:13:18 +0200 Subject: [PATCH 09/39] chore(deps): update dependency com.google.appengine:appengine-api-1.0-sdk to v1.9.91 (#1857) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 279287d4b..cf7f13861 100644 --- a/pom.xml +++ b/pom.xml @@ -501,7 +501,7 @@ 2.8.6 3.17.3 30.1.1-android - 1.9.90 + 1.9.91 1.1.4c 2.3-eb 3.2.2 From 1266ec30695a53214fbd3017ebc8f0ffe7a36a09 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Thu, 19 Aug 2021 12:55:20 -0700 Subject: [PATCH 10/39] chore: udpate doclet version (#1858) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf7f13861..9e5507161 100644 --- a/pom.xml +++ b/pom.xml @@ -621,7 +621,7 @@ com.microsoft.doclet.DocFxDoclet false - ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.0.jar + ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.1.1.jar -outputpath ${project.build.directory}/docfx-yml -projectname ${artifactId} none protected From 912d3b58043d07016cef14a183fcc9d469102546 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 23 Aug 2021 18:49:57 +0200 Subject: [PATCH 11/39] chore(deps): update dependency com.coveo:fmt-maven-plugin to v2.12 (#1859) --- google-api-client-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index a571a11b4..7669359c8 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -145,7 +145,7 @@ com.coveo fmt-maven-plugin - 2.11 + 2.12 true diff --git a/pom.xml b/pom.xml index 9e5507161..bf531f397 100644 --- a/pom.xml +++ b/pom.xml @@ -476,7 +476,7 @@ com.coveo fmt-maven-plugin - 2.11 + 2.12 true From 190f135f5dd08ec2ce6d5682bf1a1e5769015164 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 24 Aug 2021 19:31:12 +0200 Subject: [PATCH 12/39] chore(deps): update dependency com.google.oauth-client:google-oauth-client-bom to v1.32.1 (#1860) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bf531f397..e34e17656 100644 --- a/pom.xml +++ b/pom.xml @@ -496,7 +496,7 @@ 1.39.2 4.4.14 4.5.13 - 1.31.5 + 1.32.1 3.0.2 2.8.6 3.17.3 From ed1ecf0da2fe58c1ae1b0c59af0a74b38780ae0c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 25 Aug 2021 16:22:29 -0700 Subject: [PATCH 13/39] chore: enable release-trigger bot (#1862) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/80b4ed05-dc89-4733-bf79-3c5aeba8b787/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/63cff634aabb85854caa511c5837ea6b45f42b4b --- .github/release-trigger.yml | 1 + synth.metadata | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 .github/release-trigger.yml diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml new file mode 100644 index 000000000..d4ca94189 --- /dev/null +++ b/.github/release-trigger.yml @@ -0,0 +1 @@ +enabled: true diff --git a/synth.metadata b/synth.metadata index f2282c99f..a2dddfa00 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/google-api-java-client.git", - "sha": "a1e3a863c7e8a43d979f77ff6112f63d7f47c6dd" + "sha": "190f135f5dd08ec2ce6d5682bf1a1e5769015164" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ff01716e16d2c6e87eaf87197b753ac9fcbbed5d" + "sha": "63cff634aabb85854caa511c5837ea6b45f42b4b" } } ], @@ -25,6 +25,7 @@ ".github/generated-files-bot.yml", ".github/readme/synth.py", ".github/release-please.yml", + ".github/release-trigger.yml", ".github/snippet-bot.yml", ".github/sync-repo-settings.yaml", ".github/trusted-contribution.yml", From 6edf17e166da6b91c6a94a191630b0b369a36287 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 27 Aug 2021 17:02:34 +0200 Subject: [PATCH 14/39] chore(deps): update dependency com.google.cloud:libraries-bom to v22 (#1864) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource 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://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `21.0.0` -> `22.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/22.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/22.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/22.0.0/compatibility-slim/21.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/22.0.0/confidence-slim/21.0.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration πŸ“… **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 69de3447c..8ddc73dd1 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 21.0.0 + 22.0.0 pom import From f7e7a675b8ac2ca32d891e2219b27203bf128e2e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 8 Sep 2021 23:14:10 +0200 Subject: [PATCH 15/39] chore(deps): update dependency com.google.cloud:libraries-bom to v23 (#1868) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource 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://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `22.0.0` -> `23.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.0.0/compatibility-slim/22.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.0.0/confidence-slim/22.0.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration πŸ“… **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 8ddc73dd1..e706dd4ac 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 22.0.0 + 23.0.0 pom import From 02d60712b58a1af4cbab3cd57129ddb2835e0575 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 8 Sep 2021 15:08:39 -0700 Subject: [PATCH 16/39] chore: remove readme autosynth config (#1870) --- .github/readme/synth.py | 19 ------------ .kokoro/continuous/readme.cfg | 55 ----------------------------------- 2 files changed, 74 deletions(-) delete mode 100644 .github/readme/synth.py delete mode 100644 .kokoro/continuous/readme.cfg diff --git a/.github/readme/synth.py b/.github/readme/synth.py deleted file mode 100644 index 7b48cc28d..000000000 --- a/.github/readme/synth.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2020 Google LLC -# -# 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. - -"""This script is used to synthesize generated the README for this library.""" - -from synthtool.languages import java - -java.custom_templates(["java_library/README.md"]) diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg deleted file mode 100644 index aa35f0b8d..000000000 --- a/.kokoro/continuous/readme.cfg +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2020 Google LLC -# -# 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. - -# Format: //devtools/kokoro/config/proto/build.proto - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/python-multi" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/google-api-java-client/.kokoro/readme.sh" -} - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - regex: "**/*sponge_log.log" - } -} - -# The github token is stored here. -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" - # TODO(theacodes): remove this after secrets have globally propagated - backend_type: FASTCONFIGPUSH - } - } -} - -# Common env vars for all repositories and builds. -env_vars: { - key: "GITHUB_USER" - value: "yoshi-automation" -} -env_vars: { - key: "GITHUB_EMAIL" - value: "yoshi-automation@google.com" -} From b7c1d0e805cef61008e3965e1d960c26eeb1faac Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 10 Sep 2021 13:30:45 -0700 Subject: [PATCH 17/39] chore: regenerate common templates (#1871) * chore(java): remove readme autosynth job config README generation is now handled by owlbot Source-Author: Jeff Ching Source-Date: Wed Sep 8 12:11:28 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: df5093b950d4aafd49a4c7758d74c44485263ada Source-Link: https://github.com/googleapis/synthtool/commit/df5093b950d4aafd49a4c7758d74c44485263ada * chore: remove readme synth.py config Source-Author: Jeff Ching Source-Date: Wed Sep 8 13:23:41 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: 2d31a9243781b282202b4f76dc7bbc8b45803196 Source-Link: https://github.com/googleapis/synthtool/commit/2d31a9243781b282202b4f76dc7bbc8b45803196 * chore: add gcf-owl-bot to list of trusted contributors Source-Author: Jeff Ching Source-Date: Wed Sep 8 13:42:12 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: a6b97202771f89a4b76873d43ea9a07d7fc95f91 Source-Link: https://github.com/googleapis/synthtool/commit/a6b97202771f89a4b76873d43ea9a07d7fc95f91 * chore(java): update shared-config and shared-dependencies version in pom template Source-Author: Neenu Shaji Source-Date: Wed Sep 8 17:28:48 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e Source-Link: https://github.com/googleapis/synthtool/commit/396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e --- .github/trusted-contribution.yml | 3 ++- .kokoro/release/common.sh | 2 +- .kokoro/release/drop.sh | 2 +- .kokoro/release/promote.sh | 2 +- .kokoro/release/publish_javadoc.sh | 2 +- .kokoro/release/publish_javadoc11.sh | 2 +- .kokoro/release/stage.sh | 2 +- .kokoro/trampoline.sh | 2 +- synth.metadata | 6 ++---- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml index f247d5c78..a0ba1f7d9 100644 --- a/.github/trusted-contribution.yml +++ b/.github/trusted-contribution.yml @@ -1,2 +1,3 @@ trustedContributors: -- renovate-bot \ No newline at end of file +- renovate-bot +- gcf-owl-bot[bot] diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh index 6e3f65999..7f78ee414 100755 --- a/.kokoro/release/common.sh +++ b/.kokoro/release/common.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh index 5c4551efa..742ec1a88 100755 --- a/.kokoro/release/drop.sh +++ b/.kokoro/release/drop.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh index 1fa95fa53..3cac3d8a9 100755 --- a/.kokoro/release/promote.sh +++ b/.kokoro/release/promote.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index dd4d56ade..ac6b4d649 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2019 Google Inc. +# Copyright 2019 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 74608833a..19d42a7bc 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2021 Google Inc. +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 8a1033843..77dc4e8f0 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh index 9da0f8398..8b69b793c 100644 --- a/.kokoro/trampoline.sh +++ b/.kokoro/trampoline.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/synth.metadata b/synth.metadata index a2dddfa00..08cf7b8bd 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/google-api-java-client.git", - "sha": "190f135f5dd08ec2ce6d5682bf1a1e5769015164" + "sha": "f7e7a675b8ac2ca32d891e2219b27203bf128e2e" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "63cff634aabb85854caa511c5837ea6b45f42b4b" + "sha": "396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e" } } ], @@ -23,7 +23,6 @@ ".github/PULL_REQUEST_TEMPLATE.md", ".github/blunderbuss.yml", ".github/generated-files-bot.yml", - ".github/readme/synth.py", ".github/release-please.yml", ".github/release-trigger.yml", ".github/snippet-bot.yml", @@ -38,7 +37,6 @@ ".kokoro/common.sh", ".kokoro/continuous/common.cfg", ".kokoro/continuous/java8.cfg", - ".kokoro/continuous/readme.cfg", ".kokoro/dependencies.sh", ".kokoro/nightly/common.cfg", ".kokoro/nightly/integration.cfg", From a96fbd74b7286ae0d33d5c420052a559bf4bfe93 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 10 Sep 2021 22:49:32 +0200 Subject: [PATCH 18/39] chore(deps): update project.http.version to v1.40.0 (#1863) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e34e17656..4e4b7d05f 100644 --- a/pom.xml +++ b/pom.xml @@ -493,7 +493,7 @@ UTF-8 - 1.39.2 + 1.40.0 4.4.14 4.5.13 1.32.1 From 07b4e68d1a7c926b81ff7debc44512cb88bd79ef Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 15 Sep 2021 23:54:01 +0200 Subject: [PATCH 19/39] chore(deps): update dependency com.google.protobuf:protobuf-java to v3.18.0 (#1876) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e4b7d05f..94d697a59 100644 --- a/pom.xml +++ b/pom.xml @@ -499,7 +499,7 @@ 1.32.1 3.0.2 2.8.6 - 3.17.3 + 3.18.0 30.1.1-android 1.9.91 1.1.4c From 7bbdc644be459ec68a3d2525e69bfaca717f6cba Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Thu, 16 Sep 2021 11:21:02 -0700 Subject: [PATCH 20/39] chore: update java docfx doclet (#1875) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 94d697a59..079ec515e 100644 --- a/pom.xml +++ b/pom.xml @@ -621,7 +621,7 @@ com.microsoft.doclet.DocFxDoclet false - ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.1.1.jar + ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.2.0.jar -outputpath ${project.build.directory}/docfx-yml -projectname ${artifactId} none protected From 041a4b7881040b8aa690d58c433a537ef13b0dc7 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 23 Sep 2021 11:25:52 -0700 Subject: [PATCH 21/39] chore: convert to owlbot (#1879) --- .github/.OwlBot.lock.yaml | 3 +++ synth.py => .github/.OwlBot.yaml | 17 +++------------- owlbot.py | 34 ++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 14 deletions(-) create mode 100644 .github/.OwlBot.lock.yaml rename synth.py => .github/.OwlBot.yaml (60%) create mode 100644 owlbot.py diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml new file mode 100644 index 000000000..ec24ba682 --- /dev/null +++ b/.github/.OwlBot.lock.yaml @@ -0,0 +1,3 @@ +docker: + digest: sha256:db1616f2f70823d8381d859835229e04371d14f59ac78063c5af73c55c3fffbb + image: gcr.io/repo-automation-bots/owlbot-java:latest diff --git a/synth.py b/.github/.OwlBot.yaml similarity index 60% rename from synth.py rename to .github/.OwlBot.yaml index 26c4d5bf3..8c5f03b4d 100644 --- a/synth.py +++ b/.github/.OwlBot.yaml @@ -1,5 +1,4 @@ - -# Copyright 2019 Google LLC +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,16 +11,6 @@ # 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. -"""This script is used to synthesize generated parts of this library.""" - -import synthtool.languages.java as java -java.common_templates(excludes=[ - "README.md", - "java.header", - "checkstyle.xml", - "renovate.json", - "license-checks.xml", - ".github/workflows/ci.yaml", - ".github/workflows/samples.yaml", -]) +docker: + image: "gcr.io/repo-automation-bots/owlbot-java:latest" diff --git a/owlbot.py b/owlbot.py new file mode 100644 index 000000000..75a649885 --- /dev/null +++ b/owlbot.py @@ -0,0 +1,34 @@ +# Copyright 2021 Google LLC +# +# 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 +# +# https://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. + +import synthtool as s +from synthtool.languages import java + + +for library in s.get_staging_dirs(): + # put any special-case replacements here + s.move(library) + +s.remove_staging_dirs() +java.common_templates( + excludes=[ + "README.md", + "java.header", + "checkstyle.xml", + "renovate.json", + "license-checks.xml", + ".github/workflows/ci.yaml", + ".github/workflows/samples.yaml", + ] +) From f4068b68a5db46086fd1db60f6dce91e0dc263c7 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Fri, 24 Sep 2021 11:31:47 -0700 Subject: [PATCH 22/39] chore: update java-docfx-doclet version (#1877) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 079ec515e..5241ee6aa 100644 --- a/pom.xml +++ b/pom.xml @@ -621,7 +621,7 @@ com.microsoft.doclet.DocFxDoclet false - ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.2.0.jar + ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.2.1.jar -outputpath ${project.build.directory}/docfx-yml -projectname ${artifactId} none protected From 62559566124658287d576c2bc04867d486a72836 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 28 Sep 2021 11:56:57 -0400 Subject: [PATCH 23/39] chore: remove java7 from required checks (#1884) --- .github/sync-repo-settings.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index a8c5b3ed6..1e50a4d99 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -8,13 +8,11 @@ branchProtectionRules: requiresCodeOwnerReviews: true requiresStrictStatusChecks: false requiredStatusCheckContexts: - - units (7) - units (8) - units (11) - windows - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - cla/google @@ -30,7 +28,6 @@ branchProtectionRules: - windows - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - cla/google From b6019d63c0e05482692cda0558e212d41807a4de Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 28 Sep 2021 13:00:54 -0400 Subject: [PATCH 24/39] chore: java 7 units check (#1885) --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index cc337f60d..44003fc23 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [7, 8, 11] + java: [8, 11] steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 @@ -99,4 +99,4 @@ jobs: - run: .kokoro/install_dependencies.sh - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr From 9f8b2441fdf7e4eec7a36b357ce8cb69e1d21707 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 28 Sep 2021 13:01:08 -0400 Subject: [PATCH 25/39] build: add jdk 17 to java units and dependency builds (#1216) (#1883) * update dependencies.sh to not pass MaxPermSize when jdk 17 is used. MaxPermSize is an unrecognized flag in jdk 17. Source-Link: https://github.com/googleapis/synthtool/commit/a4be3384ccb92364795d981f2863f6986fcee620 Post-Processor: gcr.io/repo-automation-bots/owlbot-java:latest@sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5 Co-authored-by: Owl Bot --- .github/.OwlBot.lock.yaml | 2 +- .github/blunderbuss.yml | 2 +- .kokoro/dependencies.sh | 23 ++++++++++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index ec24ba682..284c8b69d 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - digest: sha256:db1616f2f70823d8381d859835229e04371d14f59ac78063c5af73c55c3fffbb image: gcr.io/repo-automation-bots/owlbot-java:latest + digest: sha256:13b7387edb404234610d30473ac48210ae7fe42a136335ee2b2f8a07c4c7f6a5 diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml index 1a23ea42b..2176b0543 100644 --- a/.github/blunderbuss.yml +++ b/.github/blunderbuss.yml @@ -1,5 +1,5 @@ # Configuration for the Blunderbuss GitHub app. For more info see -# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss +# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss assign_prs_by: - labels: - samples diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9030ba8f9..9a5105d7e 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -28,7 +28,28 @@ source ${scriptDir}/common.sh java -version echo $JOB_TYPE -export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" +function determineMavenOpts() { + local javaVersion=$( + # filter down to the version line, then pull out the version between quotes, + # then trim the version number down to its minimal number (removing any + # update or suffix number). + java -version 2>&1 | grep "version" \ + | sed -E 's/^.*"(.*?)".*$/\1/g' \ + | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' + ) + + case $javaVersion in + "17") + # MaxPermSize is no longer supported as of jdk 17 + echo -n "-Xmx1024m" + ;; + *) + echo -n "-Xmx1024m -XX:MaxPermSize=128m" + ;; + esac +} + +export MAVEN_OPTS=$(determineMavenOpts) # this should run maven enforcer retry_with_backoff 3 10 \ From d1aa68ccbece1d90f39a7dbef56a1febca6a8bff Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 28 Sep 2021 14:14:14 -0400 Subject: [PATCH 26/39] chore: change branch master to main in sync-repo-settings.yaml (#1886) --- .github/sync-repo-settings.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 1e50a4d99..64903237e 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -2,7 +2,7 @@ rebaseMergeAllowed: false squashMergeAllowed: true mergeCommitAllowed: false branchProtectionRules: - - pattern: master + - pattern: main isAdminEnforced: true requiredApprovingReviewCount: 1 requiresCodeOwnerReviews: true From dadae64d8cb32de3ef68043be0a9bae14454f86a Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Wed, 29 Sep 2021 10:30:44 -0400 Subject: [PATCH 27/39] chore: change branch master to main in github configurations (#1887) --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 44003fc23..ab6ba39e6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: ci jobs: From 957faf21447de7fabe643709dc0bb5e0216017f5 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 29 Sep 2021 17:00:24 +0200 Subject: [PATCH 28/39] chore(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.1 (#1867) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource 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-javadoc-plugin](https://maven.apache.org/plugins/) | `3.2.0` -> `3.3.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.1/compatibility-slim/3.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.3.1/confidence-slim/3.2.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration πŸ“… **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-api-java-client). --- google-api-client-bom/pom.xml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index 7669359c8..6a3f6eb89 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.1 true diff --git a/pom.xml b/pom.xml index 5241ee6aa..aa998a4b3 100644 --- a/pom.xml +++ b/pom.xml @@ -264,7 +264,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.1 attach-javadocs @@ -607,7 +607,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.1 docFX From cc7c44fd5070ec359331ca315db830759f82819c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 29 Sep 2021 17:00:33 +0200 Subject: [PATCH 29/39] chore(deps): update dependency org.codehaus.mojo:animal-sniffer-maven-plugin to v1.20 (#1708) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.codehaus.mojo:animal-sniffer-maven-plugin](http://www.mojohaus.org/animal-sniffer) ([source](https://togithub.com/mojohaus/animal-sniffer)) | `1.16` -> `1.20` | [![age](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:animal-sniffer-maven-plugin/1.20/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:animal-sniffer-maven-plugin/1.20/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:animal-sniffer-maven-plugin/1.20/compatibility-slim/1.16)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:animal-sniffer-maven-plugin/1.20/confidence-slim/1.16)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration πŸ“… **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 aa998a4b3..c2849c209 100644 --- a/pom.xml +++ b/pom.xml @@ -312,7 +312,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.16 + 1.20 org.apache.maven.plugins From df34f37a84f917572856b6454cb81c5d4fbf3323 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 29 Sep 2021 17:01:00 +0200 Subject: [PATCH 30/39] chore(deps): update dependency org.apache.maven.plugins:maven-enforcer-plugin to v3.0.0 (#1852) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource 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-enforcer-plugin](https://maven.apache.org/enforcer/) | `3.0.0-M3` -> `3.0.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-enforcer-plugin/3.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-enforcer-plugin/3.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-enforcer-plugin/3.0.0/compatibility-slim/3.0.0-M3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-enforcer-plugin/3.0.0/confidence-slim/3.0.0-M3)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration πŸ“… **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 c2849c209..cfb0d1e21 100644 --- a/pom.xml +++ b/pom.xml @@ -340,7 +340,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.0.0 enforce-maven From 4c9e2527d54a3b6775393878f9362fec8905a754 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 1 Oct 2021 16:14:50 +0200 Subject: [PATCH 31/39] chore(deps): update dependency com.google.cloud:libraries-bom to v23.1.0 (#1889) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource 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://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `23.0.0` -> `23.1.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.1.0/compatibility-slim/23.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/23.1.0/confidence-slim/23.0.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration πŸ“… **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). 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 e706dd4ac..3778e5bb3 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 23.0.0 + 23.1.0 pom import From d79fedc2a23327109abfc261a4ddab41382a4e03 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 6 Oct 2021 00:10:49 +0200 Subject: [PATCH 32/39] chore(deps): update dependency com.google.protobuf:protobuf-java to v3.18.1 (#1890) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cfb0d1e21..af63db344 100644 --- a/pom.xml +++ b/pom.xml @@ -499,7 +499,7 @@ 1.32.1 3.0.2 2.8.6 - 3.18.0 + 3.18.1 30.1.1-android 1.9.91 1.1.4c From f1e1193a7c494b6f34d817c00c8f815d06bd8512 Mon Sep 17 00:00:00 2001 From: "google-cloud-policy-bot[bot]" <80869356+google-cloud-policy-bot[bot]@users.noreply.github.com> Date: Tue, 5 Oct 2021 22:07:46 -0400 Subject: [PATCH 33/39] chore: add a Code of Conduct (#1822) Co-authored-by: google-cloud-policy-bot[bot] <80869356+google-cloud-policy-bot[bot]@users.noreply.github.com> --- CODE_OF_CONDUCT.md | 123 +++++++++++++-------------------------------- 1 file changed, 36 insertions(+), 87 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 2add2547a..46b2a08ea 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,94 +1,43 @@ - -# Code of Conduct +# Contributor Code of Conduct -## Our Pledge +As contributors and maintainers of this project, +and in the interest of fostering an open and welcoming community, +we pledge to respect all people who contribute through reporting issues, +posting feature requests, updating documentation, +submitting pull requests or patches, and other activities. -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, gender identity and expression, level of -experience, education, socio-economic status, nationality, personal appearance, -race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members +We are committed to making participation in this project +a harassment-free experience for everyone, +regardless of level of experience, gender, gender identity and expression, +sexual orientation, disability, personal appearance, +body size, race, ethnicity, age, religion, or nationality. Examples of unacceptable behavior by participants include: -* The use of sexualized language or imagery and unwelcome sexual attention or - advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, +such as physical or electronic +addresses, without explicit permission +* Other unethical or unprofessional conduct. Project maintainers have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions that are -not aligned to this Code of Conduct, or to ban temporarily or permanently any -contributor for other behaviors that they deem inappropriate, threatening, -offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. - -This Code of Conduct also applies outside the project spaces when the Project -Steward has a reasonable belief that an individual's behavior may have a -negative impact on the project or its community. - -## Conflict Resolution - -We do not believe that all conflict is bad; healthy debate and disagreement -often yield positive results. However, it is never okay to be disrespectful or -to engage in behavior that violates the project’s code of conduct. - -If you see someone violating the code of conduct, you are encouraged to address -the behavior directly with those involved. Many issues can be resolved quickly -and easily, and this gives people more control over the outcome of their -dispute. If you are unable to resolve the matter for any reason, or if the -behavior is threatening or harassing, report it. We are dedicated to providing -an environment where participants feel welcome and safe. - -Reports should be directed to *googleapis-stewards@google.com*, the -Project Steward(s) for *Google Cloud Client Libraries*. It is the Project Steward’s duty to -receive and address reported violations of the code of conduct. They will then -work with a committee consisting of representatives from the Open Source -Programs Office and the Google Open Source Strategy team. If for any reason you -are uncomfortable reaching out to the Project Steward, please email -opensource@google.com. - -We will investigate every complaint, but you may not receive a direct response. -We will use our discretion in determining when and how to follow up on reported -incidents, which may range from not taking action to permanent expulsion from -the project and project-sponsored spaces. We will notify the accused of the -report and provide them an opportunity to discuss it before any action is taken. -The identity of the reporter will be omitted from the details of the report -supplied to the accused. In potentially harmful situations, such as ongoing -harassment or threats to anyone's safety, we may take action without notice. - -## Attribution - -This Code of Conduct is adapted from the Contributor Covenant, version 1.4, -available at -https://www.contributor-covenant.org/version/1/4/code-of-conduct.html \ No newline at end of file +comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct. +By adopting this Code of Conduct, +project maintainers commit themselves to fairly and consistently +applying these principles to every aspect of managing this project. +Project maintainers who do not follow or enforce the Code of Conduct +may be permanently removed from the project team. + +This code of conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior +may be reported by opening an issue +or contacting one or more of the project maintainers. + +This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, +available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) From 62f6ab4c2c086c65ee54c6ef8db53b9effea6a31 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 7 Oct 2021 23:04:45 +0200 Subject: [PATCH 34/39] chore(deps): update dependency com.puppycrawl.tools:checkstyle to v9 (#1865) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `8.39` -> `9.0.1` | [![age](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/9.0.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/9.0.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/9.0.1/compatibility-slim/8.39)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/9.0.1/confidence-slim/8.39)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration πŸ“… **Schedule**: 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 [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-api-java-client). --- checkstyle.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checkstyle.xml b/checkstyle.xml index 2fcb7a388..7a91cbf35 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -70,7 +70,7 @@ page at http://checkstyle.sourceforge.net/config.html --> - + diff --git a/pom.xml b/pom.xml index af63db344..ce24d74d4 100644 --- a/pom.xml +++ b/pom.xml @@ -574,7 +574,7 @@ com.puppycrawl.tools checkstyle - 8.39 + 9.0.1 From d9661cf5636680cf226b9480de48c925fe80f225 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 8 Oct 2021 02:56:22 +0200 Subject: [PATCH 35/39] chore(deps): update project.http.version to v1.40.1 (#1892) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore(deps): update project.http.version to v1.40.1 * πŸ¦‰ Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- CODE_OF_CONDUCT.md | 123 ++++++++++++++++++++++++++++++++------------- pom.xml | 2 +- 2 files changed, 88 insertions(+), 37 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 46b2a08ea..2add2547a 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,43 +1,94 @@ -# Contributor Code of Conduct + +# Code of Conduct -As contributors and maintainers of this project, -and in the interest of fostering an open and welcoming community, -we pledge to respect all people who contribute through reporting issues, -posting feature requests, updating documentation, -submitting pull requests or patches, and other activities. +## Our Pledge -We are committed to making participation in this project -a harassment-free experience for everyone, -regardless of level of experience, gender, gender identity and expression, -sexual orientation, disability, personal appearance, -body size, race, ethnicity, age, religion, or nationality. +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of +experience, education, socio-economic status, nationality, personal appearance, +race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members Examples of unacceptable behavior by participants include: -* The use of sexualized language or imagery -* Personal attacks -* Trolling or insulting/derogatory comments -* Public or private harassment -* Publishing other's private information, -such as physical or electronic -addresses, without explicit permission -* Other unethical or unprofessional conduct. +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. Project maintainers have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct. -By adopting this Code of Conduct, -project maintainers commit themselves to fairly and consistently -applying these principles to every aspect of managing this project. -Project maintainers who do not follow or enforce the Code of Conduct -may be permanently removed from the project team. - -This code of conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. - -Instances of abusive, harassing, or otherwise unacceptable behavior -may be reported by opening an issue -or contacting one or more of the project maintainers. - -This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, -available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/) +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, or to ban temporarily or permanently any +contributor for other behaviors that they deem inappropriate, threatening, +offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +This Code of Conduct also applies outside the project spaces when the Project +Steward has a reasonable belief that an individual's behavior may have a +negative impact on the project or its community. + +## Conflict Resolution + +We do not believe that all conflict is bad; healthy debate and disagreement +often yield positive results. However, it is never okay to be disrespectful or +to engage in behavior that violates the project’s code of conduct. + +If you see someone violating the code of conduct, you are encouraged to address +the behavior directly with those involved. Many issues can be resolved quickly +and easily, and this gives people more control over the outcome of their +dispute. If you are unable to resolve the matter for any reason, or if the +behavior is threatening or harassing, report it. We are dedicated to providing +an environment where participants feel welcome and safe. + +Reports should be directed to *googleapis-stewards@google.com*, the +Project Steward(s) for *Google Cloud Client Libraries*. It is the Project Steward’s duty to +receive and address reported violations of the code of conduct. They will then +work with a committee consisting of representatives from the Open Source +Programs Office and the Google Open Source Strategy team. If for any reason you +are uncomfortable reaching out to the Project Steward, please email +opensource@google.com. + +We will investigate every complaint, but you may not receive a direct response. +We will use our discretion in determining when and how to follow up on reported +incidents, which may range from not taking action to permanent expulsion from +the project and project-sponsored spaces. We will notify the accused of the +report and provide them an opportunity to discuss it before any action is taken. +The identity of the reporter will be omitted from the details of the report +supplied to the accused. In potentially harmful situations, such as ongoing +harassment or threats to anyone's safety, we may take action without notice. + +## Attribution + +This Code of Conduct is adapted from the Contributor Covenant, version 1.4, +available at +https://www.contributor-covenant.org/version/1/4/code-of-conduct.html \ No newline at end of file diff --git a/pom.xml b/pom.xml index ce24d74d4..369449347 100644 --- a/pom.xml +++ b/pom.xml @@ -493,7 +493,7 @@ UTF-8 - 1.40.0 + 1.40.1 4.4.14 4.5.13 1.32.1 From 8747ea18d73a233dbc57c444b8234702bbaf9e94 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 8 Oct 2021 22:48:42 +0200 Subject: [PATCH 36/39] chore(deps): update dependency com.google.guava:guava to v31 (#1881) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 369449347..244528fba 100644 --- a/pom.xml +++ b/pom.xml @@ -500,7 +500,7 @@ 3.0.2 2.8.6 3.18.1 - 30.1.1-android + 31.0.1-jre 1.9.91 1.1.4c 2.3-eb From a2a634bd34450d188dbef3484af2ca3a350189b3 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Wed, 13 Oct 2021 15:23:52 -0700 Subject: [PATCH 37/39] chore: update doclet version (#1893) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 244528fba..4bde22874 100644 --- a/pom.xml +++ b/pom.xml @@ -621,7 +621,7 @@ com.microsoft.doclet.DocFxDoclet false - ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.2.1.jar + ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.3.0.jar -outputpath ${project.build.directory}/docfx-yml -projectname ${artifactId} none protected From aba605962518d5c8ee16361b042753c6d27884ba Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Thu, 14 Oct 2021 10:30:45 -0400 Subject: [PATCH 38/39] deps: update dependency com.google.guava:guava to v31 (#1894) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4bde22874..d523d9301 100644 --- a/pom.xml +++ b/pom.xml @@ -500,7 +500,7 @@ 3.0.2 2.8.6 3.18.1 - 31.0.1-jre + 31.0.1-android 1.9.91 1.1.4c 2.3-eb From efc940561481a8013c52a85d478674dd4b72ac59 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 14 Oct 2021 14:34:11 +0000 Subject: [PATCH 39/39] chore: release 1.32.2 (#1895) :robot: I have created a release \*beep\* \*boop\* --- ### [1.32.2](https://www.github.com/googleapis/google-api-java-client/compare/v1.32.1...v1.32.2) (2021-10-14) ### Dependencies * update dependency com.google.guava:guava to v31 ([#1894](https://www.github.com/googleapis/google-api-java-client/issues/1894)) ([aba6059](https://www.github.com/googleapis/google-api-java-client/commit/aba605962518d5c8ee16361b042753c6d27884ba)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ README.md | 4 ++-- 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 +- 15 files changed, 32 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c08c119ec..ee29a77fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.32.2](https://www.github.com/googleapis/google-api-java-client/compare/v1.32.1...v1.32.2) (2021-10-14) + + +### Dependencies + +* update dependency com.google.guava:guava to v31 ([#1894](https://www.github.com/googleapis/google-api-java-client/issues/1894)) ([aba6059](https://www.github.com/googleapis/google-api-java-client/commit/aba605962518d5c8ee16361b042753c6d27884ba)) + ### [1.32.1](https://www.github.com/googleapis/google-api-java-client/compare/v1.32.0...v1.32.1) (2021-06-24) diff --git a/README.md b/README.md index b29c854aa..5778a99b6 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ To use Maven, add the following lines to your pom.xml file: com.google.api-client google-api-client - 1.32.1 + 1.32.2 @@ -48,7 +48,7 @@ repositories { google() } dependencies { - compile 'com.google.api-client:google-api-client:1.32.1' + compile 'com.google.api-client:google-api-client:1.32.2' } ``` [//]: # ({x-version-update-end}) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index 778045245..228767fcf 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 - 1.32.2-SNAPSHOT + 1.32.2 ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index c4b828478..03a2cbf3a 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 - 1.32.2-SNAPSHOT + 1.32.2 ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index c77188c75..4bb6c5576 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 - 1.32.2-SNAPSHOT + 1.32.2 ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index 6a3f6eb89..4fde7e11e 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 - 1.32.2-SNAPSHOT + 1.32.2 pom Google API Client Library for Java BOM @@ -63,53 +63,53 @@ com.google.api-client google-api-client - 1.32.2-SNAPSHOT + 1.32.2 com.google.api-client google-api-client-android - 1.32.2-SNAPSHOT + 1.32.2 com.google.api-client google-api-client-appengine - 1.32.2-SNAPSHOT + 1.32.2 com.google.api-client google-api-client-assembly - 1.32.2-SNAPSHOT + 1.32.2 pom com.google.api-client google-api-client-gson - 1.32.2-SNAPSHOT + 1.32.2 com.google.api-client google-api-client-jackson2 - 1.32.2-SNAPSHOT + 1.32.2 com.google.api-client google-api-client-java6 - 1.32.2-SNAPSHOT + 1.32.2 com.google.api-client google-api-client-protobuf - 1.32.2-SNAPSHOT + 1.32.2 com.google.api-client google-api-client-servlet - 1.32.2-SNAPSHOT + 1.32.2 com.google.api-client google-api-client-xml - 1.32.2-SNAPSHOT + 1.32.2 diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index d6e557cfc..e0a8d0111 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 - 1.32.2-SNAPSHOT + 1.32.2 ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index d8cf6146c..6ccf5d704 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 - 1.32.2-SNAPSHOT + 1.32.2 ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index 2c7cf31be..381a0a689 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 - 1.32.2-SNAPSHOT + 1.32.2 ../pom.xml google-api-client-java6 diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index 06fa8ffba..96b675098 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 - 1.32.2-SNAPSHOT + 1.32.2 ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index 983ea69f0..bbfa48034 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 - 1.32.2-SNAPSHOT + 1.32.2 ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index e8a06eaa0..12783a7cc 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 - 1.32.2-SNAPSHOT + 1.32.2 ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 940d2c640..5cd1a6a84 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 - 1.32.2-SNAPSHOT + 1.32.2 ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index d523d9301..49a9c39d6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api-client google-api-client-parent - 1.32.2-SNAPSHOT + 1.32.2 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 d8a9ca9cc..2a12e2b80 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:1.32.1:1.32.2-SNAPSHOT +google-api-client:1.32.2:1.32.2