diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 3d2f8282..8807efca 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:a4d7b2cfc6a9d6b378a6b2458740eae15fcab28854bd23dad3a15102d2e47c87 + digest: sha256:7c853edc4136ae8f19f9d46d4569d38de2e446db2eea057f32e412bdba255846 diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 68bb3af9..0281b18c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -21,7 +21,7 @@ If you are still having issues, please include as much information as possible: General, Core, and Other are also allowed as types 2. OS type and version: 3. Java version: -4. monitoring-dashboards version(s): +4. version(s): #### Steps to reproduce diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index 7513acae..c5132427 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -6,7 +6,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 9b4fd4d8..59c7cadd 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -6,7 +6,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 diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 10df617c..6df01957 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -47,15 +47,15 @@ set +e case ${JOB_TYPE} in test) - mvn test -B -Dclirr.skip=true -Denforcer.skip=true + mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true RETURN_CODE=$? ;; lint) - mvn com.coveo:fmt-maven-plugin:check + mvn com.coveo:fmt-maven-plugin:check -B -ntp RETURN_CODE=$? ;; javadoc) - mvn javadoc:javadoc javadoc:test-javadoc + mvn javadoc:javadoc javadoc:test-javadoc -B -ntp RETURN_CODE=$? ;; integration) @@ -71,7 +71,7 @@ integration) ;; graalvm) # Run Unit and Integration Tests with Native Image - mvn -ntp -Pnative -Penable-integration-tests test + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test RETURN_CODE=$? ;; samples) @@ -104,7 +104,7 @@ samples) fi ;; clirr) - mvn -B -Denforcer.skip=true clirr:check + mvn -B -ntp -Denforcer.skip=true clirr:check RETURN_CODE=$? ;; *) diff --git a/.kokoro/nightly/java11-integration.cfg b/.kokoro/nightly/java11-integration.cfg new file mode 100644 index 00000000..58049cc3 --- /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/.repo-metadata.json b/.repo-metadata.json index 7bc5925c..c683740b 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -1,10 +1,10 @@ { - "name": "monitoring-dashboards", + "api_shortname": "monitoring-dashboards", "name_pretty": "Monitoring Dashboards", "product_documentation": "https://cloud.google.com/monitoring/charts/dashboards", "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-monitoring-dashboard/latest/history", "api_description": "are one way for you to view and analyze metric data. The Cloud Console provides predefined dashboards that require no setup or configuration. You can also define custom dashboards. With custom dashboards, you have complete control over the charts that are displayed and their configuration.", - "release_level": "ga", + "release_level": "stable", "language": "java", "repo": "googleapis/java-monitoring-dashboards", "repo_short": "java-monitoring-dashboards", diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b40fde8..f6795995 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [2.2.2](https://github.com/googleapis/java-monitoring-dashboards/compare/v2.2.1...v2.2.2) (2022-02-03) + + +### Dependencies + +* **java:** update actions/github-script action to v5 ([#1339](https://github.com/googleapis/java-monitoring-dashboards/issues/1339)) ([#540](https://github.com/googleapis/java-monitoring-dashboards/issues/540)) ([b29be44](https://github.com/googleapis/java-monitoring-dashboards/commit/b29be4433749ab10d2cff0cdc6bfc42fb2ff1524)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.7.0 ([#542](https://github.com/googleapis/java-monitoring-dashboards/issues/542)) ([ffc030a](https://github.com/googleapis/java-monitoring-dashboards/commit/ffc030ad81ce9c26c264ee41595ca873e28135fe)) + ### [2.2.1](https://www.github.com/googleapis/java-monitoring-dashboards/compare/v2.2.0...v2.2.1) (2022-01-07) diff --git a/README.md b/README.md index 3e023dfd..cb4433d1 100644 --- a/README.md +++ b/README.md @@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-monitoring-dashboard - 2.2.0 + 2.2.1 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-monitoring-dashboard:2.2.0' +implementation 'com.google.cloud:google-cloud-monitoring-dashboard:2.2.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-monitoring-dashboard" % "2.2.0" +libraryDependencies += "com.google.cloud" % "google-cloud-monitoring-dashboard" % "2.2.1" ``` ## Authentication @@ -169,7 +169,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-monitoring-dashboards/java8-win.html [kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-monitoring-dashboards/java11.svg [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-monitoring-dashboards/java11.html -[stability-image]: https://img.shields.io/badge/stability-ga-green +[stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-monitoring-dashboard.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-monitoring-dashboard&core=gav [authentication]: https://github.com/googleapis/google-cloud-java#authentication diff --git a/google-cloud-monitoring-dashboard-bom/pom.xml b/google-cloud-monitoring-dashboard-bom/pom.xml index a75f59ba..01cf487a 100644 --- a/google-cloud-monitoring-dashboard-bom/pom.xml +++ b/google-cloud-monitoring-dashboard-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-monitoring-dashboard-bom - 2.2.1 + 2.2.2 pom com.google.cloud google-cloud-shared-config - 1.2.4 + 1.2.6 Google Cloud Monitoring Dashboard BOM @@ -52,17 +52,17 @@ com.google.cloud google-cloud-monitoring-dashboard - 2.2.1 + 2.2.2 com.google.api.grpc grpc-google-cloud-monitoring-dashboard-v1 - 2.2.1 + 2.2.2 com.google.api.grpc proto-google-cloud-monitoring-dashboard-v1 - 2.2.1 + 2.2.2 diff --git a/google-cloud-monitoring-dashboard/pom.xml b/google-cloud-monitoring-dashboard/pom.xml index 23bd49e7..fb35cd79 100644 --- a/google-cloud-monitoring-dashboard/pom.xml +++ b/google-cloud-monitoring-dashboard/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-monitoring-dashboard - 2.2.1 + 2.2.2 jar Google Cloud Monitoring Dashboard https://github.com/googleapis/java-monitoring-dashboards @@ -11,7 +11,7 @@ com.google.cloud google-cloud-monitoring-dashboard-parent - 2.2.1 + 2.2.2 google-cloud-monitoring-dashboard diff --git a/grpc-google-cloud-monitoring-dashboard-v1/pom.xml b/grpc-google-cloud-monitoring-dashboard-v1/pom.xml index 394b64c4..38d6b4ae 100644 --- a/grpc-google-cloud-monitoring-dashboard-v1/pom.xml +++ b/grpc-google-cloud-monitoring-dashboard-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-monitoring-dashboard-v1 - 2.2.1 + 2.2.2 grpc-google-cloud-monitoring-dashboard-v1 GRPC library for grpc-google-cloud-monitoring-dashboard-v1 com.google.cloud google-cloud-monitoring-dashboard-parent - 2.2.1 + 2.2.2 diff --git a/pom.xml b/pom.xml index 1bbb2a76..9d205929 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-monitoring-dashboard-parent pom - 2.2.1 + 2.2.2 Google Cloud Monitoring Dashboard Parent https://github.com/googleapis/java-monitoring-dashboards @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.4 + 1.2.6 @@ -61,23 +61,23 @@ com.google.api.grpc proto-google-cloud-monitoring-dashboard-v1 - 2.2.1 + 2.2.2 com.google.api.grpc grpc-google-cloud-monitoring-dashboard-v1 - 2.2.1 + 2.2.2 com.google.cloud google-cloud-monitoring-dashboard - 2.2.1 + 2.2.2 com.google.cloud google-cloud-shared-dependencies - 2.6.0 + 2.7.0 pom import diff --git a/proto-google-cloud-monitoring-dashboard-v1/pom.xml b/proto-google-cloud-monitoring-dashboard-v1/pom.xml index fa739679..25ffbbea 100644 --- a/proto-google-cloud-monitoring-dashboard-v1/pom.xml +++ b/proto-google-cloud-monitoring-dashboard-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-monitoring-dashboard-v1 - 2.2.1 + 2.2.2 proto-google-cloud-monitoring-dashboard-v1 PROTO library for proto-google-cloud-monitoring-dashboard-v1 com.google.cloud google-cloud-monitoring-dashboard-parent - 2.2.1 + 2.2.2 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 98fec922..1718dd04 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-monitoring-dashboard - 2.2.0 + 2.2.1 @@ -53,7 +53,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + 3.3.0 add-snippets-source diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 36318bab..61d67f3f 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-monitoring-dashboard - 2.2.0 + 2.2.1 @@ -52,7 +52,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + 3.3.0 add-snippets-source diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index a99cf173..8c3b5389 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 24.1.2 + 24.2.0 pom import diff --git a/versions.txt b/versions.txt index a3df3e4e..ffe8b02d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-monitoring-dashboard:2.2.1:2.2.1 -grpc-google-cloud-monitoring-dashboard-v1:2.2.1:2.2.1 -proto-google-cloud-monitoring-dashboard-v1:2.2.1:2.2.1 +google-cloud-monitoring-dashboard:2.2.2:2.2.2 +grpc-google-cloud-monitoring-dashboard-v1:2.2.2:2.2.2 +proto-google-cloud-monitoring-dashboard-v1:2.2.2:2.2.2