diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index dcdda8c6d..9786771c4 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,16 @@ +# Copyright 2022 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. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:9669c169d0582f13d6b2d319a43a78fc49f296a883aa48519bd0e5c7d34087c4 + digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index 7513acaeb..1bb182327 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -1,3 +1,18 @@ +# Copyright 2022 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. +# Github action job to test core java library features on +# downstream client libraries before they are released. on: pull_request: name: auto-merge-readme @@ -6,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v3 + - uses: actions/github-script@v5 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 9b4fd4d83..18e23230d 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -1,3 +1,18 @@ +# Copyright 2022 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. +# Github action job to test core java library features on +# downstream client libraries before they are released. on: pull_request: name: auto-release @@ -6,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.head_ref, 'release-please') steps: - - uses: actions/github-script@v3 + - uses: actions/github-script@v5 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true @@ -16,13 +31,13 @@ jobs: return; } - // only approve PRs like "chore: release " - if ( !context.payload.pull_request.title.startsWith("chore: release") ) { + // only approve PRs like "chore(main): release " + if ( !context.payload.pull_request.title.startsWith("chore(main): release") ) { return; } // only approve PRs with pom.xml and versions.txt changes - const filesPromise = github.pulls.listFiles.endpoint({ + const filesPromise = github.rest.pulls.listFiles.endpoint({ owner: context.repo.owner, repo: context.repo.repo, pull_number: context.payload.pull_request.number, @@ -54,7 +69,7 @@ jobs: return; } - const promise = github.pulls.list.endpoint({ + const promise = github.rest.pulls.list.endpoint({ owner: context.repo.owner, repo: context.repo.repo, state: 'open' @@ -71,7 +86,7 @@ jobs: } // approve release PR - await github.pulls.createReview({ + await github.rest.pulls.createReview({ owner: context.repo.owner, repo: context.repo.repo, body: 'Rubber stamped release!', @@ -80,7 +95,7 @@ jobs: }); // attach kokoro:force-run and automerge labels - await github.issues.addLabels({ + await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.pull_request.number, diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index c46230a78..d5d964df1 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -1,3 +1,18 @@ +# Copyright 2022 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. +# Github action job to test core java library features on +# downstream client libraries before they are released. on: pull_request: name: samples diff --git a/.kokoro/build.bat b/.kokoro/build.bat index 05826ad93..cc602c9eb 100644 --- a/.kokoro/build.bat +++ b/.kokoro/build.bat @@ -1,3 +1,18 @@ :: See documentation in type-shell-output.bat +# Copyright 2022 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. +# Github action job to test core java library features on +# downstream client libraries before they are released. "C:\Program Files\Git\bin\bash.exe" %~dp0build.sh diff --git a/.kokoro/nightly/java11-integration.cfg b/.kokoro/nightly/java11-integration.cfg new file mode 100644 index 000000000..58049cc38 --- /dev/null +++ b/.kokoro/nightly/java11-integration.cfg @@ -0,0 +1,37 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-public-resources/java11014" +} + +env_vars: { + key: "JOB_TYPE" + value: "integration" +} +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "ENABLE_FLAKYBOT" + value: "true" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} diff --git a/CHANGELOG.md b/CHANGELOG.md index 132b79b3b..418dd9f21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.33.1](https://github.com/googleapis/google-oauth-java-client/compare/v1.33.0...v1.33.1) (2022-02-08) + + +### Dependencies + +* **java:** update actions/github-script action to v5 ([#1339](https://github.com/googleapis/google-oauth-java-client/issues/1339)) ([#822](https://github.com/googleapis/google-oauth-java-client/issues/822)) ([1f15374](https://github.com/googleapis/google-oauth-java-client/commit/1f15374fe935bf46e9cda59270694f682ba5f75b)) + ## [1.33.0](https://github.com/googleapis/google-oauth-java-client/compare/v1.32.1...v1.33.0) (2022-01-19) diff --git a/google-oauth-client-appengine/pom.xml b/google-oauth-client-appengine/pom.xml index ad67fb6c5..6d66d11e8 100644 --- a/google-oauth-client-appengine/pom.xml +++ b/google-oauth-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.33.0 + 1.33.1 ../pom.xml google-oauth-client-appengine diff --git a/google-oauth-client-assembly/pom.xml b/google-oauth-client-assembly/pom.xml index fd043eca6..2b029c845 100644 --- a/google-oauth-client-assembly/pom.xml +++ b/google-oauth-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.33.0 + 1.33.1 ../pom.xml com.google.oauth-client diff --git a/google-oauth-client-bom/pom.xml b/google-oauth-client-bom/pom.xml index ef8216708..6c39565a6 100644 --- a/google-oauth-client-bom/pom.xml +++ b/google-oauth-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.oauth-client google-oauth-client-bom - 1.33.0 + 1.33.1 pom Google OAuth Client Library for Java BOM @@ -63,27 +63,27 @@ com.google.oauth-client google-oauth-client - 1.33.0 + 1.33.1 com.google.oauth-client google-oauth-client-appengine - 1.33.0 + 1.33.1 com.google.oauth-client google-oauth-client-java6 - 1.33.0 + 1.33.1 com.google.oauth-client google-oauth-client-jetty - 1.33.0 + 1.33.1 com.google.oauth-client google-oauth-client-servlet - 1.33.0 + 1.33.1 diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml index 8c3c58f54..7b768ba0e 100644 --- a/google-oauth-client-java6/pom.xml +++ b/google-oauth-client-java6/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.33.0 + 1.33.1 ../pom.xml google-oauth-client-java6 diff --git a/google-oauth-client-jetty/pom.xml b/google-oauth-client-jetty/pom.xml index 5dc57f890..ac34f6556 100644 --- a/google-oauth-client-jetty/pom.xml +++ b/google-oauth-client-jetty/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.33.0 + 1.33.1 ../pom.xml google-oauth-client-jetty diff --git a/google-oauth-client-servlet/pom.xml b/google-oauth-client-servlet/pom.xml index 3b7ccd55a..af44873de 100644 --- a/google-oauth-client-servlet/pom.xml +++ b/google-oauth-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.33.0 + 1.33.1 ../pom.xml google-oauth-client-servlet diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml index 2980da00f..7ec5e17f7 100644 --- a/google-oauth-client/pom.xml +++ b/google-oauth-client/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.33.0 + 1.33.1 ../pom.xml google-oauth-client diff --git a/pom.xml b/pom.xml index f4cdabe7f..0a68cef65 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.google.oauth-client google-oauth-client-parent - 1.33.0 + 1.33.1 pom Parent for the Google OAuth Client Library for Java Google OAuth Client Library for Java @@ -267,7 +267,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.20 + 1.21 org.apache.maven.plugins @@ -459,9 +459,9 @@ - google-api-java-client/google-api-client-assembly/android-properties (make the filenames match the version here) - Internally, update the default features.json file --> - 1.9.93 + 1.9.94 UTF-8 - 1.41.0 + 1.41.2 3.0.2 31.0-android 1.1.4c diff --git a/samples/dailymotion-cmdline-sample/pom.xml b/samples/dailymotion-cmdline-sample/pom.xml index 6ca841930..a5a0843b9 100644 --- a/samples/dailymotion-cmdline-sample/pom.xml +++ b/samples/dailymotion-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.33.0 + 1.33.1 ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/samples/keycloak-pkce-cmdline-sample/pom.xml b/samples/keycloak-pkce-cmdline-sample/pom.xml index d781c1046..5546ee074 100644 --- a/samples/keycloak-pkce-cmdline-sample/pom.xml +++ b/samples/keycloak-pkce-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.33.0 + 1.33.1 ../../pom.xml keycloak-pkce-cmdline-sample diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index bb58bb638..4105024c4 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -41,7 +41,7 @@ com.google.oauth-client google-oauth-client - 1.32.1 + 1.33.0 diff --git a/versions.txt b/versions.txt index c6324e7c2..4a2d69c6e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-oauth-client:1.33.0:1.33.0 +google-oauth-client:1.33.1:1.33.1