diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9351fdfb9..3473042c0 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:df8d7b2cc0dbc65871e7edd86601901a0612b272fa3f7f0eb590c5c53aa5f92e diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index 1bb182327..f5fc7d516 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 18e23230d..7a106d007 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 6b5e56aaa..83ef7f9c2 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 d5d964df1..912ed8b2b 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 cc602c9eb..067cf4a4c 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/CHANGELOG.md b/CHANGELOG.md index adee17fdf..5cef063aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [4.5.6](https://github.com/googleapis/java-dialogflow/compare/v4.5.5...v4.5.6) (2022-03-03) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-core to v2.5.6 ([#872](https://github.com/googleapis/java-dialogflow/issues/872)) ([a7506fc](https://github.com/googleapis/java-dialogflow/commit/a7506fcae4b9f8294a371fa41c5d4ba19bfbc9d1)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.8.0 ([#873](https://github.com/googleapis/java-dialogflow/issues/873)) ([583aa83](https://github.com/googleapis/java-dialogflow/commit/583aa83983484322297092bec814aaf4863d4125)) + ### [4.5.5](https://github.com/googleapis/java-dialogflow/compare/v4.5.4...v4.5.5) (2022-03-01) diff --git a/README.md b/README.md index ee88331cc..c80e7395a 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 + 24.4.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-dialogflow - 4.5.3 + 4.5.5 ``` @@ -49,20 +49,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.3.0') +implementation platform('com.google.cloud:libraries-bom:24.4.0') implementation 'com.google.cloud:google-cloud-dialogflow' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-dialogflow:4.5.4' +implementation 'com.google.cloud:google-cloud-dialogflow:4.5.5' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-dialogflow" % "4.5.4" +libraryDependencies += "com.google.cloud" % "google-cloud-dialogflow" % "4.5.5" ``` ## Authentication diff --git a/google-cloud-dialogflow-bom/pom.xml b/google-cloud-dialogflow-bom/pom.xml index 508710378..dfa2d6fa5 100644 --- a/google-cloud-dialogflow-bom/pom.xml +++ b/google-cloud-dialogflow-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-dialogflow-bom - 4.5.5 + 4.5.6 pom com.google.cloud @@ -52,27 +52,27 @@ com.google.cloud google-cloud-dialogflow - 4.5.5 + 4.5.6 com.google.api.grpc grpc-google-cloud-dialogflow-v2beta1 - 0.103.5 + 0.103.6 com.google.api.grpc grpc-google-cloud-dialogflow-v2 - 4.5.5 + 4.5.6 com.google.api.grpc proto-google-cloud-dialogflow-v2 - 4.5.5 + 4.5.6 com.google.api.grpc proto-google-cloud-dialogflow-v2beta1 - 0.103.5 + 0.103.6 diff --git a/google-cloud-dialogflow/pom.xml b/google-cloud-dialogflow/pom.xml index 8f055ae2e..460c51ecb 100644 --- a/google-cloud-dialogflow/pom.xml +++ b/google-cloud-dialogflow/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-dialogflow - 4.5.5 + 4.5.6 jar Google Cloud Dialog Flow API https://github.com/googleapis/java-dialogflow @@ -11,7 +11,7 @@ com.google.cloud google-cloud-dialogflow-parent - 4.5.5 + 4.5.6 google-cloud-dialogflow diff --git a/grpc-google-cloud-dialogflow-v2/pom.xml b/grpc-google-cloud-dialogflow-v2/pom.xml index f04091674..d08cf6a6f 100644 --- a/grpc-google-cloud-dialogflow-v2/pom.xml +++ b/grpc-google-cloud-dialogflow-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-dialogflow-v2 - 4.5.5 + 4.5.6 grpc-google-cloud-dialogflow-v2 GRPC library for grpc-google-cloud-dialogflow-v2 com.google.cloud google-cloud-dialogflow-parent - 4.5.5 + 4.5.6 diff --git a/grpc-google-cloud-dialogflow-v2beta1/pom.xml b/grpc-google-cloud-dialogflow-v2beta1/pom.xml index 74baa8ec4..cb4a91317 100644 --- a/grpc-google-cloud-dialogflow-v2beta1/pom.xml +++ b/grpc-google-cloud-dialogflow-v2beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-dialogflow-v2beta1 - 0.103.5 + 0.103.6 grpc-google-cloud-dialogflow-v2beta1 GRPC library for grpc-google-cloud-dialogflow-v2beta1 com.google.cloud google-cloud-dialogflow-parent - 4.5.5 + 4.5.6 diff --git a/pom.xml b/pom.xml index 8b9f33ebd..2c125a60f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-dialogflow-parent pom - 4.5.5 + 4.5.6 Google Cloud Dialog Flow API Parent https://github.com/googleapis/java-dialogflow @@ -61,32 +61,32 @@ com.google.api.grpc proto-google-cloud-dialogflow-v2 - 4.5.5 + 4.5.6 com.google.api.grpc proto-google-cloud-dialogflow-v2beta1 - 0.103.5 + 0.103.6 com.google.api.grpc grpc-google-cloud-dialogflow-v2beta1 - 0.103.5 + 0.103.6 com.google.api.grpc grpc-google-cloud-dialogflow-v2 - 4.5.5 + 4.5.6 com.google.cloud google-cloud-dialogflow - 4.5.5 + 4.5.6 com.google.cloud google-cloud-shared-dependencies - 2.7.0 + 2.8.0 pom import diff --git a/proto-google-cloud-dialogflow-v2/pom.xml b/proto-google-cloud-dialogflow-v2/pom.xml index cf7ba6921..93c2907d1 100644 --- a/proto-google-cloud-dialogflow-v2/pom.xml +++ b/proto-google-cloud-dialogflow-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-dialogflow-v2 - 4.5.5 + 4.5.6 proto-google-cloud-dialogflow-v2 PROTO library for proto-google-cloud-dialogflow-v2 com.google.cloud google-cloud-dialogflow-parent - 4.5.5 + 4.5.6 diff --git a/proto-google-cloud-dialogflow-v2beta1/pom.xml b/proto-google-cloud-dialogflow-v2beta1/pom.xml index 200021393..1d2410759 100644 --- a/proto-google-cloud-dialogflow-v2beta1/pom.xml +++ b/proto-google-cloud-dialogflow-v2beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-dialogflow-v2beta1 - 0.103.5 + 0.103.6 proto-google-cloud-dialogflow-v2beta1 PROTO library for proto-google-cloud-dialogflow-v2beta1 com.google.cloud google-cloud-dialogflow-parent - 4.5.5 + 4.5.6 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index d76d6822f..87f53df1c 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,14 +29,14 @@ com.google.cloud google-cloud-dialogflow - 4.5.3 + 4.5.5 com.google.cloud google-cloud-core - 2.5.5 + 2.5.6 test tests diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index f5cc8a37c..a84b511a8 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,13 +28,13 @@ com.google.cloud google-cloud-dialogflow - 4.5.3 + 4.5.5 com.google.cloud google-cloud-core - 2.5.5 + 2.5.6 test tests diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 16202c8a2..eb8f8364d 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 24.3.0 + 24.4.0 pom import @@ -47,7 +47,7 @@ com.google.cloud google-cloud-core - 2.5.5 + 2.5.6 test tests diff --git a/versions.txt b/versions.txt index c5b2b99aa..152f25362 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-dialogflow:4.5.5:4.5.5 -grpc-google-cloud-dialogflow-v2beta1:0.103.5:0.103.5 -grpc-google-cloud-dialogflow-v2:4.5.5:4.5.5 -proto-google-cloud-dialogflow-v2:4.5.5:4.5.5 -proto-google-cloud-dialogflow-v2beta1:0.103.5:0.103.5 +google-cloud-dialogflow:4.5.6:4.5.6 +grpc-google-cloud-dialogflow-v2beta1:0.103.6:0.103.6 +grpc-google-cloud-dialogflow-v2:4.5.6:4.5.6 +proto-google-cloud-dialogflow-v2:4.5.6:4.5.6 +proto-google-cloud-dialogflow-v2beta1:0.103.6:0.103.6