diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9351fdfb..426cf83e 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:387835a1375a0049ec44e02542c844302854c732d8291bdf8e472c0ff70a8f67 + digest: sha256:b0b1c1c89570e229b1026372a2b8989ba31495007055b8d30178b7648503eefa diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index 1bb18232..f5fc7d51 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 18e23230..7a106d00 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.head_ref, 'release-please') steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6b5e56aa..83ef7f9c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,8 +27,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -39,8 +39,8 @@ jobs: windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 @@ -54,8 +54,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -64,8 +64,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 11 @@ -76,8 +76,8 @@ jobs: clirr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index d5d964df..912ed8b2 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -20,9 +20,10 @@ jobs: checkstyle: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: + distribution: zulu java-version: 8 - name: Run checkstyle run: mvn -P lint --quiet --batch-mode checkstyle:check diff --git a/.kokoro/build.bat b/.kokoro/build.bat index cc602c9e..067cf4a4 100644 --- a/.kokoro/build.bat +++ b/.kokoro/build.bat @@ -1,18 +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. :: 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/integration.cfg b/.kokoro/nightly/integration.cfg index e51c7b4c..a2907a25 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -13,12 +13,12 @@ env_vars: { # TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" } env_vars: { key: "GOOGLE_CLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" } env_vars: { diff --git a/CHANGELOG.md b/CHANGELOG.md index 373ffe49..93a1b744 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [2.4.6](https://github.com/googleapis/java-recaptchaenterprise/compare/v2.4.5...v2.4.6) (2022-03-24) + + +### Dependencies + +* update dependency org.springframework.boot:spring-boot-starter-thymeleaf to v2.6.5 ([#741](https://github.com/googleapis/java-recaptchaenterprise/issues/741)) ([cff253e](https://github.com/googleapis/java-recaptchaenterprise/commit/cff253e2aaa318dea69797bbb2b28a659997d8d3)) +* update dependency org.springframework.boot:spring-boot-starter-web to v2.6.5 ([#740](https://github.com/googleapis/java-recaptchaenterprise/issues/740)) ([3712b21](https://github.com/googleapis/java-recaptchaenterprise/commit/3712b21bab0a5a853c0f66d896cba2d27b7815e0)) + ### [2.4.5](https://github.com/googleapis/java-recaptchaenterprise/compare/v2.4.4...v2.4.5) (2022-03-02) diff --git a/README.md b/README.md index 0a24aefc..5f527fbd 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 24.3.0 + 25.0.0 pom import @@ -42,7 +42,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-recaptchaenterprise - 2.4.4 + 2.4.5 ``` @@ -50,20 +50,20 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:24.4.0') +implementation platform('com.google.cloud:libraries-bom:25.0.0') implementation 'com.google.cloud:google-cloud-recaptchaenterprise' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-recaptchaenterprise:2.4.4' +implementation 'com.google.cloud:google-cloud-recaptchaenterprise:2.4.5' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-recaptchaenterprise" % "2.4.4" +libraryDependencies += "com.google.cloud" % "google-cloud-recaptchaenterprise" % "2.4.5" ``` ## Authentication diff --git a/google-cloud-recaptchaenterprise-bom/pom.xml b/google-cloud-recaptchaenterprise-bom/pom.xml index b48f7ddc..98a2d215 100644 --- a/google-cloud-recaptchaenterprise-bom/pom.xml +++ b/google-cloud-recaptchaenterprise-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-recaptchaenterprise-bom - 2.4.5 + 2.4.6 pom com.google.cloud google-cloud-shared-config - 1.2.7 + 1.3.0 Google Cloud reCAPTCHA Enterprise BOM @@ -52,27 +52,27 @@ com.google.cloud google-cloud-recaptchaenterprise - 2.4.5 + 2.4.6 com.google.api.grpc grpc-google-cloud-recaptchaenterprise-v1 - 2.4.5 + 2.4.6 com.google.api.grpc grpc-google-cloud-recaptchaenterprise-v1beta1 - 0.39.5 + 0.39.6 com.google.api.grpc proto-google-cloud-recaptchaenterprise-v1 - 2.4.5 + 2.4.6 com.google.api.grpc proto-google-cloud-recaptchaenterprise-v1beta1 - 0.39.5 + 0.39.6 diff --git a/google-cloud-recaptchaenterprise/pom.xml b/google-cloud-recaptchaenterprise/pom.xml index dc951f4e..ddfa3c79 100644 --- a/google-cloud-recaptchaenterprise/pom.xml +++ b/google-cloud-recaptchaenterprise/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-recaptchaenterprise - 2.4.5 + 2.4.6 jar reCAPTCHA Enterprise https://github.com/googleapis/java-recaptchaenterprise @@ -11,7 +11,7 @@ com.google.cloud google-cloud-recaptchaenterprise-parent - 2.4.5 + 2.4.6 google-cloud-recaptchaenterprise diff --git a/grpc-google-cloud-recaptchaenterprise-v1/pom.xml b/grpc-google-cloud-recaptchaenterprise-v1/pom.xml index bfcf888f..b6ee62ed 100644 --- a/grpc-google-cloud-recaptchaenterprise-v1/pom.xml +++ b/grpc-google-cloud-recaptchaenterprise-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-recaptchaenterprise-v1 - 2.4.5 + 2.4.6 grpc-google-cloud-recaptchaenterprise-v1 GRPC library for grpc-google-cloud-recaptchaenterprise-v1 com.google.cloud google-cloud-recaptchaenterprise-parent - 2.4.5 + 2.4.6 diff --git a/grpc-google-cloud-recaptchaenterprise-v1beta1/pom.xml b/grpc-google-cloud-recaptchaenterprise-v1beta1/pom.xml index 9a594a37..e673cd42 100644 --- a/grpc-google-cloud-recaptchaenterprise-v1beta1/pom.xml +++ b/grpc-google-cloud-recaptchaenterprise-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-recaptchaenterprise-v1beta1 - 0.39.5 + 0.39.6 grpc-google-cloud-recaptchaenterprise-v1beta1 GRPC library for grpc-google-cloud-recaptchaenterprise-v1beta1 com.google.cloud google-cloud-recaptchaenterprise-parent - 2.4.5 + 2.4.6 diff --git a/pom.xml b/pom.xml index 07196bbb..3a459fcb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-recaptchaenterprise-parent pom - 2.4.5 + 2.4.6 reCAPTCHA Enterprise Parent https://github.com/googleapis/java-recaptchaenterprise @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.7 + 1.3.0 @@ -61,27 +61,27 @@ com.google.api.grpc proto-google-cloud-recaptchaenterprise-v1 - 2.4.5 + 2.4.6 com.google.api.grpc proto-google-cloud-recaptchaenterprise-v1beta1 - 0.39.5 + 0.39.6 com.google.api.grpc grpc-google-cloud-recaptchaenterprise-v1 - 2.4.5 + 2.4.6 com.google.api.grpc grpc-google-cloud-recaptchaenterprise-v1beta1 - 0.39.5 + 0.39.6 com.google.cloud google-cloud-recaptchaenterprise - 2.4.5 + 2.4.6 diff --git a/proto-google-cloud-recaptchaenterprise-v1/pom.xml b/proto-google-cloud-recaptchaenterprise-v1/pom.xml index 2d80c522..d836891c 100644 --- a/proto-google-cloud-recaptchaenterprise-v1/pom.xml +++ b/proto-google-cloud-recaptchaenterprise-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-recaptchaenterprise-v1 - 2.4.5 + 2.4.6 proto-google-cloud-recaptchaenterprise-v1 PROTO library for proto-google-cloud-recaptchaenterprise-v1 com.google.cloud google-cloud-recaptchaenterprise-parent - 2.4.5 + 2.4.6 diff --git a/proto-google-cloud-recaptchaenterprise-v1beta1/pom.xml b/proto-google-cloud-recaptchaenterprise-v1beta1/pom.xml index e5d51e9a..67293ac1 100644 --- a/proto-google-cloud-recaptchaenterprise-v1beta1/pom.xml +++ b/proto-google-cloud-recaptchaenterprise-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-recaptchaenterprise-v1beta1 - 0.39.5 + 0.39.6 proto-google-cloud-recaptchaenterprise-v1beta1 PROTO library for proto-google-cloud-recaptchaenterprise-v1beta1 com.google.cloud google-cloud-recaptchaenterprise-parent - 2.4.5 + 2.4.6 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index dfd4f680..10aed0c5 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-recaptchaenterprise - 2.4.4 + 2.4.5 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 1d3e7262..041f1ce9 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-recaptchaenterprise - 2.4.5 + 2.4.6 diff --git a/samples/snippets/cloud-client/src/pom.xml b/samples/snippets/cloud-client/src/pom.xml index 3f6aeb87..320d5c2f 100644 --- a/samples/snippets/cloud-client/src/pom.xml +++ b/samples/snippets/cloud-client/src/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 24.3.0 + 25.0.0 pom import @@ -100,7 +100,7 @@ org.springframework.boot spring-boot-starter-web - 2.6.4 + 2.6.5 org.springframework.boot @@ -111,7 +111,7 @@ org.springframework.boot spring-boot-starter-thymeleaf - 2.6.4 + 2.6.5 com.google.api diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index fb83b2f5..bd5bef9e 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 24.3.0 + 25.0.0 pom import diff --git a/versions.txt b/versions.txt index 49f42ab4..7ec6af02 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-recaptchaenterprise:2.4.5:2.4.5 -grpc-google-cloud-recaptchaenterprise-v1:2.4.5:2.4.5 -grpc-google-cloud-recaptchaenterprise-v1beta1:0.39.5:0.39.5 -proto-google-cloud-recaptchaenterprise-v1:2.4.5:2.4.5 -proto-google-cloud-recaptchaenterprise-v1beta1:0.39.5:0.39.5 +google-cloud-recaptchaenterprise:2.4.6:2.4.6 +grpc-google-cloud-recaptchaenterprise-v1:2.4.6:2.4.6 +grpc-google-cloud-recaptchaenterprise-v1beta1:0.39.6:0.39.6 +proto-google-cloud-recaptchaenterprise-v1:2.4.6:2.4.6 +proto-google-cloud-recaptchaenterprise-v1beta1:0.39.6:0.39.6