diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 731a0eb4..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:491a007c6bd6e77f9e9b1bebcd6cdf08a4a4ef2c228c123d9696845204cb685d + digest: sha256:7c853edc4136ae8f19f9d46d4569d38de2e446db2eea057f32e412bdba255846 diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index af6322b0..5f9903d5 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -4,9 +4,9 @@ # For syntax help see: # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax -# The @googleapis/cicd is the default owner for changes in this repo -* @googleapis/yoshi-java @googleapis/cicd -**/*.java @googleapis/cicd +# The @googleapis/aap-dpes is the default owner for changes in this repo +* @googleapis/yoshi-java @googleapis/aap-dpes +**/*.java @googleapis/aap-dpes # The java-samples-reviewers team is the default owner for samples changes samples/**/*.java @googleapis/java-samples-reviewers diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 7481027c..c1d58ae9 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. containeranalysis 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/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 7bea0d36..6ddf2c16 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -1,15 +1,15 @@ { - "name": "containeranalysis", + "api_shortname": "containeranalysis", "name_pretty": "Cloud Container Analysis", "product_documentation": "https://cloud.google.com/container-registry/docs/container-analysis", "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-containeranalysis/latest/history", "issue_tracker": "https://issuetracker.google.com/savedsearches/559777", - "release_level": "ga", + "release_level": "stable", "language": "java", "repo": "googleapis/java-containeranalysis", "repo_short": "java-containeranalysis", "distribution_name": "com.google.cloud:google-cloud-containeranalysis", - "codeowner_team": "@googleapis/cicd", + "codeowner_team": "@googleapis/aap-dpes", "api_id": "containeranalysis.googleapis.com", "api_description": "is a service that provides vulnerability scanning and metadata storage for software artifacts. The service performs vulnerability scans on built software artifacts, such as the images in Container Registry, then stores the resulting metadata and makes it available for consumption through an API. The metadata may come from several sources, including vulnerability scanning, other Cloud services, and third-party providers.", "transport": "grpc", diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c411b97..5dbc8570 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +### [2.2.7](https://github.com/googleapis/java-containeranalysis/compare/v2.2.6...v2.2.7) (2022-02-04) + + +### Dependencies + +* **java:** update actions/github-script action to v5 ([#1339](https://github.com/googleapis/java-containeranalysis/issues/1339)) ([#808](https://github.com/googleapis/java-containeranalysis/issues/808)) ([bfc5555](https://github.com/googleapis/java-containeranalysis/commit/bfc5555aad1810a41be08b5dd407bbd0997efbe5)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.7.0 ([#810](https://github.com/googleapis/java-containeranalysis/issues/810)) ([77ed8c9](https://github.com/googleapis/java-containeranalysis/commit/77ed8c93f7b4c7c808a03080f8c80ee4f15db017)) +* update dependency io.grafeas:grafeas to v2.2.0 ([#792](https://github.com/googleapis/java-containeranalysis/issues/792)) ([838837a](https://github.com/googleapis/java-containeranalysis/commit/838837a36d8d2a0e98e81c76b6527529580c5447)) + ### [2.2.6](https://www.github.com/googleapis/java-containeranalysis/compare/v2.2.5...v2.2.6) (2022-01-07) diff --git a/README.md b/README.md index 65ce8f4e..a0449109 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.1.2 + 24.2.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-containeranalysis - 2.2.5 + 2.2.6 ``` @@ -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.1.2') +implementation platform('com.google.cloud:libraries-bom:24.2.0') implementation 'com.google.cloud:google-cloud-containeranalysis' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-containeranalysis:2.2.5' +implementation 'com.google.cloud:google-cloud-containeranalysis:2.2.6' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "2.2.5" +libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "2.2.6" ``` ## Authentication @@ -199,7 +199,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-containeranalysis/java8-win.html [kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-containeranalysis/java11.svg [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-containeranalysis/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-containeranalysis.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-containeranalysis&core=gav [authentication]: https://github.com/googleapis/google-cloud-java#authentication diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml index 5090a967..847de916 100644 --- a/google-cloud-containeranalysis-bom/pom.xml +++ b/google-cloud-containeranalysis-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis-bom - 2.2.6 + 2.2.7 pom com.google.cloud google-cloud-shared-config - 1.2.4 + 1.2.6 Google Cloud Container Analysis BOM @@ -52,27 +52,27 @@ com.google.cloud google-cloud-containeranalysis - 2.2.6 + 2.2.7 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.92.6 + 0.92.7 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.2.6 + 2.2.7 com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.2.6 + 2.2.7 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.92.6 + 0.92.7 diff --git a/google-cloud-containeranalysis/clirr-ignored-differences.xml b/google-cloud-containeranalysis/clirr-ignored-differences.xml deleted file mode 100644 index f9ec25c0..00000000 --- a/google-cloud-containeranalysis/clirr-ignored-differences.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - 7005 - com/google/cloud/devtools/containeranalysis/v1/ContainerAnalysisClient - com.google.iam.v1.* *Iam*(com.google.containeranalysis.v1.IamResourceName*) - com.google.iam.v1.* *Iam*(com.google.api.resourcenames.ResourceName*) - - \ No newline at end of file diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml index 4be026f9..c5cde42a 100644 --- a/google-cloud-containeranalysis/pom.xml +++ b/google-cloud-containeranalysis/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis - 2.2.6 + 2.2.7 jar Google Cloud Container Analysis https://github.com/googleapis/java-containeranalysis @@ -11,7 +11,7 @@ com.google.cloud google-cloud-containeranalysis-parent - 2.2.6 + 2.2.7 google-cloud-containeranalysis diff --git a/grpc-google-cloud-containeranalysis-v1/clirr-ignored-differences.xml b/grpc-google-cloud-containeranalysis-v1/clirr-ignored-differences.xml deleted file mode 100644 index a2bb5c27..00000000 --- a/grpc-google-cloud-containeranalysis-v1/clirr-ignored-differences.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - 6001 - com/google/containeranalysis/v1/*Grpc - METHOD_* - - diff --git a/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml index 55777de2..93d62a61 100644 --- a/grpc-google-cloud-containeranalysis-v1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.2.6 + 2.2.7 grpc-google-cloud-containeranalysis-v1 GRPC library for grpc-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 2.2.6 + 2.2.7 diff --git a/grpc-google-cloud-containeranalysis-v1beta1/clirr-ignored-differences.xml b/grpc-google-cloud-containeranalysis-v1beta1/clirr-ignored-differences.xml deleted file mode 100644 index 7be76673..00000000 --- a/grpc-google-cloud-containeranalysis-v1beta1/clirr-ignored-differences.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - 6001 - com/google/containeranalysis/v1beta1/*Grpc - METHOD_* - - - - 6001 - io/grafeas/v1beta1/*Grpc - METHOD_* - - diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml index cd209b67..da0ffb5d 100644 --- a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.92.6 + 0.92.7 grpc-google-cloud-containeranalysis-v1beta1 GRPC library for grpc-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 2.2.6 + 2.2.7 diff --git a/pom.xml b/pom.xml index 0488058e..f1e4e6f0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-containeranalysis-parent pom - 2.2.6 + 2.2.7 Google Cloud Container Analysis Parent https://github.com/googleapis/java-containeranalysis @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.4 + 1.2.6 @@ -61,33 +61,33 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.2.6 + 2.2.7 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.92.6 + 0.92.7 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.92.6 + 0.92.7 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.2.6 + 2.2.7 com.google.cloud google-cloud-containeranalysis - 2.2.6 + 2.2.7 com.google.cloud google-cloud-shared-dependencies - 2.6.0 + 2.7.0 pom import @@ -96,7 +96,7 @@ io.grafeas grafeas - 2.1.3 + 2.2.0 diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml index 934752e4..702bc916 100644 --- a/proto-google-cloud-containeranalysis-v1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.2.6 + 2.2.7 proto-google-cloud-containeranalysis-v1 PROTO library for proto-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 2.2.6 + 2.2.7 diff --git a/proto-google-cloud-containeranalysis-v1beta1/clirr-ignored-differences.xml b/proto-google-cloud-containeranalysis-v1beta1/clirr-ignored-differences.xml index 6eccdabf..12b70ac0 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/clirr-ignored-differences.xml +++ b/proto-google-cloud-containeranalysis-v1beta1/clirr-ignored-differences.xml @@ -3,17 +3,171 @@ 7012 - io/grafeas/v1beta1/*/*OrBuilder + com/google/containeranalysis/v1beta1/*OrBuilder * get*(*) 7012 - io/grafeas/v1beta1/*/*OrBuilder + com/google/containeranalysis/v1beta1/*OrBuilder boolean contains*(*) 7012 - io/grafeas/v1beta1/*/*OrBuilder + com/google/containeranalysis/v1beta1/*OrBuilder + boolean has*(*) + + 7012 + io/grafeas/v1beta1/*OrBuilder + * get*(*) + + + 7012 + io/grafeas/v1beta1/*OrBuilder + boolean contains*(*) + + + 7012 + io/grafeas/v1beta1/*OrBuilder + boolean has*(*) + + 7012 + io/grafeas/v1beta1/attestation/*OrBuilder + * get*(*) + + + 7012 + io/grafeas/v1beta1/attestation/*OrBuilder + boolean contains*(*) + + + 7012 + io/grafeas/v1beta1/attestation/*OrBuilder + boolean has*(*) + + 7012 + io/grafeas/v1beta1/build/*OrBuilder + * get*(*) + + + 7012 + io/grafeas/v1beta1/build/*OrBuilder + boolean contains*(*) + + + 7012 + io/grafeas/v1beta1/build/*OrBuilder + boolean has*(*) + + 7012 + io/grafeas/v1beta1/common/*OrBuilder + * get*(*) + + + 7012 + io/grafeas/v1beta1/common/*OrBuilder + boolean contains*(*) + + + 7012 + io/grafeas/v1beta1/common/*OrBuilder + boolean has*(*) + + 7012 + io/grafeas/v1beta1/deployment/*OrBuilder + * get*(*) + + + 7012 + io/grafeas/v1beta1/deployment/*OrBuilder + boolean contains*(*) + + + 7012 + io/grafeas/v1beta1/deployment/*OrBuilder + boolean has*(*) + + 7012 + io/grafeas/v1beta1/discovery/*OrBuilder + * get*(*) + + + 7012 + io/grafeas/v1beta1/discovery/*OrBuilder + boolean contains*(*) + + + 7012 + io/grafeas/v1beta1/discovery/*OrBuilder + boolean has*(*) + + 7012 + io/grafeas/v1beta1/image/*OrBuilder + * get*(*) + + + 7012 + io/grafeas/v1beta1/image/*OrBuilder + boolean contains*(*) + + + 7012 + io/grafeas/v1beta1/image/*OrBuilder + boolean has*(*) + + 7012 + io/grafeas/v1beta1/pkg/*OrBuilder + * get*(*) + + + 7012 + io/grafeas/v1beta1/pkg/*OrBuilder + boolean contains*(*) + + + 7012 + io/grafeas/v1beta1/pkg/*OrBuilder + boolean has*(*) + + 7012 + io/grafeas/v1beta1/provenance/*OrBuilder + * get*(*) + + + 7012 + io/grafeas/v1beta1/provenance/*OrBuilder + boolean contains*(*) + + + 7012 + io/grafeas/v1beta1/provenance/*OrBuilder + boolean has*(*) + + 7012 + io/grafeas/v1beta1/source/*OrBuilder + * get*(*) + + + 7012 + io/grafeas/v1beta1/source/*OrBuilder + boolean contains*(*) + + + 7012 + io/grafeas/v1beta1/source/*OrBuilder + boolean has*(*) + + 7012 + io/grafeas/v1beta1/vulnerability/*OrBuilder + * get*(*) + + + 7012 + io/grafeas/v1beta1/vulnerability/*OrBuilder + boolean contains*(*) + + + 7012 + io/grafeas/v1beta1/vulnerability/*OrBuilder boolean has*(*) diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml index 1c2ec167..c0fc4c10 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.92.6 + 0.92.7 proto-google-cloud-containeranalysis-v1beta1 PROTO library for proto-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 2.2.6 + 2.2.7 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 3e8bf506..cf962975 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-containeranalysis - 2.2.5 + 2.2.6 @@ -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 3468ce46..869afdae 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-containeranalysis - 2.2.5 + 2.2.6 @@ -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 09518c1c..67ea2c94 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 01102cbd..3997d449 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-containeranalysis-v1:2.2.6:2.2.6 -proto-google-cloud-containeranalysis-v1beta1:0.92.6:0.92.6 -grpc-google-cloud-containeranalysis-v1beta1:0.92.6:0.92.6 -grpc-google-cloud-containeranalysis-v1:2.2.6:2.2.6 -google-cloud-containeranalysis:2.2.6:2.2.6 +proto-google-cloud-containeranalysis-v1:2.2.7:2.2.7 +proto-google-cloud-containeranalysis-v1beta1:0.92.7:0.92.7 +grpc-google-cloud-containeranalysis-v1beta1:0.92.7:0.92.7 +grpc-google-cloud-containeranalysis-v1:2.2.7:2.2.7 +google-cloud-containeranalysis:2.2.7:2.2.7