diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index fc89d49d1..afb21e42c 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - digest: sha256:4837f2a7fdff2985b4f7432f8a6d6a87beacebf3ac071746532c0ce2e3f24b9b - image: gcr.io/repo-automation-bots/owlbot-java:latest + image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest + digest: sha256:52b5557b7155a80e6f1684c2376d5eef0df6d8d5c785551e1ff8cc000603b62a diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index c411f3524..a2a53ffff 100644 --- a/.github/.OwlBot.yaml +++ b/.github/.OwlBot.yaml @@ -13,7 +13,7 @@ # limitations under the License. docker: - image: "gcr.io/repo-automation-bots/owlbot-java:latest" + image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest" deep-remove-regex: - "/grpc-google-.*/src" diff --git a/.github/readme/synth.py b/.github/readme/synth.py deleted file mode 100644 index 7b48cc28d..000000000 --- a/.github/readme/synth.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2020 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. - -"""This script is used to synthesize generated the README for this library.""" - -from synthtool.languages import java - -java.custom_templates(["java_library/README.md"]) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index efe88147c..32e0ea5a1 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -16,6 +16,7 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google + - OwlBot Post Processor - pattern: java7 isAdminEnforced: true requiredApprovingReviewCount: 1 @@ -31,6 +32,7 @@ branchProtectionRules: - units (11) - 'Kokoro - Test: Integration' - cla/google + - OwlBot Post Processor permissionRules: - team: yoshi-admins permission: admin diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml index f247d5c78..a0ba1f7d9 100644 --- a/.github/trusted-contribution.yml +++ b/.github/trusted-contribution.yml @@ -1,2 +1,3 @@ trustedContributors: -- renovate-bot \ No newline at end of file +- renovate-bot +- gcf-owl-bot[bot] diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e23d923e1..3becb5c02 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -26,6 +26,9 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 @@ -75,4 +78,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg deleted file mode 100644 index 931f641f7..000000000 --- a/.kokoro/continuous/readme.cfg +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2020 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. - -# Format: //devtools/kokoro/config/proto/build.proto - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/python-multi" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-vision/.kokoro/readme.sh" -} - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - regex: "**/*sponge_log.log" - } -} - -# The github token is stored here. -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" - # TODO(theacodes): remove this after secrets have globally propagated - backend_type: FASTCONFIGPUSH - } - } -} - -# Common env vars for all repositories and builds. -env_vars: { - key: "GITHUB_USER" - value: "yoshi-automation" -} -env_vars: { - key: "GITHUB_EMAIL" - value: "yoshi-automation@google.com" -} diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh index 6e3f65999..7f78ee414 100755 --- a/.kokoro/release/common.sh +++ b/.kokoro/release/common.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh index 5c4551efa..742ec1a88 100755 --- a/.kokoro/release/drop.sh +++ b/.kokoro/release/drop.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh index 1fa95fa53..3cac3d8a9 100755 --- a/.kokoro/release/promote.sh +++ b/.kokoro/release/promote.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index e91e41362..508dc5844 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2019 Google Inc. +# Copyright 2019 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index f52ee161d..50c861867 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2021 Google Inc. +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 8a1033843..77dc4e8f0 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh index 9da0f8398..8b69b793c 100644 --- a/.kokoro/trampoline.sh +++ b/.kokoro/trampoline.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/CHANGELOG.md b/CHANGELOG.md index d09c8d68f..494308d26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [2.0.13](https://www.github.com/googleapis/java-vision/compare/v2.0.12...v2.0.13) (2021-09-24) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-core to v2.1.7 ([#702](https://www.github.com/googleapis/java-vision/issues/702)) ([c915e80](https://www.github.com/googleapis/java-vision/commit/c915e80cf6d44acc6c3d1325bb8fb453ab4e8fdf)) +* update spring.version to v2.5.5 ([#703](https://www.github.com/googleapis/java-vision/issues/703)) ([eb9ff28](https://www.github.com/googleapis/java-vision/commit/eb9ff282d21035374ad91a8f5a54e14cade6f3f9)) + ### [2.0.12](https://www.github.com/googleapis/java-vision/compare/v2.0.11...v2.0.12) (2021-09-22) diff --git a/README.md b/README.md index c697ee6b7..64ab85cfc 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-vision - 2.0.9 + 2.0.12 ``` @@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-vision' If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-vision:2.0.11' +implementation 'com.google.cloud:google-cloud-vision:2.0.12' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-vision" % "2.0.11" +libraryDependencies += "com.google.cloud" % "google-cloud-vision" % "2.0.12" ``` ## Authentication diff --git a/google-cloud-vision-bom/pom.xml b/google-cloud-vision-bom/pom.xml index 751828b32..b13e12681 100644 --- a/google-cloud-vision-bom/pom.xml +++ b/google-cloud-vision-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-vision-bom - 2.0.12 + 2.0.13 pom com.google.cloud @@ -53,57 +53,57 @@ com.google.cloud google-cloud-vision - 2.0.12 + 2.0.13 com.google.api.grpc grpc-google-cloud-vision-v1p3beta1 - 0.87.12 + 0.87.13 com.google.api.grpc grpc-google-cloud-vision-v1p1beta1 - 0.87.12 + 0.87.13 com.google.api.grpc grpc-google-cloud-vision-v1p4beta1 - 0.87.12 + 0.87.13 com.google.api.grpc grpc-google-cloud-vision-v1p2beta1 - 2.0.12 + 2.0.13 com.google.api.grpc grpc-google-cloud-vision-v1 - 2.0.12 + 2.0.13 com.google.api.grpc proto-google-cloud-vision-v1p4beta1 - 0.87.12 + 0.87.13 com.google.api.grpc proto-google-cloud-vision-v1 - 2.0.12 + 2.0.13 com.google.api.grpc proto-google-cloud-vision-v1p1beta1 - 0.87.12 + 0.87.13 com.google.api.grpc proto-google-cloud-vision-v1p3beta1 - 0.87.12 + 0.87.13 com.google.api.grpc proto-google-cloud-vision-v1p2beta1 - 2.0.12 + 2.0.13 diff --git a/google-cloud-vision/pom.xml b/google-cloud-vision/pom.xml index 61e1a718f..a6174b6ae 100644 --- a/google-cloud-vision/pom.xml +++ b/google-cloud-vision/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-vision - 2.0.12 + 2.0.13 jar Google Cloud Vision https://github.com/googleapis/java-vision @@ -11,7 +11,7 @@ com.google.cloud google-cloud-vision-parent - 2.0.12 + 2.0.13 google-cloud-vision diff --git a/grpc-google-cloud-vision-v1/pom.xml b/grpc-google-cloud-vision-v1/pom.xml index 2429d6553..f56b0a305 100644 --- a/grpc-google-cloud-vision-v1/pom.xml +++ b/grpc-google-cloud-vision-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1 - 2.0.12 + 2.0.13 grpc-google-cloud-vision-v1 GRPC library for grpc-google-cloud-vision-v1 com.google.cloud google-cloud-vision-parent - 2.0.12 + 2.0.13 diff --git a/grpc-google-cloud-vision-v1p1beta1/pom.xml b/grpc-google-cloud-vision-v1p1beta1/pom.xml index 421e8d305..27ed189e9 100644 --- a/grpc-google-cloud-vision-v1p1beta1/pom.xml +++ b/grpc-google-cloud-vision-v1p1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p1beta1 - 0.87.12 + 0.87.13 grpc-google-cloud-vision-v1p1beta1 GRPC library for grpc-google-cloud-vision-v1p1beta1 com.google.cloud google-cloud-vision-parent - 2.0.12 + 2.0.13 diff --git a/grpc-google-cloud-vision-v1p2beta1/pom.xml b/grpc-google-cloud-vision-v1p2beta1/pom.xml index 93fa4ad37..2a03d7b2a 100644 --- a/grpc-google-cloud-vision-v1p2beta1/pom.xml +++ b/grpc-google-cloud-vision-v1p2beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p2beta1 - 2.0.12 + 2.0.13 grpc-google-cloud-vision-v1p2beta1 GRPC library for grpc-google-cloud-vision-v1p2beta1 com.google.cloud google-cloud-vision-parent - 2.0.12 + 2.0.13 diff --git a/grpc-google-cloud-vision-v1p3beta1/pom.xml b/grpc-google-cloud-vision-v1p3beta1/pom.xml index 125537428..aee43607c 100644 --- a/grpc-google-cloud-vision-v1p3beta1/pom.xml +++ b/grpc-google-cloud-vision-v1p3beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p3beta1 - 0.87.12 + 0.87.13 grpc-google-cloud-vision-v1p3beta1 GRPC library for grpc-google-cloud-vision-v1p3beta1 com.google.cloud google-cloud-vision-parent - 2.0.12 + 2.0.13 diff --git a/grpc-google-cloud-vision-v1p4beta1/pom.xml b/grpc-google-cloud-vision-v1p4beta1/pom.xml index a1e83e7fb..9574d1d77 100644 --- a/grpc-google-cloud-vision-v1p4beta1/pom.xml +++ b/grpc-google-cloud-vision-v1p4beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-vision-v1p4beta1 - 0.87.12 + 0.87.13 grpc-google-cloud-vision-v1p4beta1 GRPC library for grpc-google-cloud-vision-v1p4beta1 com.google.cloud google-cloud-vision-parent - 2.0.12 + 2.0.13 diff --git a/pom.xml b/pom.xml index befd9275b..83b1d02ff 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-vision-parent pom - 2.0.12 + 2.0.13 Google Cloud Vision Parent https://github.com/googleapis/java-vision @@ -61,57 +61,57 @@ com.google.api.grpc proto-google-cloud-vision-v1p4beta1 - 0.87.12 + 0.87.13 com.google.api.grpc proto-google-cloud-vision-v1 - 2.0.12 + 2.0.13 com.google.api.grpc proto-google-cloud-vision-v1p1beta1 - 0.87.12 + 0.87.13 com.google.api.grpc proto-google-cloud-vision-v1p3beta1 - 0.87.12 + 0.87.13 com.google.api.grpc proto-google-cloud-vision-v1p2beta1 - 2.0.12 + 2.0.13 com.google.api.grpc grpc-google-cloud-vision-v1p3beta1 - 0.87.12 + 0.87.13 com.google.api.grpc grpc-google-cloud-vision-v1p1beta1 - 0.87.12 + 0.87.13 com.google.api.grpc grpc-google-cloud-vision-v1p4beta1 - 0.87.12 + 0.87.13 com.google.api.grpc grpc-google-cloud-vision-v1p2beta1 - 2.0.12 + 2.0.13 com.google.api.grpc grpc-google-cloud-vision-v1 - 2.0.12 + 2.0.13 com.google.cloud google-cloud-vision - 2.0.12 + 2.0.13 diff --git a/proto-google-cloud-vision-v1/pom.xml b/proto-google-cloud-vision-v1/pom.xml index 825dbdcfb..e52e1d4b5 100644 --- a/proto-google-cloud-vision-v1/pom.xml +++ b/proto-google-cloud-vision-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1 - 2.0.12 + 2.0.13 proto-google-cloud-vision-v1 PROTO library for proto-google-cloud-vision-v1 com.google.cloud google-cloud-vision-parent - 2.0.12 + 2.0.13 diff --git a/proto-google-cloud-vision-v1p1beta1/pom.xml b/proto-google-cloud-vision-v1p1beta1/pom.xml index c4d694d22..284c05d87 100644 --- a/proto-google-cloud-vision-v1p1beta1/pom.xml +++ b/proto-google-cloud-vision-v1p1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1p1beta1 - 0.87.12 + 0.87.13 proto-google-cloud-vision-v1p1beta1 PROTO library for proto-google-cloud-vision-v1p1beta1 com.google.cloud google-cloud-vision-parent - 2.0.12 + 2.0.13 diff --git a/proto-google-cloud-vision-v1p2beta1/pom.xml b/proto-google-cloud-vision-v1p2beta1/pom.xml index 8b052fb87..81cffde3c 100644 --- a/proto-google-cloud-vision-v1p2beta1/pom.xml +++ b/proto-google-cloud-vision-v1p2beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1p2beta1 - 2.0.12 + 2.0.13 proto-google-cloud-vision-v1p2beta1 PROTO library for proto-google-cloud-vision-v1p2beta1 com.google.cloud google-cloud-vision-parent - 2.0.12 + 2.0.13 diff --git a/proto-google-cloud-vision-v1p3beta1/pom.xml b/proto-google-cloud-vision-v1p3beta1/pom.xml index 5a024ece0..081259464 100644 --- a/proto-google-cloud-vision-v1p3beta1/pom.xml +++ b/proto-google-cloud-vision-v1p3beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1p3beta1 - 0.87.12 + 0.87.13 proto-google-cloud-vision-v1p3beta1 PROTO library for proto-google-cloud-vision-v1p3beta1 com.google.cloud google-cloud-vision-parent - 2.0.12 + 2.0.13 diff --git a/proto-google-cloud-vision-v1p4beta1/pom.xml b/proto-google-cloud-vision-v1p4beta1/pom.xml index 0c663f609..2335e1b8d 100644 --- a/proto-google-cloud-vision-v1p4beta1/pom.xml +++ b/proto-google-cloud-vision-v1p4beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-vision-v1p4beta1 - 0.87.12 + 0.87.13 proto-google-cloud-vision-v1p4beta1 PROTO library for proto-google-cloud-vision-v1p4beta1 com.google.cloud google-cloud-vision-parent - 2.0.12 + 2.0.13 diff --git a/renovate.json b/renovate.json index 5f730e83c..e72bc13a8 100644 --- a/renovate.json +++ b/renovate.json @@ -70,8 +70,5 @@ } ], "semanticCommits": true, - "dependencyDashboard": true, - "dependencyDashboardLabels": [ - "type: process" - ] + "dependencyDashboard": true } diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 85be2de6b..fb435106a 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-vision - 2.0.9 + 2.0.12 @@ -62,7 +62,7 @@ com.google.cloud google-cloud-core - 2.1.6 + 2.1.7 test tests diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index ab70be750..65c6b9c6c 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-vision - 2.0.12 + 2.0.13 @@ -62,7 +62,7 @@ com.google.cloud google-cloud-core - 2.1.6 + 2.1.7 test tests diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 610b40b53..032e86671 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -66,7 +66,7 @@ com.google.cloud google-cloud-core - 2.1.6 + 2.1.7 test tests diff --git a/samples/spring-framework/pom.xml b/samples/spring-framework/pom.xml index b8e62c371..a07be5db1 100644 --- a/samples/spring-framework/pom.xml +++ b/samples/spring-framework/pom.xml @@ -19,7 +19,7 @@ limitations under the License. 1.8 1.8 - 2.5.4 + 2.5.5