From 8b942dcf7fb498f2d4737b5617a53daca400f241 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 26 Aug 2019 10:27:01 -0700 Subject: [PATCH 001/794] chore: initial commit --- java-shared-config/.gitignore | 11 ++++++++ java-shared-config/README.md | 47 +++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 java-shared-config/.gitignore create mode 100644 java-shared-config/README.md diff --git a/java-shared-config/.gitignore b/java-shared-config/.gitignore new file mode 100644 index 000000000000..b637b4b461e6 --- /dev/null +++ b/java-shared-config/.gitignore @@ -0,0 +1,11 @@ +# Maven +target/ + +# Eclipse +.classpath +.project +.settings + +# Intellij +*.iml +.idea/ diff --git a/java-shared-config/README.md b/java-shared-config/README.md new file mode 100644 index 000000000000..983fd6979a33 --- /dev/null +++ b/java-shared-config/README.md @@ -0,0 +1,47 @@ +# Google Cloud Shared Build Configs + +Shared Maven build configuration for Google Cloud Java client libraries. + +[![Maven][maven-version-image]][maven-version-link] + +## Quickstart + +[//]: # ({x-version-update-start:google-cloud-shared-config:released}) +If you are using Maven, use this artifact as your project's parent. +```xml + + + com.google.cloud + google-cloud-shared-config + 0.0.1 + + +``` +[//]: # ({x-version-update-end}) + +## Versioning + +This library follows [Semantic Versioning](http://semver.org/). + +It is currently in major version zero (``0.y.z``), which means that anything may change at any time +and the public API should not be considered stable. + +## Contributing + +Contributions to this library are always welcome and highly encouraged. + +See [CONTRIBUTING.md][contributing] documentation for more information on how to get started. + +Please note that this project is released with a Contributor Code of Conduct. By participating in +this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more +information. + +## License + +Apache 2.0 - See [LICENSE][license] for more information. + +[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-shared-config.svg +[maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-shared-config&core=gav +[contributing]: https://github.com/googleapis/java-shared-config/blob/master/CONTRIBUTING.md +[code-of-conduct]: https://github.com/googleapis/java-shared-config/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[license]: https://github.com/googleapis/java-shared-config/blob/master/LICENSE \ No newline at end of file From 47826895c605c8c757bdba113f92d26ceb050b23 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 26 Aug 2019 10:32:29 -0700 Subject: [PATCH 002/794] chore: include common build configuration --- .../.github/ISSUE_TEMPLATE/bug_report.md | 51 +++++ .../.github/ISSUE_TEMPLATE/feature_request.md | 21 ++ .../.github/ISSUE_TEMPLATE/support_request.md | 7 + .../.github/PULL_REQUEST_TEMPLATE.md | 1 + java-shared-config/.gitignore | 4 + java-shared-config/.kokoro/build.bat | 3 + java-shared-config/.kokoro/build.sh | 54 +++++ java-shared-config/.kokoro/common.cfg | 13 ++ .../.kokoro/continuous/common.cfg | 24 +++ .../.kokoro/continuous/dependencies.cfg | 12 ++ .../.kokoro/continuous/integration.cfg | 7 + .../.kokoro/continuous/java11.cfg | 7 + .../.kokoro/continuous/java7.cfg | 7 + .../.kokoro/continuous/java8-osx.cfg | 3 + .../.kokoro/continuous/java8-win.cfg | 3 + .../.kokoro/continuous/java8.cfg | 7 + .../.kokoro/continuous/lint.cfg | 13 ++ .../.kokoro/continuous/propose_release.cfg | 53 +++++ .../.kokoro/continuous/propose_release.sh | 29 +++ java-shared-config/.kokoro/dependencies.sh | 27 +++ java-shared-config/.kokoro/linkage-monitor.sh | 33 +++ java-shared-config/.kokoro/nightly/common.cfg | 24 +++ .../.kokoro/nightly/dependencies.cfg | 12 ++ .../.kokoro/nightly/integration.cfg | 7 + java-shared-config/.kokoro/nightly/java11.cfg | 7 + java-shared-config/.kokoro/nightly/java7.cfg | 7 + .../.kokoro/nightly/java8-osx.cfg | 3 + .../.kokoro/nightly/java8-win.cfg | 3 + java-shared-config/.kokoro/nightly/java8.cfg | 7 + java-shared-config/.kokoro/nightly/lint.cfg | 13 ++ .../.kokoro/presubmit/common.cfg | 33 +++ .../.kokoro/presubmit/dependencies.cfg | 12 ++ .../.kokoro/presubmit/integration.cfg | 7 + .../.kokoro/presubmit/java11.cfg | 7 + .../.kokoro/presubmit/java7.cfg | 7 + .../.kokoro/presubmit/java8-osx.cfg | 3 + .../.kokoro/presubmit/java8-win.cfg | 3 + .../.kokoro/presubmit/java8.cfg | 7 + .../.kokoro/presubmit/linkage-monitor.cfg | 12 ++ java-shared-config/.kokoro/presubmit/lint.cfg | 13 ++ .../.kokoro/release/bump_snapshot.cfg | 53 +++++ .../.kokoro/release/bump_snapshot.sh | 30 +++ java-shared-config/.kokoro/release/common.cfg | 49 +++++ java-shared-config/.kokoro/release/common.sh | 50 +++++ java-shared-config/.kokoro/release/drop.cfg | 9 + java-shared-config/.kokoro/release/drop.sh | 32 +++ .../.kokoro/release/promote.cfg | 10 + java-shared-config/.kokoro/release/promote.sh | 34 +++ .../.kokoro/release/publish_javadoc.cfg | 19 ++ .../.kokoro/release/publish_javadoc.sh | 55 +++++ .../.kokoro/release/snapshot.cfg | 6 + .../.kokoro/release/snapshot.sh | 30 +++ java-shared-config/.kokoro/release/stage.cfg | 44 ++++ java-shared-config/.kokoro/release/stage.sh | 41 ++++ java-shared-config/.kokoro/trampoline.sh | 24 +++ java-shared-config/.repo-metadata.json | 9 + java-shared-config/CODE_OF_CONDUCT.md | 93 ++++++++ java-shared-config/CONTRIBUTING.md | 28 +++ java-shared-config/LICENSE | 202 ++++++++++++++++++ java-shared-config/codecov.yaml | 4 + java-shared-config/java.header | 15 ++ java-shared-config/license-checks.xml | 10 + java-shared-config/renovate.json | 29 +++ java-shared-config/synth.metadata | 12 ++ java-shared-config/synth.py | 27 +++ 65 files changed, 1481 insertions(+) create mode 100644 java-shared-config/.github/ISSUE_TEMPLATE/bug_report.md create mode 100644 java-shared-config/.github/ISSUE_TEMPLATE/feature_request.md create mode 100644 java-shared-config/.github/ISSUE_TEMPLATE/support_request.md create mode 100644 java-shared-config/.github/PULL_REQUEST_TEMPLATE.md create mode 100644 java-shared-config/.kokoro/build.bat create mode 100755 java-shared-config/.kokoro/build.sh create mode 100644 java-shared-config/.kokoro/common.cfg create mode 100644 java-shared-config/.kokoro/continuous/common.cfg create mode 100644 java-shared-config/.kokoro/continuous/dependencies.cfg create mode 100644 java-shared-config/.kokoro/continuous/integration.cfg create mode 100644 java-shared-config/.kokoro/continuous/java11.cfg create mode 100644 java-shared-config/.kokoro/continuous/java7.cfg create mode 100644 java-shared-config/.kokoro/continuous/java8-osx.cfg create mode 100644 java-shared-config/.kokoro/continuous/java8-win.cfg create mode 100644 java-shared-config/.kokoro/continuous/java8.cfg create mode 100644 java-shared-config/.kokoro/continuous/lint.cfg create mode 100644 java-shared-config/.kokoro/continuous/propose_release.cfg create mode 100644 java-shared-config/.kokoro/continuous/propose_release.sh create mode 100755 java-shared-config/.kokoro/dependencies.sh create mode 100755 java-shared-config/.kokoro/linkage-monitor.sh create mode 100644 java-shared-config/.kokoro/nightly/common.cfg create mode 100644 java-shared-config/.kokoro/nightly/dependencies.cfg create mode 100644 java-shared-config/.kokoro/nightly/integration.cfg create mode 100644 java-shared-config/.kokoro/nightly/java11.cfg create mode 100644 java-shared-config/.kokoro/nightly/java7.cfg create mode 100644 java-shared-config/.kokoro/nightly/java8-osx.cfg create mode 100644 java-shared-config/.kokoro/nightly/java8-win.cfg create mode 100644 java-shared-config/.kokoro/nightly/java8.cfg create mode 100644 java-shared-config/.kokoro/nightly/lint.cfg create mode 100644 java-shared-config/.kokoro/presubmit/common.cfg create mode 100644 java-shared-config/.kokoro/presubmit/dependencies.cfg create mode 100644 java-shared-config/.kokoro/presubmit/integration.cfg create mode 100644 java-shared-config/.kokoro/presubmit/java11.cfg create mode 100644 java-shared-config/.kokoro/presubmit/java7.cfg create mode 100644 java-shared-config/.kokoro/presubmit/java8-osx.cfg create mode 100644 java-shared-config/.kokoro/presubmit/java8-win.cfg create mode 100644 java-shared-config/.kokoro/presubmit/java8.cfg create mode 100644 java-shared-config/.kokoro/presubmit/linkage-monitor.cfg create mode 100644 java-shared-config/.kokoro/presubmit/lint.cfg create mode 100644 java-shared-config/.kokoro/release/bump_snapshot.cfg create mode 100644 java-shared-config/.kokoro/release/bump_snapshot.sh create mode 100644 java-shared-config/.kokoro/release/common.cfg create mode 100755 java-shared-config/.kokoro/release/common.sh create mode 100644 java-shared-config/.kokoro/release/drop.cfg create mode 100755 java-shared-config/.kokoro/release/drop.sh create mode 100644 java-shared-config/.kokoro/release/promote.cfg create mode 100755 java-shared-config/.kokoro/release/promote.sh create mode 100644 java-shared-config/.kokoro/release/publish_javadoc.cfg create mode 100755 java-shared-config/.kokoro/release/publish_javadoc.sh create mode 100644 java-shared-config/.kokoro/release/snapshot.cfg create mode 100644 java-shared-config/.kokoro/release/snapshot.sh create mode 100644 java-shared-config/.kokoro/release/stage.cfg create mode 100755 java-shared-config/.kokoro/release/stage.sh create mode 100644 java-shared-config/.kokoro/trampoline.sh create mode 100644 java-shared-config/.repo-metadata.json create mode 100644 java-shared-config/CODE_OF_CONDUCT.md create mode 100644 java-shared-config/CONTRIBUTING.md create mode 100644 java-shared-config/LICENSE create mode 100644 java-shared-config/codecov.yaml create mode 100644 java-shared-config/java.header create mode 100644 java-shared-config/license-checks.xml create mode 100644 java-shared-config/renovate.json create mode 100644 java-shared-config/synth.metadata create mode 100644 java-shared-config/synth.py diff --git a/java-shared-config/.github/ISSUE_TEMPLATE/bug_report.md b/java-shared-config/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000000..f30747644131 --- /dev/null +++ b/java-shared-config/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,51 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- + +Thanks for stopping by to let us know something could be better! + +**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. + +Please run down the following list and make sure you've tried the usual "quick fixes": + + - Search the issues already opened: https://github.com/googleapis/google-cloud-shared-config/issues + - Check for answers on StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform + +If you are still having issues, please include as much information as possible: + +#### Environment details + +1. Specify the API at the beginning of the title. For example, "BigQuery: ..."). + General, Core, and Other are also allowed as types +2. OS type and version: +3. Java version: +4. google-cloud-shared-config version(s): + +#### Steps to reproduce + + 1. ? + 2. ? + +#### Code example + +```java +// example +``` + +#### Stack trace +``` +Any relevant stacktrace here. +``` + +#### External references such as API reference guides + +- ? + +#### Any additional information below + + +Following these steps guarantees the quickest resolution possible. + +Thanks! \ No newline at end of file diff --git a/java-shared-config/.github/ISSUE_TEMPLATE/feature_request.md b/java-shared-config/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000000..754e30c68a00 --- /dev/null +++ b/java-shared-config/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,21 @@ +--- +name: Feature request +about: Suggest an idea for this library + +--- + +Thanks for stopping by to let us know something could be better! + +**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. + +**Is your feature request related to a problem? Please describe.** +What the problem is. Example: I'm always frustrated when [...] + +**Describe the solution you'd like** +What you want to happen. + +**Describe alternatives you've considered** +Any alternative solutions or features you've considered. + +**Additional context** +Any other context or screenshots about the feature request. diff --git a/java-shared-config/.github/ISSUE_TEMPLATE/support_request.md b/java-shared-config/.github/ISSUE_TEMPLATE/support_request.md new file mode 100644 index 000000000000..995869032125 --- /dev/null +++ b/java-shared-config/.github/ISSUE_TEMPLATE/support_request.md @@ -0,0 +1,7 @@ +--- +name: Support request +about: If you have a support contract with Google, please create an issue in the Google Cloud Support console. + +--- + +**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response. diff --git a/java-shared-config/.github/PULL_REQUEST_TEMPLATE.md b/java-shared-config/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000000..0bd0ee0620f9 --- /dev/null +++ b/java-shared-config/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1 @@ +Fixes # (it's a good idea to open an issue first for context and/or discussion) \ No newline at end of file diff --git a/java-shared-config/.gitignore b/java-shared-config/.gitignore index b637b4b461e6..fadd6afc2dfd 100644 --- a/java-shared-config/.gitignore +++ b/java-shared-config/.gitignore @@ -9,3 +9,7 @@ target/ # Intellij *.iml .idea/ + +# python utilities +*.pyc +__pycache__ diff --git a/java-shared-config/.kokoro/build.bat b/java-shared-config/.kokoro/build.bat new file mode 100644 index 000000000000..c22797880be8 --- /dev/null +++ b/java-shared-config/.kokoro/build.bat @@ -0,0 +1,3 @@ +:: See documentation in type-shell-output.bat + +"C:\Program Files\Git\bin\bash.exe" github/java-shared-config/.kokoro/build.sh diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh new file mode 100755 index 000000000000..2ffb5ef7f070 --- /dev/null +++ b/java-shared-config/.kokoro/build.sh @@ -0,0 +1,54 @@ +#!/bin/bash +# 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. +# 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. + +set -eo pipefail + +## Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +# Print out Java version +java -version +echo ${JOB_TYPE} + +mvn install -B -V \ + -DskipTests=true \ + -Dmaven.javadoc.skip=true \ + -Dgcloud.download.skip=true \ + -T 1C + +# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it +if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then + export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS}) +fi + +case ${JOB_TYPE} in +test) + mvn test -B + bash ${KOKORO_GFILE_DIR}/codecov.sh + ;; +lint) + mvn com.coveo:fmt-maven-plugin:check + ;; +javadoc) + mvn javadoc:javadoc javadoc:test-javadoc + ;; +integration) + mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -fae verify + ;; +*) + ;; +esac \ No newline at end of file diff --git a/java-shared-config/.kokoro/common.cfg b/java-shared-config/.kokoro/common.cfg new file mode 100644 index 000000000000..806c23a2de9c --- /dev/null +++ b/java-shared-config/.kokoro/common.cfg @@ -0,0 +1,13 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Download trampoline resources. These will be in ${KOKORO_GFILE_DIR} +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# All builds use the trampoline script to run in docker. +build_file: "java-shared-config/.kokoro/trampoline.sh" + +# Tell the trampoline which build file to use. +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/build.sh" +} diff --git a/java-shared-config/.kokoro/continuous/common.cfg b/java-shared-config/.kokoro/continuous/common.cfg new file mode 100644 index 000000000000..57593e238c56 --- /dev/null +++ b/java-shared-config/.kokoro/continuous/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "java-shared-config/.kokoro/trampoline.sh" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/build.sh" +} + +env_vars: { + key: "JOB_TYPE" + value: "test" +} diff --git a/java-shared-config/.kokoro/continuous/dependencies.cfg b/java-shared-config/.kokoro/continuous/dependencies.cfg new file mode 100644 index 000000000000..14f44ff859bb --- /dev/null +++ b/java-shared-config/.kokoro/continuous/dependencies.cfg @@ -0,0 +1,12 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/dependencies.sh" +} diff --git a/java-shared-config/.kokoro/continuous/integration.cfg b/java-shared-config/.kokoro/continuous/integration.cfg new file mode 100644 index 000000000000..3b017fc80f04 --- /dev/null +++ b/java-shared-config/.kokoro/continuous/integration.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} diff --git a/java-shared-config/.kokoro/continuous/java11.cfg b/java-shared-config/.kokoro/continuous/java11.cfg new file mode 100644 index 000000000000..709f2b4c73db --- /dev/null +++ b/java-shared-config/.kokoro/continuous/java11.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java11" +} diff --git a/java-shared-config/.kokoro/continuous/java7.cfg b/java-shared-config/.kokoro/continuous/java7.cfg new file mode 100644 index 000000000000..cb24f44eea3b --- /dev/null +++ b/java-shared-config/.kokoro/continuous/java7.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java7" +} diff --git a/java-shared-config/.kokoro/continuous/java8-osx.cfg b/java-shared-config/.kokoro/continuous/java8-osx.cfg new file mode 100644 index 000000000000..ac4f9feb31d0 --- /dev/null +++ b/java-shared-config/.kokoro/continuous/java8-osx.cfg @@ -0,0 +1,3 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +build_file: "java-shared-config/.kokoro/build.sh" diff --git a/java-shared-config/.kokoro/continuous/java8-win.cfg b/java-shared-config/.kokoro/continuous/java8-win.cfg new file mode 100644 index 000000000000..9d96c112a0c3 --- /dev/null +++ b/java-shared-config/.kokoro/continuous/java8-win.cfg @@ -0,0 +1,3 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +build_file: "java-shared-config/.kokoro/build.bat" diff --git a/java-shared-config/.kokoro/continuous/java8.cfg b/java-shared-config/.kokoro/continuous/java8.cfg new file mode 100644 index 000000000000..3b017fc80f04 --- /dev/null +++ b/java-shared-config/.kokoro/continuous/java8.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} diff --git a/java-shared-config/.kokoro/continuous/lint.cfg b/java-shared-config/.kokoro/continuous/lint.cfg new file mode 100644 index 000000000000..6d323c8ae768 --- /dev/null +++ b/java-shared-config/.kokoro/continuous/lint.cfg @@ -0,0 +1,13 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. + +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "lint" +} \ No newline at end of file diff --git a/java-shared-config/.kokoro/continuous/propose_release.cfg b/java-shared-config/.kokoro/continuous/propose_release.cfg new file mode 100644 index 000000000000..87efce51dfa3 --- /dev/null +++ b/java-shared-config/.kokoro/continuous/propose_release.cfg @@ -0,0 +1,53 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "java-shared-config/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/release/bump_snapshot.sh" +} + +# tokens used by release-please to keep an up-to-date release PR. +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-key-release-please" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-token-release-please" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-url-release-please" + } + } +} diff --git a/java-shared-config/.kokoro/continuous/propose_release.sh b/java-shared-config/.kokoro/continuous/propose_release.sh new file mode 100644 index 000000000000..999b2b29a9a7 --- /dev/null +++ b/java-shared-config/.kokoro/continuous/propose_release.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# 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. +# You may obtain a copy of the License at +# +# https://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. + +set -eo pipefail + +export NPM_CONFIG_PREFIX=/home/node/.npm-global + +if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then + # Groom the release PR as new commits are merged. + npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \ + --repo-url=googleapis/java-shared-config \ + --package-name="google-cloud-shared-config" \ + --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \ + --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \ + --release-type=java-auth-yoshi +fi diff --git a/java-shared-config/.kokoro/dependencies.sh b/java-shared-config/.kokoro/dependencies.sh new file mode 100755 index 000000000000..c90526285a95 --- /dev/null +++ b/java-shared-config/.kokoro/dependencies.sh @@ -0,0 +1,27 @@ +#!/bin/bash +# 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. +# 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. + +set -eo pipefail + +cd github/java-shared-config/ + +# Print out Java +java -version +echo $JOB_TYPE + +export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" + +mvn install -DskipTests=true -B -V +mvn -B dependency:analyze -DfailOnWarning=true diff --git a/java-shared-config/.kokoro/linkage-monitor.sh b/java-shared-config/.kokoro/linkage-monitor.sh new file mode 100755 index 000000000000..56abc2c617b7 --- /dev/null +++ b/java-shared-config/.kokoro/linkage-monitor.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# 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. +# 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. + +set -eo pipefail +# Display commands being run. +set -x + +cd github/java-shared-config/ + +# Print out Java version +java -version +echo ${JOB_TYPE} + +mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V + +# Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR +JAR=linkage-monitor-latest-all-deps.jar +curl -v -O "https://storage.googleapis.com/cloud-opensource-java-linkage-monitor/${JAR}" + +# Fails if there's new linkage errors compared with baseline +java -jar ${JAR} com.google.cloud:libraries-bom diff --git a/java-shared-config/.kokoro/nightly/common.cfg b/java-shared-config/.kokoro/nightly/common.cfg new file mode 100644 index 000000000000..57593e238c56 --- /dev/null +++ b/java-shared-config/.kokoro/nightly/common.cfg @@ -0,0 +1,24 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "java-shared-config/.kokoro/trampoline.sh" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/build.sh" +} + +env_vars: { + key: "JOB_TYPE" + value: "test" +} diff --git a/java-shared-config/.kokoro/nightly/dependencies.cfg b/java-shared-config/.kokoro/nightly/dependencies.cfg new file mode 100644 index 000000000000..14f44ff859bb --- /dev/null +++ b/java-shared-config/.kokoro/nightly/dependencies.cfg @@ -0,0 +1,12 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/dependencies.sh" +} diff --git a/java-shared-config/.kokoro/nightly/integration.cfg b/java-shared-config/.kokoro/nightly/integration.cfg new file mode 100644 index 000000000000..3b017fc80f04 --- /dev/null +++ b/java-shared-config/.kokoro/nightly/integration.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} diff --git a/java-shared-config/.kokoro/nightly/java11.cfg b/java-shared-config/.kokoro/nightly/java11.cfg new file mode 100644 index 000000000000..709f2b4c73db --- /dev/null +++ b/java-shared-config/.kokoro/nightly/java11.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java11" +} diff --git a/java-shared-config/.kokoro/nightly/java7.cfg b/java-shared-config/.kokoro/nightly/java7.cfg new file mode 100644 index 000000000000..cb24f44eea3b --- /dev/null +++ b/java-shared-config/.kokoro/nightly/java7.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java7" +} diff --git a/java-shared-config/.kokoro/nightly/java8-osx.cfg b/java-shared-config/.kokoro/nightly/java8-osx.cfg new file mode 100644 index 000000000000..ac4f9feb31d0 --- /dev/null +++ b/java-shared-config/.kokoro/nightly/java8-osx.cfg @@ -0,0 +1,3 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +build_file: "java-shared-config/.kokoro/build.sh" diff --git a/java-shared-config/.kokoro/nightly/java8-win.cfg b/java-shared-config/.kokoro/nightly/java8-win.cfg new file mode 100644 index 000000000000..9d96c112a0c3 --- /dev/null +++ b/java-shared-config/.kokoro/nightly/java8-win.cfg @@ -0,0 +1,3 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +build_file: "java-shared-config/.kokoro/build.bat" diff --git a/java-shared-config/.kokoro/nightly/java8.cfg b/java-shared-config/.kokoro/nightly/java8.cfg new file mode 100644 index 000000000000..3b017fc80f04 --- /dev/null +++ b/java-shared-config/.kokoro/nightly/java8.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} diff --git a/java-shared-config/.kokoro/nightly/lint.cfg b/java-shared-config/.kokoro/nightly/lint.cfg new file mode 100644 index 000000000000..6d323c8ae768 --- /dev/null +++ b/java-shared-config/.kokoro/nightly/lint.cfg @@ -0,0 +1,13 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. + +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "lint" +} \ No newline at end of file diff --git a/java-shared-config/.kokoro/presubmit/common.cfg b/java-shared-config/.kokoro/presubmit/common.cfg new file mode 100644 index 000000000000..e1efc9940807 --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/common.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "java-shared-config/.kokoro/trampoline.sh" + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/build.sh" +} + +env_vars: { + key: "JOB_TYPE" + value: "test" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "dpebot_codecov_token" + } + } +} diff --git a/java-shared-config/.kokoro/presubmit/dependencies.cfg b/java-shared-config/.kokoro/presubmit/dependencies.cfg new file mode 100644 index 000000000000..14f44ff859bb --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/dependencies.cfg @@ -0,0 +1,12 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/dependencies.sh" +} diff --git a/java-shared-config/.kokoro/presubmit/integration.cfg b/java-shared-config/.kokoro/presubmit/integration.cfg new file mode 100644 index 000000000000..3b017fc80f04 --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/integration.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} diff --git a/java-shared-config/.kokoro/presubmit/java11.cfg b/java-shared-config/.kokoro/presubmit/java11.cfg new file mode 100644 index 000000000000..709f2b4c73db --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/java11.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java11" +} diff --git a/java-shared-config/.kokoro/presubmit/java7.cfg b/java-shared-config/.kokoro/presubmit/java7.cfg new file mode 100644 index 000000000000..cb24f44eea3b --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/java7.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java7" +} diff --git a/java-shared-config/.kokoro/presubmit/java8-osx.cfg b/java-shared-config/.kokoro/presubmit/java8-osx.cfg new file mode 100644 index 000000000000..ac4f9feb31d0 --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/java8-osx.cfg @@ -0,0 +1,3 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +build_file: "java-shared-config/.kokoro/build.sh" diff --git a/java-shared-config/.kokoro/presubmit/java8-win.cfg b/java-shared-config/.kokoro/presubmit/java8-win.cfg new file mode 100644 index 000000000000..9d96c112a0c3 --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/java8-win.cfg @@ -0,0 +1,3 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +build_file: "java-shared-config/.kokoro/build.bat" diff --git a/java-shared-config/.kokoro/presubmit/java8.cfg b/java-shared-config/.kokoro/presubmit/java8.cfg new file mode 100644 index 000000000000..3b017fc80f04 --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/java8.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} diff --git a/java-shared-config/.kokoro/presubmit/linkage-monitor.cfg b/java-shared-config/.kokoro/presubmit/linkage-monitor.cfg new file mode 100644 index 000000000000..02b713a06a55 --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/linkage-monitor.cfg @@ -0,0 +1,12 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/linkage-monitor.sh" +} \ No newline at end of file diff --git a/java-shared-config/.kokoro/presubmit/lint.cfg b/java-shared-config/.kokoro/presubmit/lint.cfg new file mode 100644 index 000000000000..6d323c8ae768 --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/lint.cfg @@ -0,0 +1,13 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. + +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "lint" +} \ No newline at end of file diff --git a/java-shared-config/.kokoro/release/bump_snapshot.cfg b/java-shared-config/.kokoro/release/bump_snapshot.cfg new file mode 100644 index 000000000000..87efce51dfa3 --- /dev/null +++ b/java-shared-config/.kokoro/release/bump_snapshot.cfg @@ -0,0 +1,53 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + } +} + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "java-shared-config/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/release/bump_snapshot.sh" +} + +# tokens used by release-please to keep an up-to-date release PR. +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-key-release-please" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-token-release-please" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "github-magic-proxy-url-release-please" + } + } +} diff --git a/java-shared-config/.kokoro/release/bump_snapshot.sh b/java-shared-config/.kokoro/release/bump_snapshot.sh new file mode 100644 index 000000000000..c5d99e7d09f1 --- /dev/null +++ b/java-shared-config/.kokoro/release/bump_snapshot.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +# 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. +# You may obtain a copy of the License at +# +# https://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. + +set -eo pipefail + +export NPM_CONFIG_PREFIX=/home/node/.npm-global + +if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then + # Groom the snapshot release PR immediately after publishing a release + npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \ + --repo-url=googleapis/java-shared-config \ + --package-name="google-cloud-shared-config" \ + --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \ + --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \ + --snapshot \ + --release-type=java-auth-yoshi +fi diff --git a/java-shared-config/.kokoro/release/common.cfg b/java-shared-config/.kokoro/release/common.cfg new file mode 100644 index 000000000000..5cf31b784945 --- /dev/null +++ b/java-shared-config/.kokoro/release/common.cfg @@ -0,0 +1,49 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Download trampoline resources. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" + +# Use the trampoline script to run in docker. +build_file: "java-shared-config/.kokoro/trampoline.sh" + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 70247 + keyname: "maven-gpg-keyring" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 70247 + keyname: "maven-gpg-passphrase" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 70247 + keyname: "maven-gpg-pubkeyring" + } + } +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 70247 + keyname: "sonatype-credentials" + } + } +} diff --git a/java-shared-config/.kokoro/release/common.sh b/java-shared-config/.kokoro/release/common.sh new file mode 100755 index 000000000000..6e3f65999b3d --- /dev/null +++ b/java-shared-config/.kokoro/release/common.sh @@ -0,0 +1,50 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# 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. + +set -eo pipefail + +# Get secrets from keystore and set and environment variables +setup_environment_secrets() { + export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase) + export GPG_TTY=$(tty) + export GPG_HOMEDIR=/gpg + mkdir $GPG_HOMEDIR + mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GPG_HOMEDIR/pubring.gpg + mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GPG_HOMEDIR/secring.gpg + export SONATYPE_USERNAME=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f1 -d'|') + export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f2 -d'|') +} + +create_settings_xml_file() { + echo " + + + ossrh + ${SONATYPE_USERNAME} + ${SONATYPE_PASSWORD} + + + sonatype-nexus-staging + ${SONATYPE_USERNAME} + ${SONATYPE_PASSWORD} + + + sonatype-nexus-snapshots + ${SONATYPE_USERNAME} + ${SONATYPE_PASSWORD} + + +" > $1 +} \ No newline at end of file diff --git a/java-shared-config/.kokoro/release/drop.cfg b/java-shared-config/.kokoro/release/drop.cfg new file mode 100644 index 000000000000..2b45be610dfb --- /dev/null +++ b/java-shared-config/.kokoro/release/drop.cfg @@ -0,0 +1,9 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/release/drop.sh" +} + +# Download staging properties file. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-shared-config" \ No newline at end of file diff --git a/java-shared-config/.kokoro/release/drop.sh b/java-shared-config/.kokoro/release/drop.sh new file mode 100755 index 000000000000..5c4551efa2c0 --- /dev/null +++ b/java-shared-config/.kokoro/release/drop.sh @@ -0,0 +1,32 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# 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. + +set -eo pipefail + +# STAGING_REPOSITORY_ID must be set +if [ -z "${STAGING_REPOSITORY_ID}" ]; then + echo "Missing STAGING_REPOSITORY_ID environment variable" + exit 1 +fi + +source $(dirname "$0")/common.sh +pushd $(dirname "$0")/../../ + +setup_environment_secrets +create_settings_xml_file "settings.xml" + +mvn nexus-staging:drop -B \ + --settings=settings.xml \ + -DstagingRepositoryId=${STAGING_REPOSITORY_ID} diff --git a/java-shared-config/.kokoro/release/promote.cfg b/java-shared-config/.kokoro/release/promote.cfg new file mode 100644 index 000000000000..6cdbd53c065e --- /dev/null +++ b/java-shared-config/.kokoro/release/promote.cfg @@ -0,0 +1,10 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/release/promote.sh" +} + +# Download staging properties file. +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-shared-config" + diff --git a/java-shared-config/.kokoro/release/promote.sh b/java-shared-config/.kokoro/release/promote.sh new file mode 100755 index 000000000000..1fa95fa537a3 --- /dev/null +++ b/java-shared-config/.kokoro/release/promote.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# 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. + +set -eo pipefail + +# STAGING_REPOSITORY_ID must be set +if [ -z "${STAGING_REPOSITORY_ID}" ]; then + echo "Missing STAGING_REPOSITORY_ID environment variable" + exit 1 +fi + +source $(dirname "$0")/common.sh + +pushd $(dirname "$0")/../../ + +setup_environment_secrets +create_settings_xml_file "settings.xml" + +mvn nexus-staging:release -B \ + -DperformRelease=true \ + --settings=settings.xml \ + -DstagingRepositoryId=${STAGING_REPOSITORY_ID} diff --git a/java-shared-config/.kokoro/release/publish_javadoc.cfg b/java-shared-config/.kokoro/release/publish_javadoc.cfg new file mode 100644 index 000000000000..3e124ff169a5 --- /dev/null +++ b/java-shared-config/.kokoro/release/publish_javadoc.cfg @@ -0,0 +1,19 @@ +# Format: //devtools/kokoro/config/proto/build.proto +env_vars: { + key: "STAGING_BUCKET" + value: "docs-staging" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/release/publish_javadoc.sh" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "docuploader_service_account" + } + } +} diff --git a/java-shared-config/.kokoro/release/publish_javadoc.sh b/java-shared-config/.kokoro/release/publish_javadoc.sh new file mode 100755 index 000000000000..cb1ab503b7e3 --- /dev/null +++ b/java-shared-config/.kokoro/release/publish_javadoc.sh @@ -0,0 +1,55 @@ +#!/bin/bash +# Copyright 2019 Google Inc. +# +# 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. + +set -eo pipefail + +if [[ -z "${CREDENTIALS}" ]]; then + CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account +fi + +if [[ -z "${STAGING_BUCKET}" ]]; then + echo "Need to set STAGING_BUCKET environment variable" + exit 1 +fi + +# work from the git root directory +pushd $(dirname "$0")/../../ + +# install docuploader package +python3 -m pip install gcp-docuploader + +# compile all packages +mvn clean install -B -DskipTests=true + +NAME=google-cloud-shared-config +VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) + +# build the docs +mvn site -B + +pushd target/site/apidocs + +# create metadata +python3 -m docuploader create-metadata \ + --name ${NAME} \ + --version ${VERSION} \ + --language java + +# upload docs +python3 -m docuploader upload . \ + --credentials ${CREDENTIALS} \ + --staging-bucket ${STAGING_BUCKET} + +popd diff --git a/java-shared-config/.kokoro/release/snapshot.cfg b/java-shared-config/.kokoro/release/snapshot.cfg new file mode 100644 index 000000000000..58304f32127a --- /dev/null +++ b/java-shared-config/.kokoro/release/snapshot.cfg @@ -0,0 +1,6 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/release/snapshot.sh" +} \ No newline at end of file diff --git a/java-shared-config/.kokoro/release/snapshot.sh b/java-shared-config/.kokoro/release/snapshot.sh new file mode 100644 index 000000000000..bf738c56dd8d --- /dev/null +++ b/java-shared-config/.kokoro/release/snapshot.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# 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. +# 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. + +set -eo pipefail + +source $(dirname "$0")/common.sh +MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml +pushd $(dirname "$0")/../../ + +setup_environment_secrets +create_settings_xml_file "settings.xml" + +mvn clean install deploy -B \ + --settings ${MAVEN_SETTINGS_FILE} \ + -DperformRelease=true \ + -Dgpg.executable=gpg \ + -Dgpg.passphrase=${GPG_PASSPHRASE} \ + -Dgpg.homedir=${GPG_HOMEDIR} \ No newline at end of file diff --git a/java-shared-config/.kokoro/release/stage.cfg b/java-shared-config/.kokoro/release/stage.cfg new file mode 100644 index 000000000000..427c14833e1e --- /dev/null +++ b/java-shared-config/.kokoro/release/stage.cfg @@ -0,0 +1,44 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/release/stage.sh" +} + +# Need to save the properties file +action { + define_artifacts { + regex: "github/java-shared-config/target/nexus-staging/staging/*.properties" + strip_prefix: "github/java-shared-config" + } +} + +# Fetch the token needed for reporting release status to GitHub +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "yoshi-automation-github-key" + } + } +} + +# Fetch magictoken to use with Magic Github Proxy +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "releasetool-magictoken" + } + } +} + +# Fetch api key to use with Magic Github Proxy +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "magic-github-proxy-api-key" + } + } +} diff --git a/java-shared-config/.kokoro/release/stage.sh b/java-shared-config/.kokoro/release/stage.sh new file mode 100755 index 000000000000..b1b1b01c6623 --- /dev/null +++ b/java-shared-config/.kokoro/release/stage.sh @@ -0,0 +1,41 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# 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. + +set -eo pipefail + +# Start the releasetool reporter +python3 -m pip install gcp-releasetool +python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script + +source $(dirname "$0")/common.sh +MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml +pushd $(dirname "$0")/../../ + +setup_environment_secrets +create_settings_xml_file "settings.xml" + +mvn clean install deploy -B \ + --settings ${MAVEN_SETTINGS_FILE} \ + -DperformRelease=true \ + -Dgpg.executable=gpg \ + -Dgpg.passphrase=${GPG_PASSPHRASE} \ + -Dgpg.homedir=${GPG_HOMEDIR} + +if [[ -n "${AUTORELEASE_PR}" ]] +then + mvn nexus-staging:release -B \ + -DperformRelease=true \ + --settings=settings.xml +fi \ No newline at end of file diff --git a/java-shared-config/.kokoro/trampoline.sh b/java-shared-config/.kokoro/trampoline.sh new file mode 100644 index 000000000000..ba17ce01466b --- /dev/null +++ b/java-shared-config/.kokoro/trampoline.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# Copyright 2018 Google Inc. +# +# 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. +set -eo pipefail +# Always run the cleanup script, regardless of the success of bouncing into +# the container. +function cleanup() { + chmod +x ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh + ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh + echo "cleanup"; +} +trap cleanup EXIT +python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py" diff --git a/java-shared-config/.repo-metadata.json b/java-shared-config/.repo-metadata.json new file mode 100644 index 000000000000..1553fb75a807 --- /dev/null +++ b/java-shared-config/.repo-metadata.json @@ -0,0 +1,9 @@ +{ + "name": "google-cloud-shared-config", + "name_pretty": "Google Cloud Shared Build Configs", + "release_level": "beta", + "language": "java", + "repo": "googleapis/java-shared-config", + "repo_short": "java-shared-config", + "distribution_name": "google-cloud-shared-config" +} diff --git a/java-shared-config/CODE_OF_CONDUCT.md b/java-shared-config/CODE_OF_CONDUCT.md new file mode 100644 index 000000000000..6b2238bb75e0 --- /dev/null +++ b/java-shared-config/CODE_OF_CONDUCT.md @@ -0,0 +1,93 @@ +# Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of +experience, education, socio-economic status, nationality, personal appearance, +race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, or to ban temporarily or permanently any +contributor for other behaviors that they deem inappropriate, threatening, +offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +This Code of Conduct also applies outside the project spaces when the Project +Steward has a reasonable belief that an individual's behavior may have a +negative impact on the project or its community. + +## Conflict Resolution + +We do not believe that all conflict is bad; healthy debate and disagreement +often yield positive results. However, it is never okay to be disrespectful or +to engage in behavior that violates the project’s code of conduct. + +If you see someone violating the code of conduct, you are encouraged to address +the behavior directly with those involved. Many issues can be resolved quickly +and easily, and this gives people more control over the outcome of their +dispute. If you are unable to resolve the matter for any reason, or if the +behavior is threatening or harassing, report it. We are dedicated to providing +an environment where participants feel welcome and safe. + +Reports should be directed to *[PROJECT STEWARD NAME(s) AND EMAIL(s)]*, the +Project Steward(s) for *[PROJECT NAME]*. It is the Project Steward’s duty to +receive and address reported violations of the code of conduct. They will then +work with a committee consisting of representatives from the Open Source +Programs Office and the Google Open Source Strategy team. If for any reason you +are uncomfortable reaching out the Project Steward, please email +opensource@google.com. + +We will investigate every complaint, but you may not receive a direct response. +We will use our discretion in determining when and how to follow up on reported +incidents, which may range from not taking action to permanent expulsion from +the project and project-sponsored spaces. We will notify the accused of the +report and provide them an opportunity to discuss it before any action is taken. +The identity of the reporter will be omitted from the details of the report +supplied to the accused. In potentially harmful situations, such as ongoing +harassment or threats to anyone's safety, we may take action without notice. + +## Attribution + +This Code of Conduct is adapted from the Contributor Covenant, version 1.4, +available at +https://www.contributor-covenant.org/version/1/4/code-of-conduct.html \ No newline at end of file diff --git a/java-shared-config/CONTRIBUTING.md b/java-shared-config/CONTRIBUTING.md new file mode 100644 index 000000000000..ebbb59e5310f --- /dev/null +++ b/java-shared-config/CONTRIBUTING.md @@ -0,0 +1,28 @@ +# How to Contribute + +We'd love to accept your patches and contributions to this project. There are +just a few small guidelines you need to follow. + +## Contributor License Agreement + +Contributions to this project must be accompanied by a Contributor License +Agreement. You (or your employer) retain the copyright to your contribution; +this simply gives us permission to use and redistribute your contributions as +part of the project. Head over to to see +your current agreements on file or to sign a new one. + +You generally only need to submit a CLA once, so if you've already submitted one +(even if it was for a different project), you probably don't need to do it +again. + +## Code reviews + +All submissions, including submissions by project members, require review. We +use GitHub pull requests for this purpose. Consult +[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more +information on using pull requests. + +## Community Guidelines + +This project follows +[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/). \ No newline at end of file diff --git a/java-shared-config/LICENSE b/java-shared-config/LICENSE new file mode 100644 index 000000000000..d64569567334 --- /dev/null +++ b/java-shared-config/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/java-shared-config/codecov.yaml b/java-shared-config/codecov.yaml new file mode 100644 index 000000000000..5724ea9478d7 --- /dev/null +++ b/java-shared-config/codecov.yaml @@ -0,0 +1,4 @@ +--- +codecov: + ci: + - source.cloud.google.com diff --git a/java-shared-config/java.header b/java-shared-config/java.header new file mode 100644 index 000000000000..3a9b503aa24f --- /dev/null +++ b/java-shared-config/java.header @@ -0,0 +1,15 @@ +^/\*$ +^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)( All [rR]ights [rR]eserved\.)?$ +^ \*$ +^ \* 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$ +^ \*$ +^ \*[ ]+https?://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\.$ +^ \*/$ diff --git a/java-shared-config/license-checks.xml b/java-shared-config/license-checks.xml new file mode 100644 index 000000000000..6597fced808e --- /dev/null +++ b/java-shared-config/license-checks.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json new file mode 100644 index 000000000000..e3e4334dae4c --- /dev/null +++ b/java-shared-config/renovate.json @@ -0,0 +1,29 @@ +{ + "extends": [ + "config:base" + ], + "ignoreDeps": [ + "com.google.api:gax-bom", + "com.google.guava:guava", + "com.google.guava:guava-testlib", + "com.google.protobuf:protobuf-java", + "com.google.protobuf:protobuf-java-util", + "io.opencensus:opencensus-api", + "io.opencensus:opencensus-contrib-grpc-util", + "io.opencensus:opencensus-contrib-http-util" + ], + "packageRules": [ + { + "packagePatterns": ["^io.grpc:grpc-"], + "groupName": "gRPC packages" + }, + { + "packagePatterns": ["^com.google.protobuf:protobuf-"], + "groupName": "Protobuf packages" + }, + { + "packagePatterns": ["^io.opencensus:opencensus-"], + "groupName": "OpenCensus packages" + } + ] +} \ No newline at end of file diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata new file mode 100644 index 000000000000..9d17c24fc7fc --- /dev/null +++ b/java-shared-config/synth.metadata @@ -0,0 +1,12 @@ +{ + "updateTime": "2019-08-26T17:31:25.677217Z", + "sources": [ + { + "template": { + "name": "java_library", + "origin": "synthtool.gcp", + "version": "2019.5.2" + } + } + ] +} \ No newline at end of file diff --git a/java-shared-config/synth.py b/java-shared-config/synth.py new file mode 100644 index 000000000000..4229feca42e5 --- /dev/null +++ b/java-shared-config/synth.py @@ -0,0 +1,27 @@ +# 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. +# 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 parts of this library.""" + +import synthtool as s +import synthtool.gcp as gcp +import logging +logging.basicConfig(level=logging.DEBUG) +common_templates = gcp.CommonTemplates() +templates = common_templates.java_library() +s.copy(templates, excludes=[ + ".gitignore", + "README.md", +]) + From 99f261285017bb6d5d9df040f45bfe09073e6f16 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 26 Aug 2019 10:45:10 -0700 Subject: [PATCH 003/794] feat: add google-cloud-shared-config pom --- java-shared-config/pom.xml | 367 ++++++++++++++++++++++++++++++++ java-shared-config/versions.txt | 4 + 2 files changed, 371 insertions(+) create mode 100644 java-shared-config/pom.xml create mode 100644 java-shared-config/versions.txt diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml new file mode 100644 index 000000000000..9c83ccf941ff --- /dev/null +++ b/java-shared-config/pom.xml @@ -0,0 +1,367 @@ + + + 4.0.0 + com.google.cloud + google-cloud-shared-config + pom + 0.0.1-SNAPSHOT + Google Cloud + https://github.com/googleapis/java-shared-config + + Shared build configuration for Google Cloud Java libraries. + + + + chingor13 + Jeff Ching + chingor@google.com + Google + + Developer + + + + + Google LLC + + + scm:git:git@github.com:googleapis/google-cloud-java.git + scm:git:git@github.com:googleapis/google-cloud-java.git + https://github.com/googleapis/google-cloud-java + HEAD + + + + https://github.com/googleapis/google-cloud-java/issues + GitHub Issues + + + + + sonatype-nexus-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-staging + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + github-pages-site + Deployment through GitHub's site deployment plugin + site/google-cloud-clients + + + + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + + UTF-8 + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + ossrh + https://oss.sonatype.org/ + false + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M3 + + + + **/*SmokeTest.java + **/IT*.java + + sponge_log + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0-M2 + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + -1 + + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0-M3 + + 1200 + sponge_log + + **/IT*.java + **/*SmokeTest.java + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.1.0 + + + true + true + + true + true + + + ${project.artifactId} + ${project.groupId} + ${project.version} + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.7 + 1.7 + UTF-8 + -Xlint:unchecked + -Xlint:deprecation + true + + + + org.apache.maven.plugins + maven-site-plugin + 3.7.1 + + true + + + + org.jacoco + jacoco-maven-plugin + 0.8.4 + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce + + enforce + + + + + [3.0,) + + + [1.7,) + + + + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + + java + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + org.apache.maven.plugins + maven-site-plugin + + + org.jacoco + jacoco-maven-plugin + + + + prepare-agent + + + + report + test + + report + + + + + + + + + + release + + + + org.apache.maven.plugins + maven-source-plugin + 3.1.0 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + + attach-javadocs + + jar + + + none + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + + + + + + checkstyle-tests + + [1.8,) + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.0.0 + + + com.puppycrawl.tools + checkstyle + 8.22 + + + + + checkstyle + validate + + check + + + java.header + license-checks.xml + true + true + error + true + true + + + + + + + + + \ No newline at end of file diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt new file mode 100644 index 000000000000..b8841b5ef374 --- /dev/null +++ b/java-shared-config/versions.txt @@ -0,0 +1,4 @@ +# Format: +# module:released-version:current-version + +google-cloud-shared-config:0.0.0:0.0.1-SNAPSHOT \ No newline at end of file From 78fd2f6168c2f65adc1da549d85026b44077a913 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 26 Aug 2019 13:56:11 -0700 Subject: [PATCH 004/794] fix: old urls in pom.xml --- java-shared-config/pom.xml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9c83ccf941ff..29708d42cf4c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -25,14 +25,14 @@ Google LLC - scm:git:git@github.com:googleapis/google-cloud-java.git - scm:git:git@github.com:googleapis/google-cloud-java.git - https://github.com/googleapis/google-cloud-java + scm:git:git@github.com:googleapis/java-shared-config.git + scm:git:git@github.com:googleapis/java-shared-config.git + https://github.com/googleapis/java-shared-config HEAD - https://github.com/googleapis/google-cloud-java/issues + https://github.com/googleapis/java-shared-config/issues GitHub Issues @@ -45,11 +45,6 @@ sonatype-nexus-staging https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - github-pages-site - Deployment through GitHub's site deployment plugin - site/google-cloud-clients - From 8faa307cd7c9bdb09e7703255870d8f8f57470ad Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 26 Aug 2019 22:23:39 +0000 Subject: [PATCH 005/794] chore(deps): update dependency com.puppycrawl.tools:checkstyle to v8.23 --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 29708d42cf4c..d90f1d2d5dad 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -333,7 +333,7 @@ com.puppycrawl.tools checkstyle - 8.22 + 8.23 From f94c65654de1daf78eba9185d4bdac076395c404 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 27 Aug 2019 02:30:38 +0300 Subject: [PATCH 006/794] deps: update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.8.1 (#5) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d90f1d2d5dad..e6d25df2e98c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -138,7 +138,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.8.1 1.7 1.7 From 3ee923d594ca4c567d5a171ccb139a45dd8fb562 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 27 Aug 2019 02:32:57 +0300 Subject: [PATCH 007/794] deps: update dependency org.apache.maven.plugins:maven-jar-plugin to v3.1.2 (#6) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e6d25df2e98c..542ca72fb697 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -118,7 +118,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.1.0 + 3.1.2 true From 6cb99c2a58db0ef0e0e5c67718d15c246a199886 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 27 Aug 2019 02:33:23 +0300 Subject: [PATCH 008/794] deps: update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.1.0 (#4) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 542ca72fb697..95bf72282778 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -328,7 +328,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.0.0 + 3.1.0 com.puppycrawl.tools From a305f6241cead99c0b46d82fd62c0cd080333a40 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 27 Aug 2019 08:11:50 +0300 Subject: [PATCH 009/794] deps: update dependency org.apache.maven.plugins:maven-site-plugin to v3.8.2 (#8) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 95bf72282778..1f052b52fb68 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -151,7 +151,7 @@ org.apache.maven.plugins maven-site-plugin - 3.7.1 + 3.8.2 true From 81ed4b9c92f4a08781f6c01953de5455e79a0e56 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 26 Aug 2019 22:12:13 -0700 Subject: [PATCH 010/794] build: fix release-please config templates (#2) --- java-shared-config/.kokoro/continuous/propose_release.cfg | 2 +- java-shared-config/.kokoro/continuous/propose_release.sh | 0 java-shared-config/.kokoro/release/bump_snapshot.sh | 0 java-shared-config/synth.metadata | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 java-shared-config/.kokoro/continuous/propose_release.sh mode change 100644 => 100755 java-shared-config/.kokoro/release/bump_snapshot.sh diff --git a/java-shared-config/.kokoro/continuous/propose_release.cfg b/java-shared-config/.kokoro/continuous/propose_release.cfg index 87efce51dfa3..8f8965cb4564 100644 --- a/java-shared-config/.kokoro/continuous/propose_release.cfg +++ b/java-shared-config/.kokoro/continuous/propose_release.cfg @@ -21,7 +21,7 @@ env_vars: { env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-shared-config/.kokoro/release/bump_snapshot.sh" + value: "github/java-shared-config/.kokoro/continuous/propose_release.sh" } # tokens used by release-please to keep an up-to-date release PR. diff --git a/java-shared-config/.kokoro/continuous/propose_release.sh b/java-shared-config/.kokoro/continuous/propose_release.sh old mode 100644 new mode 100755 diff --git a/java-shared-config/.kokoro/release/bump_snapshot.sh b/java-shared-config/.kokoro/release/bump_snapshot.sh old mode 100644 new mode 100755 diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 9d17c24fc7fc..ac9ec4ef1c1e 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-08-26T17:31:25.677217Z", + "updateTime": "2019-08-26T21:57:24.064486Z", "sources": [ { "template": { From f7325bb8b94dbf2497425b41fb98caff7ff941b8 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 27 Aug 2019 08:14:45 -0700 Subject: [PATCH 011/794] chore: configure renovate semantic commit format (#7) * chore: configure renovate semantic commit format * chore: up PR hourly limit to 5 --- java-shared-config/renovate.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index e3e4334dae4c..da5d54a58f9a 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -25,5 +25,8 @@ "packagePatterns": ["^io.opencensus:opencensus-"], "groupName": "OpenCensus packages" } - ] + ], + "prHourlyLimit": 5, + "semanticCommits": true, + "semanticPrefix": "deps" } \ No newline at end of file From df692140f836af0f287b1d96a08774aad31d9d85 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 27 Aug 2019 10:05:17 -0700 Subject: [PATCH 012/794] fix: activate release profile via performRelease property (#9) --- java-shared-config/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 1f052b52fb68..584d51984b0e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -262,6 +262,11 @@ release + + + performRelease + + From 271d2f1d47f1cdc28b62ec784c2091d116249f3c Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 27 Aug 2019 10:31:09 -0700 Subject: [PATCH 013/794] fix: release-please should use generic java strategy (#11) --- java-shared-config/.kokoro/continuous/propose_release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/.kokoro/continuous/propose_release.sh b/java-shared-config/.kokoro/continuous/propose_release.sh index 999b2b29a9a7..7f810ec7e8ea 100755 --- a/java-shared-config/.kokoro/continuous/propose_release.sh +++ b/java-shared-config/.kokoro/continuous/propose_release.sh @@ -25,5 +25,5 @@ if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; th --package-name="google-cloud-shared-config" \ --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \ --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \ - --release-type=java-auth-yoshi + --release-type=java-yoshi fi From 6dd9452d783c258ec71e1243cc9cc64b16f75305 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 27 Aug 2019 12:17:10 -0700 Subject: [PATCH 014/794] fix: specify version for maven-dependency-plugin (#12) --- java-shared-config/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 584d51984b0e..fa20200a05f2 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -161,6 +161,11 @@ jacoco-maven-plugin 0.8.4 + + org.apache.maven.plugins + maven-dependency-plugin + 3.1.1 + From e29177a4e508b341ff6bb4ac6f1740efbfadd082 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 28 Aug 2019 06:40:56 -0700 Subject: [PATCH 015/794] chore: release v0.1.0 (#13) --- java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 983fd6979a33..d827ac94a1c2 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.0.1 + 0.1.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index fa20200a05f2..1cac0102d58d 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.0.1-SNAPSHOT + 0.1.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index b8841b5ef374..8ab0e84a88c8 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.0.0:0.0.1-SNAPSHOT \ No newline at end of file +google-cloud-shared-config:0.1.0:0.1.0 From de1d13df56a7a35f60aecf1adb4591c4e8c5262d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 5 Sep 2019 20:14:02 +0300 Subject: [PATCH 016/794] chore: update dependency com.puppycrawl.tools:checkstyle to v8.24 (#15) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 1cac0102d58d..bd8f93d1cef3 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -343,7 +343,7 @@ com.puppycrawl.tools checkstyle - 8.23 + 8.24 From 6dfae9a14adefb5990d6d688ceab4c218dfcb675 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 6 Sep 2019 14:51:39 -0700 Subject: [PATCH 017/794] chore: bump next snapshot (#17) --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index bd8f93d1cef3..cb49e02e6935 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.1.0 + 0.1.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 8ab0e84a88c8..d441922db12d 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.1.0:0.1.0 +google-cloud-shared-config:0.1.0:0.1.1-SNAPSHOT From 472383449b38813a3655b04f8f2ca98c7df9c590 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 6 Sep 2019 14:52:06 -0700 Subject: [PATCH 018/794] chore: regenerate build files from templates (#16) --- java-shared-config/.kokoro/release/snapshot.sh | 0 java-shared-config/renovate.json | 5 +---- java-shared-config/synth.metadata | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) mode change 100644 => 100755 java-shared-config/.kokoro/release/snapshot.sh diff --git a/java-shared-config/.kokoro/release/snapshot.sh b/java-shared-config/.kokoro/release/snapshot.sh old mode 100644 new mode 100755 diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index da5d54a58f9a..e3e4334dae4c 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -25,8 +25,5 @@ "packagePatterns": ["^io.opencensus:opencensus-"], "groupName": "OpenCensus packages" } - ], - "prHourlyLimit": 5, - "semanticCommits": true, - "semanticPrefix": "deps" + ] } \ No newline at end of file diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index ac9ec4ef1c1e..ccbc4c2215b7 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-08-26T21:57:24.064486Z", + "updateTime": "2019-09-06T08:03:49.601670Z", "sources": [ { "template": { From b65914427601f2c9b4a86fde57de6984976d105d Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 6 Sep 2019 15:05:28 -0700 Subject: [PATCH 019/794] fix: use upper bounds checks, not full convergence (#18) --- java-shared-config/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index cb49e02e6935..1474c357ee7e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -190,7 +190,6 @@ [1.7,) - From ed8cf1b3aafb9ad4e4c07fc3cc877747bf13b276 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 6 Sep 2019 15:15:21 -0700 Subject: [PATCH 020/794] chore: release v0.1.1 (#19) --- java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index d827ac94a1c2..bdbd3501a9cb 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.1.0 + 0.1.1 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 1474c357ee7e..a41124639896 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.1.1-SNAPSHOT + 0.1.1 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index d441922db12d..965fe22efceb 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.1.0:0.1.1-SNAPSHOT +google-cloud-shared-config:0.1.1:0.1.1 From 4be0adcd539d8180ed5622a842c33659cb153957 Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Mon, 16 Sep 2019 18:18:06 -0400 Subject: [PATCH 021/794] build: update maven config to include *.proto files in jars (#21) Add build-helper-maven-plugin to com.google.api.grpc:google-api-grpc thereby updating the config for all proto-* modules such that when their jars are built they will now include the *.proto. This allows dependents to already have the proto files on their classpath when they are defining/generating their own protos. --- java-shared-config/pom.xml | 41 +++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index a41124639896..dad9e685924b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -166,6 +166,11 @@ maven-dependency-plugin 3.1.1 + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + @@ -260,6 +265,40 @@ + + org.codehaus.mojo + build-helper-maven-plugin + + + add-main-proto-resources + generate-resources + + add-resource + + + + + src/main/proto + + + + + + add-test-proto-resources + generate-test-resources + + add-test-resource + + + + + src/test/proto + + + + + + @@ -368,4 +407,4 @@ - \ No newline at end of file + From 8afe79d45eb9e2f4572fc06c5619e52ed0724bc1 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 16 Sep 2019 15:25:21 -0700 Subject: [PATCH 022/794] build: kokoro integration test configuration (#20) --- .../.kokoro/presubmit/integration.cfg | 24 +++++++++++++++++++ java-shared-config/synth.metadata | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/java-shared-config/.kokoro/presubmit/integration.cfg b/java-shared-config/.kokoro/presubmit/integration.cfg index 3b017fc80f04..141f90c13c56 100644 --- a/java-shared-config/.kokoro/presubmit/integration.cfg +++ b/java-shared-config/.kokoro/presubmit/integration.cfg @@ -5,3 +5,27 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "JOB_TYPE" + value: "integration" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index ccbc4c2215b7..e687099c54b4 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-09-06T08:03:49.601670Z", + "updateTime": "2019-09-10T08:05:28.549823Z", "sources": [ { "template": { From 8d11ff346797f434a7057fbcb456b580309c0798 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 17 Sep 2019 16:10:11 -0700 Subject: [PATCH 023/794] build: enable release-please bot (#22) --- .../.github/.release-please.yml | 1 + java-shared-config/renovate.json | 26 ++++++++++--------- java-shared-config/synth.metadata | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 java-shared-config/.github/.release-please.yml diff --git a/java-shared-config/.github/.release-please.yml b/java-shared-config/.github/.release-please.yml new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/java-shared-config/.github/.release-please.yml @@ -0,0 +1 @@ + diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index e3e4334dae4c..dae8a245c892 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -2,17 +2,18 @@ "extends": [ "config:base" ], - "ignoreDeps": [ - "com.google.api:gax-bom", - "com.google.guava:guava", - "com.google.guava:guava-testlib", - "com.google.protobuf:protobuf-java", - "com.google.protobuf:protobuf-java-util", - "io.opencensus:opencensus-api", - "io.opencensus:opencensus-contrib-grpc-util", - "io.opencensus:opencensus-contrib-http-util" - ], + "ignoreDeps": [], "packageRules": [ + { + "packagePatterns": ["*"], + "semanticCommitType": "chore" + }, + { + "depTypeList": [ + "dependencies" + ], + "semanticCommitType": "deps" + }, { "packagePatterns": ["^io.grpc:grpc-"], "groupName": "gRPC packages" @@ -25,5 +26,6 @@ "packagePatterns": ["^io.opencensus:opencensus-"], "groupName": "OpenCensus packages" } - ] -} \ No newline at end of file + ], + "semanticCommits": true +} diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index e687099c54b4..3ae6f48ddb34 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-09-10T08:05:28.549823Z", + "updateTime": "2019-09-17T08:01:47.001410Z", "sources": [ { "template": { From 0e81cb8606400940397ec2c01d89463c176d9a87 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 18 Sep 2019 13:47:56 -0700 Subject: [PATCH 024/794] chore: release v0.1.2 (#23) --- java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index bdbd3501a9cb..0155337e3037 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.1.1 + 0.1.2 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index dad9e685924b..eddf43137fe4 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.1.1 + 0.1.2 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 965fe22efceb..8827ee69d6cb 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.1.1:0.1.1 +google-cloud-shared-config:0.1.2:0.1.2 From dcdc19f418d2ee6abe6b5f4b01077a4a7cf72308 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 18 Sep 2019 14:14:20 -0700 Subject: [PATCH 025/794] build: specify releaseType for release-please --- java-shared-config/.github/.release-please.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/.github/.release-please.yml b/java-shared-config/.github/.release-please.yml index 8b137891791f..827446828034 100644 --- a/java-shared-config/.github/.release-please.yml +++ b/java-shared-config/.github/.release-please.yml @@ -1 +1 @@ - +releaseType: java-yoshi From 0f7714c4598c6632b7a6c16f9a13948b870685d3 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 18 Sep 2019 14:28:09 -0700 Subject: [PATCH 026/794] chore: bump next snapshot (#24) --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index eddf43137fe4..b8e86d1ad66a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.1.2 + 0.1.3-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 8827ee69d6cb..b5d1c39e767f 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.1.2:0.1.2 +google-cloud-shared-config:0.1.2:0.1.3-SNAPSHOT From 0a2f91f89f3210ea66eae191ca932fdce7501606 Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Fri, 20 Sep 2019 13:36:31 -0400 Subject: [PATCH 027/794] fix: add autovalue profiles (#26) There are versions of `com.google.auto.value:auto-value` needed when running on java7 vs java8+, to address this we define profiles that have jdk based activation criteria. --- java-shared-config/pom.xml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b8e86d1ad66a..750f8b2c994f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -406,5 +406,43 @@ + + autovalue-java7 + + 1.7 + + + 1.4 + + + + + com.google.auto.value + auto-value + ${autovalue.version} + provided + + + + + + autovalue-java8 + + [1.8,) + + + 1.6.6 + + + + + com.google.auto.value + auto-value + ${autovalue.version} + provided + + + + From 57a05b6fa7a9d7ec975024c075faa98a1b9b9ac8 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 20 Sep 2019 12:09:20 -0700 Subject: [PATCH 028/794] build: fix release-please config location (#27) --- .../.github/{.release-please.yml => release-please.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename java-shared-config/.github/{.release-please.yml => release-please.yml} (100%) diff --git a/java-shared-config/.github/.release-please.yml b/java-shared-config/.github/release-please.yml similarity index 100% rename from java-shared-config/.github/.release-please.yml rename to java-shared-config/.github/release-please.yml From e46dcb4a9a6de97707d1f97b2373d42a9a28fa37 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2019 12:34:10 -0700 Subject: [PATCH 029/794] chore: release 0.1.3 (#28) * created CHANGELOG.md [ci skip] * updated README.md [ci skip] * updated versions.txt [ci skip] * updated pom.xml [ci skip] --- java-shared-config/CHANGELOG.md | 8 ++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 java-shared-config/CHANGELOG.md diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md new file mode 100644 index 000000000000..b71416626173 --- /dev/null +++ b/java-shared-config/CHANGELOG.md @@ -0,0 +1,8 @@ +# Changelog + +### [0.1.3](https://www.github.com/googleapis/java-shared-config/compare/v0.1.2...v0.1.3) (2019-09-20) + + +### Bug Fixes + +* add autovalue profiles ([#26](https://www.github.com/googleapis/java-shared-config/issues/26)) ([895bd68](https://www.github.com/googleapis/java-shared-config/commit/895bd68)) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 0155337e3037..e54ea3f7cf14 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.1.2 + 0.1.3 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 750f8b2c994f..eb614436acc9 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.1.3-SNAPSHOT + 0.1.3 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index b5d1c39e767f..5332f64fc864 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.1.2:0.1.3-SNAPSHOT +google-cloud-shared-config:0.1.3:0.1.3 From 3f94eb9ff133f8bd9e0d7349cbb2e7a56058422f Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 23 Sep 2019 15:24:57 -0700 Subject: [PATCH 030/794] chore: ignore the release-please config customizations --- java-shared-config/synth.py | 1 + 1 file changed, 1 insertion(+) diff --git a/java-shared-config/synth.py b/java-shared-config/synth.py index 4229feca42e5..2ac35459ecc1 100644 --- a/java-shared-config/synth.py +++ b/java-shared-config/synth.py @@ -23,5 +23,6 @@ s.copy(templates, excludes=[ ".gitignore", "README.md", + ".github/release-please.yml", ]) From 3db84eb4f22896eb67dd87f159b71e63949c206b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2019 15:29:08 -0700 Subject: [PATCH 031/794] chore: release 0.1.4-SNAPSHOT (#30) * updated versions.txt [ci skip] * updated pom.xml [ci skip] --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index eb614436acc9..3993d188bc06 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.1.3 + 0.1.4-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 5332f64fc864..db7a9ac70872 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.1.3:0.1.3 +google-cloud-shared-config:0.1.3:0.1.4-SNAPSHOT From 9ba9b14f693ed3cccbbe8cb01b95f1aa1351bb0d Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 1 Oct 2019 13:24:15 -0700 Subject: [PATCH 032/794] chore: update renovate config (#32) --- java-shared-config/renovate.json | 14 +++++--------- java-shared-config/synth.metadata | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index dae8a245c892..ff6ecf0afaa5 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -5,14 +5,9 @@ "ignoreDeps": [], "packageRules": [ { - "packagePatterns": ["*"], - "semanticCommitType": "chore" - }, - { - "depTypeList": [ - "dependencies" - ], - "semanticCommitType": "deps" + "managers": ["maven"], + "packageNames": ["com.google.guava:guava"], + "versionScheme": "docker" }, { "packagePatterns": ["^io.grpc:grpc-"], @@ -27,5 +22,6 @@ "groupName": "OpenCensus packages" } ], - "semanticCommits": true + "semanticCommits": true, + "semanticCommitType": "deps" } diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 3ae6f48ddb34..e98f4a1d0409 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-09-17T08:01:47.001410Z", + "updateTime": "2019-10-01T07:59:49.613828Z", "sources": [ { "template": { From a36005abad63ea6de5c7cbfe0106dfbadf9d68dc Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 7 Oct 2019 10:58:14 -0700 Subject: [PATCH 033/794] feat: enable clirr-maven-plugin (#34) --- java-shared-config/pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 3993d188bc06..a4a82e3d9dd9 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -171,6 +171,11 @@ build-helper-maven-plugin 3.0.0 + + org.codehaus.mojo + clirr-maven-plugin + 2.8 + @@ -299,6 +304,21 @@ + + org.codehaus.mojo + clirr-maven-plugin + + clirr-ignored-differences.xml + true + + + + + check + + + + From 074c51e1edc762cf6efcbebc187e89485c917f5f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2019 11:17:51 -0700 Subject: [PATCH 034/794] chore: release 0.2.0 (#35) * updated CHANGELOG.md [ci skip] * updated README.md [ci skip] * updated versions.txt [ci skip] * updated pom.xml [ci skip] --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index b71416626173..d32e6985a41c 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.2.0](https://www.github.com/googleapis/java-shared-config/compare/v0.1.4...v0.2.0) (2019-10-07) + + +### Features + +* enable clirr-maven-plugin ([#34](https://www.github.com/googleapis/java-shared-config/issues/34)) ([48cb08e](https://www.github.com/googleapis/java-shared-config/commit/48cb08e)) + ### [0.1.3](https://www.github.com/googleapis/java-shared-config/compare/v0.1.2...v0.1.3) (2019-09-20) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index e54ea3f7cf14..d18d886de98a 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.1.3 + 0.2.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index a4a82e3d9dd9..1f0f2bff8590 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.1.4-SNAPSHOT + 0.2.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index db7a9ac70872..76e298cbf280 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.1.3:0.1.4-SNAPSHOT +google-cloud-shared-config:0.2.0:0.2.0 From 736da77b9eb9bada03a2a9d8fb8b6173e9074b1a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2019 12:44:58 -0700 Subject: [PATCH 035/794] chore: release 0.2.1-SNAPSHOT (#36) * updated versions.txt [ci skip] * updated pom.xml [ci skip] --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 1f0f2bff8590..20b648be51e4 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.2.0 + 0.2.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 76e298cbf280..46697dff1b72 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.2.0:0.2.0 +google-cloud-shared-config:0.2.0:0.2.1-SNAPSHOT From 34be2c3c0727ca80488f70e021b82fc990c7db66 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 7 Oct 2019 17:35:33 -0700 Subject: [PATCH 036/794] fix: specify surefire-junit4 build dependency for offline tests (#37) --- java-shared-config/pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 20b648be51e4..96ca1270eaea 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -84,6 +84,13 @@ sponge_log + + + org.apache.maven.surefire + surefire-junit4 + 3.0.0-M3 + + org.apache.maven.plugins @@ -114,6 +121,13 @@ **/*SmokeTest.java + + + org.apache.maven.surefire + surefire-junit4 + 3.0.0-M3 + + org.apache.maven.plugins From cc5bf9ba6d3a027b15da5b4e69eeb502dae70264 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2019 19:45:33 -0700 Subject: [PATCH 037/794] chore: release 0.2.1 (#39) * updated CHANGELOG.md [ci skip] * updated README.md [ci skip] * updated versions.txt [ci skip] * updated pom.xml [ci skip] --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index d32e6985a41c..b3adc1314b57 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.2.1](https://www.github.com/googleapis/java-shared-config/compare/v0.2.0...v0.2.1) (2019-10-08) + + +### Bug Fixes + +* specify surefire-junit4 build dependency for offline tests ([#37](https://www.github.com/googleapis/java-shared-config/issues/37)) ([f93f18e](https://www.github.com/googleapis/java-shared-config/commit/f93f18e)) + ## [0.2.0](https://www.github.com/googleapis/java-shared-config/compare/v0.1.4...v0.2.0) (2019-10-07) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index d18d886de98a..6c1d41a07aa6 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.2.0 + 0.2.1 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 96ca1270eaea..25988d757d00 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.2.1-SNAPSHOT + 0.2.1 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 46697dff1b72..c4fb9125cf11 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.2.0:0.2.1-SNAPSHOT +google-cloud-shared-config:0.2.1:0.2.1 From fdd18a856f3f94bb5c5cd9e0bbd35e00662ffb2c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2019 10:33:41 -0700 Subject: [PATCH 038/794] chore: release 0.2.2-SNAPSHOT (#41) * updated versions.txt [ci skip] * updated pom.xml [ci skip] --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 25988d757d00..f12a2e4a619a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.2.1 + 0.2.2-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index c4fb9125cf11..77f9c85d521c 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.2.1:0.2.1 +google-cloud-shared-config:0.2.1:0.2.2-SNAPSHOT From 275470049940d1283c6845073419addf9e77aa41 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 8 Oct 2019 10:34:11 -0700 Subject: [PATCH 039/794] chore: fix renovate guava config (#40) --- java-shared-config/renovate.json | 2 +- java-shared-config/synth.metadata | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index ff6ecf0afaa5..99810470034c 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -6,7 +6,7 @@ "packageRules": [ { "managers": ["maven"], - "packageNames": ["com.google.guava:guava"], + "packageNames": ["com.google.guava:guava*"], "versionScheme": "docker" }, { diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index e98f4a1d0409..9b92d5588351 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-10-01T07:59:49.613828Z", + "updateTime": "2019-10-08T08:10:35.713359Z", "sources": [ { "template": { From d36fb2250b2a17b2dfba26f8339be51e1f4bd10e Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 8 Oct 2019 10:34:39 -0700 Subject: [PATCH 040/794] feat: add profile which allows the use of snapshots (#38) --- java-shared-config/pom.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index f12a2e4a619a..c36eb957418e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -398,7 +398,21 @@ - + + allow-snapshots + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + false + + + true + + + + checkstyle-tests From 604778895a0257a12910583f692ca6072bc262e9 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 8 Oct 2019 10:34:55 -0700 Subject: [PATCH 041/794] fix: bump release staging timeout to 15 minutes (#42) --- java-shared-config/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index c36eb957418e..71cb5054ec27 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -70,6 +70,7 @@ ossrh https://oss.sonatype.org/ false + 15 From cfa130cffc083f62f2e82a7e51f54c93a78b0884 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 9 Oct 2019 13:15:26 -0700 Subject: [PATCH 042/794] chore: fix issue template (#45) --- java-shared-config/.github/ISSUE_TEMPLATE/bug_report.md | 4 ++-- java-shared-config/synth.metadata | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.github/ISSUE_TEMPLATE/bug_report.md b/java-shared-config/.github/ISSUE_TEMPLATE/bug_report.md index f30747644131..13c74e459d6a 100644 --- a/java-shared-config/.github/ISSUE_TEMPLATE/bug_report.md +++ b/java-shared-config/.github/ISSUE_TEMPLATE/bug_report.md @@ -10,7 +10,7 @@ Thanks for stopping by to let us know something could be better! Please run down the following list and make sure you've tried the usual "quick fixes": - - Search the issues already opened: https://github.com/googleapis/google-cloud-shared-config/issues + - Search the issues already opened: https://github.com/googleapis/java-shared-config/issues - Check for answers on StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform If you are still having issues, please include as much information as possible: @@ -48,4 +48,4 @@ Any relevant stacktrace here. Following these steps guarantees the quickest resolution possible. -Thanks! \ No newline at end of file +Thanks! diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 9b92d5588351..aff8d1f3907b 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-10-08T08:10:35.713359Z", + "updateTime": "2019-10-09T08:01:53.187863Z", "sources": [ { "template": { From ad8d56cc11ab1567d44110a495144929a5b1e790 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 16 Oct 2019 13:34:14 -0700 Subject: [PATCH 043/794] build: snapshot release ensures only releases snapshots (#47) --- java-shared-config/.kokoro/release/snapshot.sh | 5 ++++- java-shared-config/synth.metadata | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.kokoro/release/snapshot.sh b/java-shared-config/.kokoro/release/snapshot.sh index bf738c56dd8d..098168a7373c 100755 --- a/java-shared-config/.kokoro/release/snapshot.sh +++ b/java-shared-config/.kokoro/release/snapshot.sh @@ -19,6 +19,9 @@ source $(dirname "$0")/common.sh MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml pushd $(dirname "$0")/../../ +# ensure we're trying to push a snapshot (no-result returns non-zero exit code) +grep SNAPSHOT versions.txt + setup_environment_secrets create_settings_xml_file "settings.xml" @@ -27,4 +30,4 @@ mvn clean install deploy -B \ -DperformRelease=true \ -Dgpg.executable=gpg \ -Dgpg.passphrase=${GPG_PASSPHRASE} \ - -Dgpg.homedir=${GPG_HOMEDIR} \ No newline at end of file + -Dgpg.homedir=${GPG_HOMEDIR} diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index aff8d1f3907b..12ab76b25b72 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-10-09T08:01:53.187863Z", + "updateTime": "2019-10-15T08:05:38.159260Z", "sources": [ { "template": { From 523a72ff7abf512c745ee3b414ceae139a47099d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 16 Oct 2019 23:58:26 +0300 Subject: [PATCH 044/794] deps: update dependency org.jacoco:jacoco-maven-plugin to v0.8.5 (#46) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 71cb5054ec27..05db4590e29f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -174,7 +174,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.5 org.apache.maven.plugins From 4125f51c028def37637d8e463f56b72128ec7b36 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 17 Oct 2019 15:57:14 -0700 Subject: [PATCH 045/794] chore: update common templates (#50) --- java-shared-config/.kokoro/build.sh | 2 ++ java-shared-config/.kokoro/coerce_logs.sh | 36 +++++++++++++++++++ .../.kokoro/continuous/common.cfg | 1 + java-shared-config/.kokoro/nightly/common.cfg | 1 + .../.kokoro/presubmit/common.cfg | 1 + java-shared-config/.kokoro/release/stage.sh | 1 + java-shared-config/synth.metadata | 2 +- 7 files changed, 43 insertions(+), 1 deletion(-) create mode 100755 java-shared-config/.kokoro/coerce_logs.sh diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index 2ffb5ef7f070..bcd1e410c5a6 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -39,6 +39,7 @@ case ${JOB_TYPE} in test) mvn test -B bash ${KOKORO_GFILE_DIR}/codecov.sh + bash .kokoro/coerce_logs.sh ;; lint) mvn com.coveo:fmt-maven-plugin:check @@ -48,6 +49,7 @@ javadoc) ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -fae verify + bash .kokoro/coerce_logs.sh ;; *) ;; diff --git a/java-shared-config/.kokoro/coerce_logs.sh b/java-shared-config/.kokoro/coerce_logs.sh new file mode 100755 index 000000000000..429767ab6429 --- /dev/null +++ b/java-shared-config/.kokoro/coerce_logs.sh @@ -0,0 +1,36 @@ +#!/bin/bash +# 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. +# 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 finds and moves sponge logs so that they can be found by placer +# and are not flagged as flaky by sponge. + +set -eo pipefail + +## Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +echo "coercing sponge logs..." +for xml in `find . -name *-sponge_log.xml` +do + echo "processing ${xml}" + class=$(basename ${xml} | cut -d- -f2) + dir=$(dirname ${xml})/${class} + text=$(dirname ${xml})/${class}-sponge_log.txt + mkdir -p ${dir} + mv ${xml} ${dir}/sponge_log.xml + mv ${text} ${dir}/sponge_log.txt +done diff --git a/java-shared-config/.kokoro/continuous/common.cfg b/java-shared-config/.kokoro/continuous/common.cfg index 57593e238c56..3b7dd4b87832 100644 --- a/java-shared-config/.kokoro/continuous/common.cfg +++ b/java-shared-config/.kokoro/continuous/common.cfg @@ -4,6 +4,7 @@ action { define_artifacts { regex: "**/*sponge_log.xml" + regex: "**/*sponge_log.txt" } } diff --git a/java-shared-config/.kokoro/nightly/common.cfg b/java-shared-config/.kokoro/nightly/common.cfg index 57593e238c56..3b7dd4b87832 100644 --- a/java-shared-config/.kokoro/nightly/common.cfg +++ b/java-shared-config/.kokoro/nightly/common.cfg @@ -4,6 +4,7 @@ action { define_artifacts { regex: "**/*sponge_log.xml" + regex: "**/*sponge_log.txt" } } diff --git a/java-shared-config/.kokoro/presubmit/common.cfg b/java-shared-config/.kokoro/presubmit/common.cfg index e1efc9940807..2c137534ca56 100644 --- a/java-shared-config/.kokoro/presubmit/common.cfg +++ b/java-shared-config/.kokoro/presubmit/common.cfg @@ -4,6 +4,7 @@ action { define_artifacts { regex: "**/*sponge_log.xml" + regex: "**/*sponge_log.txt" } } diff --git a/java-shared-config/.kokoro/release/stage.sh b/java-shared-config/.kokoro/release/stage.sh index b1b1b01c6623..3c482cbc55f1 100755 --- a/java-shared-config/.kokoro/release/stage.sh +++ b/java-shared-config/.kokoro/release/stage.sh @@ -28,6 +28,7 @@ create_settings_xml_file "settings.xml" mvn clean install deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ + -DskipTests=true \ -DperformRelease=true \ -Dgpg.executable=gpg \ -Dgpg.passphrase=${GPG_PASSPHRASE} \ diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 12ab76b25b72..86c498283a23 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-10-15T08:05:38.159260Z", + "updateTime": "2019-10-17T18:16:12.421175Z", "sources": [ { "template": { From 737fa0f7a55798db35060539f47112ed61cf6335 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 18 Oct 2019 07:58:07 -0700 Subject: [PATCH 046/794] chore: update common templates (#51) --- java-shared-config/.kokoro/coerce_logs.sh | 4 +++- java-shared-config/synth.metadata | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.kokoro/coerce_logs.sh b/java-shared-config/.kokoro/coerce_logs.sh index 429767ab6429..5cf7ba49e6bb 100755 --- a/java-shared-config/.kokoro/coerce_logs.sh +++ b/java-shared-config/.kokoro/coerce_logs.sh @@ -23,12 +23,14 @@ scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) ## cd to the parent directory, i.e. the root of the git repo cd ${scriptDir}/.. +job=$(basename ${KOKORO_JOB_NAME}) + echo "coercing sponge logs..." for xml in `find . -name *-sponge_log.xml` do echo "processing ${xml}" class=$(basename ${xml} | cut -d- -f2) - dir=$(dirname ${xml})/${class} + dir=$(dirname ${xml})/${job}/${class} text=$(dirname ${xml})/${class}-sponge_log.txt mkdir -p ${dir} mv ${xml} ${dir}/sponge_log.xml diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 86c498283a23..f17bd37c2c19 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,11 +1,11 @@ { - "updateTime": "2019-10-17T18:16:12.421175Z", + "updateTime": "2019-10-18T07:55:47.191057Z", "sources": [ { "template": { "name": "java_library", "origin": "synthtool.gcp", - "version": "2019.5.2" + "version": "2019.10.17" } } ] From ac07196d86d9602d35444611926efa5dceb9b16f Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 21 Oct 2019 15:10:38 -0700 Subject: [PATCH 047/794] build: move clirr to separate check (#52) --- java-shared-config/.kokoro/build.sh | 8 ++++++-- java-shared-config/.kokoro/presubmit/clirr.cfg | 13 +++++++++++++ java-shared-config/synth.metadata | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 java-shared-config/.kokoro/presubmit/clirr.cfg diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index bcd1e410c5a6..fa132f410dcc 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -26,6 +26,7 @@ echo ${JOB_TYPE} mvn install -B -V \ -DskipTests=true \ + -Dclirr.skip=true \ -Dmaven.javadoc.skip=true \ -Dgcloud.download.skip=true \ -T 1C @@ -37,7 +38,7 @@ fi case ${JOB_TYPE} in test) - mvn test -B + mvn test -B -Dclirr.skip=true bash ${KOKORO_GFILE_DIR}/codecov.sh bash .kokoro/coerce_logs.sh ;; @@ -48,9 +49,12 @@ javadoc) mvn javadoc:javadoc javadoc:test-javadoc ;; integration) - mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -fae verify + mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -Dclirr.skip=true -fae verify bash .kokoro/coerce_logs.sh ;; +clirr) + mvn -B clirr:check + ;; *) ;; esac \ No newline at end of file diff --git a/java-shared-config/.kokoro/presubmit/clirr.cfg b/java-shared-config/.kokoro/presubmit/clirr.cfg new file mode 100644 index 000000000000..ec572442e2e7 --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/clirr.cfg @@ -0,0 +1,13 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. + +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "clirr" +} \ No newline at end of file diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index f17bd37c2c19..138e4037ccfe 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-10-18T07:55:47.191057Z", + "updateTime": "2019-10-19T07:59:33.757326Z", "sources": [ { "template": { From b2f4a6b32a62a61b14c1f1c2846132a3773a78e9 Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Tue, 22 Oct 2019 15:40:44 -0400 Subject: [PATCH 048/794] build: add reporting section for site definition (#53) Add reporting plugin configuration for javadoc, JXR and info reports. Javadoc: Configuration values for javadoc generation including groups and links * javadoc - per module javadoc generation * aggregate - aggregate all modules in a multi-module project into a single site * aggregate-jar - same as aggregate but jar all the generated files JXR: Site report that includes all source code in the package (including any generated code) * jxr report - per module * aggregate report - aggregates for multi-module projects --- java-shared-config/pom.xml | 94 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 05db4590e29f..ffe8bcbbe13b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -56,6 +56,9 @@ UTF-8 + + ${project.artifactId} + false @@ -337,6 +340,97 @@ + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.0.0 + + + + index + dependency-info + team + ci-management + issue-management + licenses + scm + dependency-management + distribution-management + summary + modules + + + + + true + ${site.installationModule} + jar + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + + html + + javadoc + aggregate + aggregate-jar + + + + + none + protected + true + ${project.build.directory}/javadoc + + + Test helpers packages + com.google.cloud.testing + + + SPI packages + com.google.cloud.spi* + + + + + https://googleapis.dev/java/api-common/ + https://googleapis.dev/java/gax/ + https://googleapis.dev/java/google-auth-library/ + + https://developers.google.com/protocol-buffers/docs/reference/java/ + https://googleapis.github.io/common-protos-java/apidocs/ + https://grpc.io/grpc-java/javadoc/ + + + + + org.apache.maven.plugins + maven-jxr-plugin + 3.0.0 + + true + + + + aggregate + ${report.jxr.inherited} + + jxr + aggregate + + + + + + + release From ad073a5dcb39a83ce69591b6be1a79fceda42a39 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 29 Oct 2019 22:14:23 -0700 Subject: [PATCH 049/794] chore: clean up release config (#57) --- java-shared-config/.kokoro/release/drop.cfg | 3 --- java-shared-config/.kokoro/release/promote.cfg | 4 ---- java-shared-config/synth.metadata | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/java-shared-config/.kokoro/release/drop.cfg b/java-shared-config/.kokoro/release/drop.cfg index 2b45be610dfb..431f83037dcd 100644 --- a/java-shared-config/.kokoro/release/drop.cfg +++ b/java-shared-config/.kokoro/release/drop.cfg @@ -4,6 +4,3 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-shared-config/.kokoro/release/drop.sh" } - -# Download staging properties file. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-shared-config" \ No newline at end of file diff --git a/java-shared-config/.kokoro/release/promote.cfg b/java-shared-config/.kokoro/release/promote.cfg index 6cdbd53c065e..7ff7c44d5bd9 100644 --- a/java-shared-config/.kokoro/release/promote.cfg +++ b/java-shared-config/.kokoro/release/promote.cfg @@ -4,7 +4,3 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-shared-config/.kokoro/release/promote.sh" } - -# Download staging properties file. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-shared-config" - diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 138e4037ccfe..c2e6aeb4cc37 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-10-19T07:59:33.757326Z", + "updateTime": "2019-10-26T08:01:55.495543Z", "sources": [ { "template": { From 8e6dac846279b8d6bcc2b48ff59dfe1844e430fc Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Wed, 30 Oct 2019 01:19:55 -0400 Subject: [PATCH 050/794] fix: only look at src/main and src/test for checkstyle (#56) * feat: only look at src/main and src/test for checkstyle * feat: only look at src/main and src/test for checkstyle --- java-shared-config/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ffe8bcbbe13b..4f494ca53a18 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -542,6 +542,13 @@ error true true + + + src/main + + + src/test + From 92a32b45aba7289f82a232dc9b9baf559204c325 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 14 Nov 2019 16:58:32 +0100 Subject: [PATCH 051/794] deps: update dependency org.apache.maven.plugins:maven-source-plugin to v3.2.0 (#60) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 4f494ca53a18..676a2494341d 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -444,7 +444,7 @@ org.apache.maven.plugins maven-source-plugin - 3.1.0 + 3.2.0 attach-sources From e6f1c7737c46b2c3d07f15ce1e464217031503cf Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 14 Nov 2019 16:58:54 +0100 Subject: [PATCH 052/794] deps: update dependency org.apache.maven.plugins:maven-jar-plugin to v3.2.0 (#59) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 676a2494341d..03b14ef87423 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.1.2 + 3.2.0 true From ec51bac5f4548dd7b0bdd601442b28731a94deb8 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 14 Nov 2019 12:07:22 -0600 Subject: [PATCH 053/794] fix: remove autovalue profiles (#62) autovalue should be configured via annotation processors rather than as a dependency. Additionally, it should be only configured for relevant projects. --- java-shared-config/pom.xml | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 03b14ef87423..209194b9b41b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -556,43 +556,5 @@ - - autovalue-java7 - - 1.7 - - - 1.4 - - - - - com.google.auto.value - auto-value - ${autovalue.version} - provided - - - - - - autovalue-java8 - - [1.8,) - - - 1.6.6 - - - - - com.google.auto.value - auto-value - ${autovalue.version} - provided - - - - From 954acfa0967e9dba9bb78dc09386ad140f6e438d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2019 10:17:36 -0800 Subject: [PATCH 054/794] chore: release 0.3.0 (#49) * updated CHANGELOG.md [ci skip] * updated README.md [ci skip] * updated versions.txt [ci skip] * updated pom.xml [ci skip] --- java-shared-config/CHANGELOG.md | 21 +++++++++++++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index b3adc1314b57..56f8362b8e8b 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +## [0.3.0](https://www.github.com/googleapis/java-shared-config/compare/v0.2.1...v0.3.0) (2019-11-14) + + +### Features + +* add profile which allows the use of snapshots ([#38](https://www.github.com/googleapis/java-shared-config/issues/38)) ([678d898](https://www.github.com/googleapis/java-shared-config/commit/678d8984fb6663191a2ec1691db723ccf60b0c23)) + + +### Bug Fixes + +* bump release staging timeout to 15 minutes ([#42](https://www.github.com/googleapis/java-shared-config/issues/42)) ([3261d94](https://www.github.com/googleapis/java-shared-config/commit/3261d948b6ea941bc81d8c5347d8a37332e5159e)) +* only look at src/main and src/test for checkstyle ([#56](https://www.github.com/googleapis/java-shared-config/issues/56)) ([00bbe4c](https://www.github.com/googleapis/java-shared-config/commit/00bbe4cb3ce0c760a7a7a40d7cd10449b2268c43)) +* remove autovalue profiles ([#62](https://www.github.com/googleapis/java-shared-config/issues/62)) ([07258db](https://www.github.com/googleapis/java-shared-config/commit/07258dbbc12baa549ac7a3314c7efd3f77703558)) + + +### Dependencies + +* update dependency org.apache.maven.plugins:maven-jar-plugin to v3.2.0 ([#59](https://www.github.com/googleapis/java-shared-config/issues/59)) ([ab2f4ba](https://www.github.com/googleapis/java-shared-config/commit/ab2f4ba6b4522e34a277017f9e5bc56bcedab823)) +* update dependency org.apache.maven.plugins:maven-source-plugin to v3.2.0 ([#60](https://www.github.com/googleapis/java-shared-config/issues/60)) ([8621c23](https://www.github.com/googleapis/java-shared-config/commit/8621c23260e3751dfc14510d2035fa55685d2d10)) +* update dependency org.jacoco:jacoco-maven-plugin to v0.8.5 ([#46](https://www.github.com/googleapis/java-shared-config/issues/46)) ([f2fcc2f](https://www.github.com/googleapis/java-shared-config/commit/f2fcc2f4ba259cda43daeb62b23c943c4c87ac7c)) + ### [0.2.1](https://www.github.com/googleapis/java-shared-config/compare/v0.2.0...v0.2.1) (2019-10-08) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 6c1d41a07aa6..5366fa62d906 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.2.1 + 0.3.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 209194b9b41b..38f1f462b6b3 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.2.2-SNAPSHOT + 0.3.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 77f9c85d521c..585f0f4384cc 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.2.1:0.2.2-SNAPSHOT +google-cloud-shared-config:0.3.0:0.3.0 From e65cddf85e845983e42b36614df3fb0d185b6219 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2019 14:35:16 -0800 Subject: [PATCH 055/794] chore: release 0.3.1-SNAPSHOT (#63) * updated versions.txt [ci skip] * updated pom.xml [ci skip] --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 38f1f462b6b3..60b4e995d306 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.3.0 + 0.3.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 585f0f4384cc..d01639aa55eb 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.3.0:0.3.0 +google-cloud-shared-config:0.3.0:0.3.1-SNAPSHOT From 6c9d95d7d10ea35de29431546d46e52be2ca833f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 18 Nov 2019 19:08:29 +0100 Subject: [PATCH 056/794] deps: update dependency org.apache.maven.plugins:maven-failsafe-plugin to v3.0.0-m4 (#64) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 60b4e995d306..70bd8ae2cf81 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -116,7 +116,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M3 + 3.0.0-M4 1200 sponge_log From bee24eac13785e7f17c9a51eba4615a4fed08ba0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 18 Nov 2019 19:08:43 +0100 Subject: [PATCH 057/794] deps: update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-m4 (#65) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 70bd8ae2cf81..81e8635ed931 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -79,7 +79,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M3 + 3.0.0-M4 From 0b79c60d15fd029652187c2dbbdce31930be0d24 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 18 Nov 2019 19:08:56 +0100 Subject: [PATCH 058/794] deps: update dependency org.apache.maven.surefire:surefire-junit4 to v3.0.0-m4 (#66) --- java-shared-config/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 81e8635ed931..33bd9cb4bc18 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -92,7 +92,7 @@ org.apache.maven.surefire surefire-junit4 - 3.0.0-M3 + 3.0.0-M4 @@ -129,7 +129,7 @@ org.apache.maven.surefire surefire-junit4 - 3.0.0-M3 + 3.0.0-M4 From 8b2f0c765d5deaf2d2d8dc1b56d4fc634f1083e9 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 19 Nov 2019 12:32:10 -0800 Subject: [PATCH 059/794] chore: update common templates (#69) --- java-shared-config/.kokoro/build.sh | 14 ++++++++++---- java-shared-config/.kokoro/dependencies.sh | 6 +++++- java-shared-config/synth.metadata | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index fa132f410dcc..dc2936ef76a8 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -27,6 +27,7 @@ echo ${JOB_TYPE} mvn install -B -V \ -DskipTests=true \ -Dclirr.skip=true \ + -Denforcer.skip=true \ -Dmaven.javadoc.skip=true \ -Dgcloud.download.skip=true \ -T 1C @@ -38,7 +39,7 @@ fi case ${JOB_TYPE} in test) - mvn test -B -Dclirr.skip=true + mvn test -B -Dclirr.skip=true -Denforcer.skip=true bash ${KOKORO_GFILE_DIR}/codecov.sh bash .kokoro/coerce_logs.sh ;; @@ -49,12 +50,17 @@ javadoc) mvn javadoc:javadoc javadoc:test-javadoc ;; integration) - mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -Dclirr.skip=true -fae verify + mvn -B ${INTEGRATION_TEST_ARGS} \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify bash .kokoro/coerce_logs.sh ;; clirr) - mvn -B clirr:check + mvn -B -Denforcer.skip=true clirr:check ;; *) ;; -esac \ No newline at end of file +esac diff --git a/java-shared-config/.kokoro/dependencies.sh b/java-shared-config/.kokoro/dependencies.sh index c90526285a95..cc8366024550 100755 --- a/java-shared-config/.kokoro/dependencies.sh +++ b/java-shared-config/.kokoro/dependencies.sh @@ -23,5 +23,9 @@ echo $JOB_TYPE export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" -mvn install -DskipTests=true -B -V +# this should run maven enforcer +mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true + mvn -B dependency:analyze -DfailOnWarning=true diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index c2e6aeb4cc37..fb36cef454a5 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-10-26T08:01:55.495543Z", + "updateTime": "2019-11-19T20:09:00.555373Z", "sources": [ { "template": { From 3aea9b702a1601ff6a11f8927d40bb687d576ccf Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 25 Nov 2019 19:01:10 +0100 Subject: [PATCH 060/794] deps: update dependency org.apache.maven.plugins:maven-enforcer-plugin to v3.0.0-m3 (#72) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 33bd9cb4bc18..cf8758e5d9cd 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -99,7 +99,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M2 + 3.0.0-M3 org.codehaus.mojo From da934909be87d43433476809dc01ef9e87a0c423 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 19 Dec 2019 09:25:15 -0800 Subject: [PATCH 061/794] chore: update renovate config (#77) --- java-shared-config/renovate.json | 42 ++- java-shared-config/synth.metadata | 451 +++++++++++++++++++++++++++++- 2 files changed, 478 insertions(+), 15 deletions(-) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index 99810470034c..c5eafc049691 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -1,27 +1,41 @@ { "extends": [ - "config:base" + ":separateMajorReleases", + ":combinePatchMinorReleases", + ":ignoreUnstable", + ":prImmediately", + ":updateNotScheduled", + ":automergeDisabled", + ":ignoreModulesAndTests", + ":maintainLockFilesDisabled", + ":autodetectPinVersions" ], - "ignoreDeps": [], "packageRules": [ { - "managers": ["maven"], - "packageNames": ["com.google.guava:guava*"], + "packagePatterns": [ + "^com.google.guava:" + ], "versionScheme": "docker" }, { - "packagePatterns": ["^io.grpc:grpc-"], - "groupName": "gRPC packages" + "packagePatterns": [ + "*" + ], + "semanticCommitType": "deps", + "semanticCommitScope": null }, { - "packagePatterns": ["^com.google.protobuf:protobuf-"], - "groupName": "Protobuf packages" - }, - { - "packagePatterns": ["^io.opencensus:opencensus-"], - "groupName": "OpenCensus packages" + "packagePatterns": [ + "^org.apache.maven", + "^org.jacoco:", + "^org.codehaus.mojo:", + "^org.sonatype.plugins:", + "^com.coveo:", + "^com.google.cloud:google-cloud-shared-config" + ], + "semanticCommitType": "build", + "semanticCommitScope": "deps" } ], - "semanticCommits": true, - "semanticCommitType": "deps" + "semanticCommits": true } diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index fb36cef454a5..23aed64542bf 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-11-19T20:09:00.555373Z", + "updateTime": "2019-12-19T09:04:38.110812Z", "sources": [ { "template": { @@ -8,5 +8,454 @@ "version": "2019.10.17" } } + ], + "newFiles": [ + { + "path": ".gitignore" + }, + { + "path": "README.md" + }, + { + "path": "renovate.json" + }, + { + "path": "license-checks.xml" + }, + { + "path": "CONTRIBUTING.md" + }, + { + "path": "synth.py" + }, + { + "path": "synth.metadata" + }, + { + "path": "java.header" + }, + { + "path": "pom.xml" + }, + { + "path": "CODE_OF_CONDUCT.md" + }, + { + "path": "versions.txt" + }, + { + "path": "CHANGELOG.md" + }, + { + "path": "LICENSE" + }, + { + "path": ".repo-metadata.json" + }, + { + "path": "codecov.yaml" + }, + { + "path": ".github/release-please.yml" + }, + { + "path": ".github/PULL_REQUEST_TEMPLATE.md" + }, + { + "path": ".github/ISSUE_TEMPLATE/support_request.md" + }, + { + "path": ".github/ISSUE_TEMPLATE/feature_request.md" + }, + { + "path": ".github/ISSUE_TEMPLATE/bug_report.md" + }, + { + "path": ".kokoro/trampoline.sh" + }, + { + "path": ".kokoro/build.sh" + }, + { + "path": ".kokoro/build.bat" + }, + { + "path": ".kokoro/linkage-monitor.sh" + }, + { + "path": ".kokoro/dependencies.sh" + }, + { + "path": ".kokoro/common.cfg" + }, + { + "path": ".kokoro/coerce_logs.sh" + }, + { + "path": ".kokoro/release/common.sh" + }, + { + "path": ".kokoro/release/publish_javadoc.cfg" + }, + { + "path": ".kokoro/release/stage.cfg" + }, + { + "path": ".kokoro/release/publish_javadoc.sh" + }, + { + "path": ".kokoro/release/bump_snapshot.cfg" + }, + { + "path": ".kokoro/release/drop.cfg" + }, + { + "path": ".kokoro/release/snapshot.cfg" + }, + { + "path": ".kokoro/release/promote.sh" + }, + { + "path": ".kokoro/release/stage.sh" + }, + { + "path": ".kokoro/release/bump_snapshot.sh" + }, + { + "path": ".kokoro/release/promote.cfg" + }, + { + "path": ".kokoro/release/drop.sh" + }, + { + "path": ".kokoro/release/common.cfg" + }, + { + "path": ".kokoro/release/snapshot.sh" + }, + { + "path": ".kokoro/nightly/java11.cfg" + }, + { + "path": ".kokoro/nightly/java8-win.cfg" + }, + { + "path": ".kokoro/nightly/lint.cfg" + }, + { + "path": ".kokoro/nightly/java8-osx.cfg" + }, + { + "path": ".kokoro/nightly/integration.cfg" + }, + { + "path": ".kokoro/nightly/java7.cfg" + }, + { + "path": ".kokoro/nightly/java8.cfg" + }, + { + "path": ".kokoro/nightly/dependencies.cfg" + }, + { + "path": ".kokoro/nightly/common.cfg" + }, + { + "path": ".kokoro/presubmit/java11.cfg" + }, + { + "path": ".kokoro/presubmit/java8-win.cfg" + }, + { + "path": ".kokoro/presubmit/lint.cfg" + }, + { + "path": ".kokoro/presubmit/clirr.cfg" + }, + { + "path": ".kokoro/presubmit/java8-osx.cfg" + }, + { + "path": ".kokoro/presubmit/integration.cfg" + }, + { + "path": ".kokoro/presubmit/java7.cfg" + }, + { + "path": ".kokoro/presubmit/java8.cfg" + }, + { + "path": ".kokoro/presubmit/dependencies.cfg" + }, + { + "path": ".kokoro/presubmit/linkage-monitor.cfg" + }, + { + "path": ".kokoro/presubmit/common.cfg" + }, + { + "path": ".kokoro/continuous/propose_release.cfg" + }, + { + "path": ".kokoro/continuous/java11.cfg" + }, + { + "path": ".kokoro/continuous/java8-win.cfg" + }, + { + "path": ".kokoro/continuous/lint.cfg" + }, + { + "path": ".kokoro/continuous/java8-osx.cfg" + }, + { + "path": ".kokoro/continuous/propose_release.sh" + }, + { + "path": ".kokoro/continuous/integration.cfg" + }, + { + "path": ".kokoro/continuous/java7.cfg" + }, + { + "path": ".kokoro/continuous/java8.cfg" + }, + { + "path": ".kokoro/continuous/dependencies.cfg" + }, + { + "path": ".kokoro/continuous/common.cfg" + }, + { + "path": "__pycache__/synth.cpython-36.pyc" + }, + { + "path": ".git/shallow" + }, + { + "path": ".git/index" + }, + { + "path": ".git/packed-refs" + }, + { + "path": ".git/HEAD" + }, + { + "path": ".git/config" + }, + { + "path": ".git/logs/HEAD" + }, + { + "path": ".git/logs/refs/heads/autosynth" + }, + { + "path": ".git/logs/refs/heads/master" + }, + { + "path": ".git/logs/refs/remotes/origin/HEAD" + }, + { + "path": ".git/objects/09/8168a7373cddb2bbe4427ae1c909800f18b590" + }, + { + "path": ".git/objects/7f/810ec7e8ea1917cce8e2aaef22568ec7f5b504" + }, + { + "path": ".git/objects/7f/f7c44d5bd90254d3cb8a27bf70cf96536e1522" + }, + { + "path": ".git/objects/dc/2936ef76a81a2984b8461d4d0d09ce533a3dce" + }, + { + "path": ".git/objects/fc/1014801fc17ec26474594ac420fe5c64e7a692" + }, + { + "path": ".git/objects/ec/572442e2e79abe9f00dc8214a08ac5302d90fd" + }, + { + "path": ".git/objects/56/f8362b8e8b6d553d8b8fd077ea129e87a0c7e0" + }, + { + "path": ".git/objects/56/abc2c617b76bb3459b7aaba897a7fa3895f873" + }, + { + "path": ".git/objects/42/7c14833e1ef4aa6885b691dffbfaf7a852dc62" + }, + { + "path": ".git/objects/cb/24f44eea3b43ebbbbfaec7fd663bf7c762413a" + }, + { + "path": ".git/objects/cb/1ab503b7e35efde64bb3caa593e25d63c64a1d" + }, + { + "path": ".git/objects/3a/9b503aa24fe32edbe535ea2c738bd3acf437b4" + }, + { + "path": ".git/objects/13/c74e459d6a9e58764c95e2e5915a5896bb3550" + }, + { + "path": ".git/objects/6b/2238bb75e0a238278b3ce8c7ce3fe76b0ab7a4" + }, + { + "path": ".git/objects/d0/1639aa55ebb1bc7fc184754d2290a91cac8340" + }, + { + "path": ".git/objects/ac/4f9feb31d02b11a085a18c6f0cb4041f9084f4" + }, + { + "path": ".git/objects/eb/bb59e5310f80a2b1b9ec6dba27b4a871d7ad77" + }, + { + "path": ".git/objects/6d/323c8ae768078404d0c427bed6c610aac336ae" + }, + { + "path": ".git/objects/2c/137534ca56d41afd474eed8bb99d225a2ea99f" + }, + { + "path": ".git/objects/65/97fced808e81942a9630c70edf4729de93e57c" + }, + { + "path": ".git/objects/d6/45695673349e3947e8e5ae42332d0ac3164cd7" + }, + { + "path": ".git/objects/80/6c23a2de9c7257d188e2c4810bcb1b5956f1e7" + }, + { + "path": ".git/objects/14/1f90c13c56d6ab627e11aa861f2636bc1f0ed2" + }, + { + "path": ".git/objects/14/f44ff859bbd675a7ca0d5627c1c30b636911fa" + }, + { + "path": ".git/objects/43/1f83037dcd18b9679e40ef0aac1297abdb21b2" + }, + { + "path": ".git/objects/8f/8965cb456479ec3bdf564ec09649f5b6ebd545" + }, + { + "path": ".git/objects/02/b713a06a557aa844f08472c8adf1a85d5c0b8e" + }, + { + "path": ".git/objects/4e/1733f800ab443a1efaabe5822b09b88085d9eb" + }, + { + "path": ".git/objects/27/f2c6306af5bcea9f358691f0b21f3cbb84ea35" + }, + { + "path": ".git/objects/fb/36cef454a586e5ae765e9f198507ede55f8888" + }, + { + "path": ".git/objects/f5/9b9baf80e30bca82dece630058fc9ec0330edb" + }, + { + "path": ".git/objects/3c/482cbc55f126bf64b230f51c31b47ee7444eca" + }, + { + "path": ".git/objects/9d/96c112a0c3d94a1f9ecbebe55601e4f831fd48" + }, + { + "path": ".git/objects/5c/f31b784945c2dceba3bc4e3c65f1556a8772a2" + }, + { + "path": ".git/objects/5c/4551efa2c0bf28182078ef9843c736f35f8a88" + }, + { + "path": ".git/objects/5c/f7ba49e6bb7a1805c5b6f3d04461eaae6c0b58" + }, + { + "path": ".git/objects/1e/0179ae282df70e05bab17db21e4abcd6426155" + }, + { + "path": ".git/objects/ba/17ce01466baca99d6ec9aa01c0fdbb0aa2035f" + }, + { + "path": ".git/objects/99/810470034c787b1647504844419d3b7b275583" + }, + { + "path": ".git/objects/99/5869032125fb2e0d6830a2898ea07e0c061499" + }, + { + "path": ".git/objects/15/53fb75a8071df859400c4432ccaafe335dca95" + }, + { + "path": ".git/objects/cc/8366024550d495ee4647c38c6a949749e3cb5c" + }, + { + "path": ".git/objects/70/9f2b4c73db4ed19af9dac308f9bd1d7f94f046" + }, + { + "path": ".git/objects/a9/39472e1c6b5ff7e2fc4598f93e817791af4ac3" + }, + { + "path": ".git/objects/57/24ea9478d717c05010eae9ac2dbd62fc0d8324" + }, + { + "path": ".git/objects/fa/dd6afc2dfdba6b3d35c169c9984ce1d5b58577" + }, + { + "path": ".git/objects/58/304f32127a995087a2a826d1786906321b13ca" + }, + { + "path": ".git/objects/82/7446828034abb719df29ff88f7b37c79a95766" + }, + { + "path": ".git/objects/c2/2797880be8ef05daf57902c6cb9fa1161de820" + }, + { + "path": ".git/objects/04/4a22c4fcbf96361549c7ef5ae1598665fc9297" + }, + { + "path": ".git/objects/3b/7dd4b87832789f7ca852c05c5a8946a9a043ff" + }, + { + "path": ".git/objects/3b/017fc80f04b84c231cb792308d1ceae48375de" + }, + { + "path": ".git/objects/cf/8758e5d9cdf6e78347f69c40ee6d33b5b4a7b5" + }, + { + "path": ".git/objects/1f/a95fa537a3e7bb9f9cbdbf0120cf0894845973" + }, + { + "path": ".git/objects/2a/c35459ecc11067adb615bf23bce3bbbc1fdeaf" + }, + { + "path": ".git/objects/6e/3f65999b3da8f4bfcd1b1741799958953be862" + }, + { + "path": ".git/objects/6e/ec4f1b6242ecb08171565aa44df160bcb026f2" + }, + { + "path": ".git/objects/53/66fa62d906dc87f8fcb15729fc80f8c3bc61a4" + }, + { + "path": ".git/objects/0b/d0ee0620f9f1b6de097d93928204fd3af6aa16" + }, + { + "path": ".git/objects/3e/124ff169a52928804ddf3bb4284feaafd120b5" + }, + { + "path": ".git/objects/87/efce51dfa359132d68c5932939de675d735699" + }, + { + "path": ".git/objects/75/4e30c68a00fccdb4f58f2d331f8709da8bf0ce" + }, + { + "path": ".git/objects/c5/d99e7d09f1799f7f79e4082bb60265b3920235" + }, + { + "path": ".git/objects/22/245df8165b6474dd8b5302a9dc89a7fa9b85c0" + }, + { + "path": ".git/refs/heads/autosynth" + }, + { + "path": ".git/refs/heads/master" + }, + { + "path": ".git/refs/remotes/origin/HEAD" + } ] } \ No newline at end of file From cb0ecd85d9c7611fdf017a3ffbfa309cb119226d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 23 Dec 2019 23:51:45 +0200 Subject: [PATCH 062/794] deps: update dependency org.apache.maven.plugins:maven-source-plugin to v3.2.1 (#78) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index cf8758e5d9cd..e36c9fa0c438 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -444,7 +444,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.0 + 3.2.1 attach-sources From 545216fda7666f636adb0a2065635171259759c2 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 26 Dec 2019 13:04:51 -0600 Subject: [PATCH 063/794] chore(deps): group core dependencies --- java-shared-config/renovate.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index c5eafc049691..02757c63ad2c 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -17,6 +17,15 @@ ], "versionScheme": "docker" }, + { + "packagePatterns": [ + "^com.google.api:gax", + "^com.google.auth:", + "^com.google.cloud:google-cloud-core", + "^io.grpc:" + ], + "groupName": "core dependencies" + }, { "packagePatterns": [ "*" From 0f6ecaae63a7e0e2380eaf1e29802fd4ef504c92 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 26 Dec 2019 17:51:03 -0600 Subject: [PATCH 064/794] chore: group core transport dependencies --- java-shared-config/renovate.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index 02757c63ad2c..d014232c57bf 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -26,6 +26,14 @@ ], "groupName": "core dependencies" }, + { + "packagePatterns": [ + "^com.google.http-client:", + "^com.google.oauth-client:", + "^com.google.api-client:" + ], + "groupName": "core transport dependencies" + }, { "packagePatterns": [ "*" From 1bc3a25ff313fdf75ea57a05134190fc96d33b48 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 3 Jan 2020 12:15:07 -0600 Subject: [PATCH 065/794] fix: use surefire-junit47 provider for surefire/failsafe plugins (#81) --- java-shared-config/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e36c9fa0c438..d349f6da629b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -91,7 +91,7 @@ org.apache.maven.surefire - surefire-junit4 + surefire-junit47 3.0.0-M4 @@ -128,7 +128,7 @@ org.apache.maven.surefire - surefire-junit4 + surefire-junit47 3.0.0-M4 From 3f703e52a67adf43f6d720f5387bbc26d5865549 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 3 Jan 2020 10:25:50 -0800 Subject: [PATCH 066/794] chore: release 0.3.1 (#67) * updated CHANGELOG.md [ci skip] * updated README.md [ci skip] * updated versions.txt [ci skip] * updated pom.xml [ci skip] --- java-shared-config/CHANGELOG.md | 16 ++++++++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 56f8362b8e8b..b4fe91823930 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +### [0.3.1](https://www.github.com/googleapis/java-shared-config/compare/v0.3.0...v0.3.1) (2020-01-03) + + +### Bug Fixes + +* use surefire-junit47 provider for surefire/failsafe plugins ([#81](https://www.github.com/googleapis/java-shared-config/issues/81)) ([d3bc105](https://www.github.com/googleapis/java-shared-config/commit/d3bc1057731787578188397dceca58c1389dec08)) + + +### Dependencies + +* update dependency org.apache.maven.plugins:maven-enforcer-plugin to v3.0.0-m3 ([#72](https://www.github.com/googleapis/java-shared-config/issues/72)) ([fc10148](https://www.github.com/googleapis/java-shared-config/commit/fc1014801fc17ec26474594ac420fe5c64e7a692)) +* update dependency org.apache.maven.plugins:maven-failsafe-plugin to v3.0.0-m4 ([#64](https://www.github.com/googleapis/java-shared-config/issues/64)) ([9ae5d78](https://www.github.com/googleapis/java-shared-config/commit/9ae5d7875bf9a286459ef06a60d35a1f93be971e)) +* update dependency org.apache.maven.plugins:maven-source-plugin to v3.2.1 ([#78](https://www.github.com/googleapis/java-shared-config/issues/78)) ([9eb9daf](https://www.github.com/googleapis/java-shared-config/commit/9eb9daf0cf48f19755e1c35e41707d59a8d10a25)) +* update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-m4 ([#65](https://www.github.com/googleapis/java-shared-config/issues/65)) ([48e8ea9](https://www.github.com/googleapis/java-shared-config/commit/48e8ea9dec3587b08a766d27260c9f9a313f6148)) +* update dependency org.apache.maven.surefire:surefire-junit4 to v3.0.0-m4 ([#66](https://www.github.com/googleapis/java-shared-config/issues/66)) ([b1086d5](https://www.github.com/googleapis/java-shared-config/commit/b1086d58de1056650906380768fc3c5635d724be)) + ## [0.3.0](https://www.github.com/googleapis/java-shared-config/compare/v0.2.1...v0.3.0) (2019-11-14) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 5366fa62d906..fe69c01c3931 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.3.0 + 0.3.1 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d349f6da629b..598c52fe49dd 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.3.1-SNAPSHOT + 0.3.1 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index d01639aa55eb..f6715cfe0f55 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.3.0:0.3.1-SNAPSHOT +google-cloud-shared-config:0.3.1:0.3.1 From 21fa425c2a39ff14d64330289121a29b82d5693a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 3 Jan 2020 10:42:52 -0800 Subject: [PATCH 067/794] chore: release 0.3.2-SNAPSHOT (#82) * updated versions.txt [ci skip] * updated pom.xml [ci skip] --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 598c52fe49dd..754446a93c59 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.3.1 + 0.3.2-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index f6715cfe0f55..86efceb4f41f 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.3.1:0.3.1 +google-cloud-shared-config:0.3.1:0.3.2-SNAPSHOT From dab2560b169a3a47029d1f9c0cc045a35c4a0e69 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 7 Jan 2020 08:43:11 -0800 Subject: [PATCH 068/794] chore: update common templates (#83) --- java-shared-config/.kokoro/build.sh | 15 +- .../.kokoro/continuous/samples.cfg | 31 ++ .../.kokoro/nightly/samples.cfg | 31 ++ .../.kokoro/presubmit/samples.cfg | 31 ++ java-shared-config/CONTRIBUTING.md | 104 +++++- java-shared-config/synth.metadata | 320 ++++++++++-------- 6 files changed, 394 insertions(+), 138 deletions(-) create mode 100644 java-shared-config/.kokoro/continuous/samples.cfg create mode 100644 java-shared-config/.kokoro/nightly/samples.cfg create mode 100644 java-shared-config/.kokoro/presubmit/samples.cfg diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index dc2936ef76a8..f1ae58408da5 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -44,13 +44,26 @@ test) bash .kokoro/coerce_logs.sh ;; lint) - mvn com.coveo:fmt-maven-plugin:check + mvn \ + -Penable-samples \ + com.coveo:fmt-maven-plugin:check ;; javadoc) mvn javadoc:javadoc javadoc:test-javadoc ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ + -Penable-integration-tests \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify + bash .kokoro/coerce_logs.sh + ;; +samples) + mvn -B \ + -Penable-samples \ -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ diff --git a/java-shared-config/.kokoro/continuous/samples.cfg b/java-shared-config/.kokoro/continuous/samples.cfg new file mode 100644 index 000000000000..fa7b493d0b5c --- /dev/null +++ b/java-shared-config/.kokoro/continuous/samples.cfg @@ -0,0 +1,31 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "samples" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/java-shared-config/.kokoro/nightly/samples.cfg b/java-shared-config/.kokoro/nightly/samples.cfg new file mode 100644 index 000000000000..9a9102490d54 --- /dev/null +++ b/java-shared-config/.kokoro/nightly/samples.cfg @@ -0,0 +1,31 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "samples" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/java-shared-config/.kokoro/presubmit/samples.cfg b/java-shared-config/.kokoro/presubmit/samples.cfg new file mode 100644 index 000000000000..fa7b493d0b5c --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/samples.cfg @@ -0,0 +1,31 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "samples" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/java-shared-config/CONTRIBUTING.md b/java-shared-config/CONTRIBUTING.md index ebbb59e5310f..085021ddec26 100644 --- a/java-shared-config/CONTRIBUTING.md +++ b/java-shared-config/CONTRIBUTING.md @@ -25,4 +25,106 @@ information on using pull requests. ## Community Guidelines This project follows -[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/). \ No newline at end of file +[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/). + +## Building the project + +To build, package, and run all unit tests run the command + +``` +mvn clean verify +``` + +### Running Integration tests + +To include integration tests when building the project, you need access to +a GCP Project with a valid service account. + +For instructions on how to generate a service account and corresponding +credentials JSON see: [Creating a Service Account][1]. + +Then run the following to build, package, run all unit tests and run all +integration tests. + +```bash +export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json +mvn -Penable-integration-tests clean verify +``` + +## Code Samples + +Code Samples must be bundled in separate Maven modules, and guarded by a +Maven profile with the name `enable-samples`. + +The samples must be separate from the primary project for a few reasons: +1. Primary projects have a minimum Java version of Java 7 whereas samples have + a minimum Java version of Java 8. Due to this we need the ability to + selectively exclude samples from a build run. +2. Many code samples depend on external GCP services and need + credentials to access the service. +3. Code samples are not released as Maven artifacts and must be excluded from + release builds. + +### Building + +```bash +mvn -Penable-samples clean verify +``` + +Some samples require access to GCP services and require a service account: + +```bash +export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json +mvn -Penable-samples clean verify +``` + +### Profile Config + +1. To add samples in a profile to your Maven project, add the following to your +`pom.xml` + + ```xml + + [...] + + + enable-samples + + sample + + + + [...] + + ``` + +2. [Activate](#profile-activation) the profile. +3. Define your samples in a normal Maven project in the `samples/` directory + +### Profile Activation + +To include code samples when building and testing the project, enable the +`enable-samples` Maven profile. + +#### Command line + +To activate the Maven profile on the command line add `-Penable-samples` to your +Maven command. + +#### Maven `settings.xml` + +To activate the Maven profile in your `~/.m2/settings.xml` add an entry of +`enable-samples` following the instructions in [Active Profiles][2]. + +This method has the benefit of applying to all projects you build (and is +respected by IntelliJ IDEA) and is recommended if you are going to be +contributing samples to several projects. + +#### IntelliJ IDEA + +To activate the Maven Profile inside IntelliJ IDEA, follow the instructions in +[Activate Maven profiles][3] to activate `enable-samples`. + +[1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account +[2]: https://maven.apache.org/settings.html#Active_Profiles +[3]: https://www.jetbrains.com/help/idea/work-with-maven-profiles.html#activate_maven_profiles diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 23aed64542bf..b9c8a651780f 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-12-19T09:04:38.110812Z", + "updateTime": "2020-01-07T09:14:19.430524Z", "sources": [ { "template": { @@ -11,10 +11,7 @@ ], "newFiles": [ { - "path": ".gitignore" - }, - { - "path": "README.md" + "path": ".repo-metadata.json" }, { "path": "renovate.json" @@ -23,145 +20,154 @@ "path": "license-checks.xml" }, { - "path": "CONTRIBUTING.md" + "path": "synth.py" }, { - "path": "synth.py" + "path": "CHANGELOG.md" }, { - "path": "synth.metadata" + "path": "codecov.yaml" }, { - "path": "java.header" + "path": "LICENSE" }, { - "path": "pom.xml" + "path": ".gitignore" }, { - "path": "CODE_OF_CONDUCT.md" + "path": "pom.xml" }, { - "path": "versions.txt" + "path": "CODE_OF_CONDUCT.md" }, { - "path": "CHANGELOG.md" + "path": "synth.metadata" }, { - "path": "LICENSE" + "path": "README.md" }, { - "path": ".repo-metadata.json" + "path": "versions.txt" }, { - "path": "codecov.yaml" + "path": "CONTRIBUTING.md" }, { - "path": ".github/release-please.yml" + "path": "java.header" }, { - "path": ".github/PULL_REQUEST_TEMPLATE.md" + "path": ".kokoro/build.bat" }, { - "path": ".github/ISSUE_TEMPLATE/support_request.md" + "path": ".kokoro/build.sh" }, { - "path": ".github/ISSUE_TEMPLATE/feature_request.md" + "path": ".kokoro/dependencies.sh" }, { - "path": ".github/ISSUE_TEMPLATE/bug_report.md" + "path": ".kokoro/common.cfg" }, { "path": ".kokoro/trampoline.sh" }, { - "path": ".kokoro/build.sh" + "path": ".kokoro/coerce_logs.sh" }, { - "path": ".kokoro/build.bat" + "path": ".kokoro/linkage-monitor.sh" }, { - "path": ".kokoro/linkage-monitor.sh" + "path": ".kokoro/continuous/dependencies.cfg" }, { - "path": ".kokoro/dependencies.sh" + "path": ".kokoro/continuous/samples.cfg" }, { - "path": ".kokoro/common.cfg" + "path": ".kokoro/continuous/java7.cfg" }, { - "path": ".kokoro/coerce_logs.sh" + "path": ".kokoro/continuous/java8-osx.cfg" }, { - "path": ".kokoro/release/common.sh" + "path": ".kokoro/continuous/java8-win.cfg" }, { - "path": ".kokoro/release/publish_javadoc.cfg" + "path": ".kokoro/continuous/propose_release.sh" }, { - "path": ".kokoro/release/stage.cfg" + "path": ".kokoro/continuous/lint.cfg" }, { - "path": ".kokoro/release/publish_javadoc.sh" + "path": ".kokoro/continuous/java11.cfg" }, { - "path": ".kokoro/release/bump_snapshot.cfg" + "path": ".kokoro/continuous/common.cfg" }, { - "path": ".kokoro/release/drop.cfg" + "path": ".kokoro/continuous/propose_release.cfg" }, { - "path": ".kokoro/release/snapshot.cfg" + "path": ".kokoro/continuous/java8.cfg" }, { - "path": ".kokoro/release/promote.sh" + "path": ".kokoro/continuous/integration.cfg" }, { - "path": ".kokoro/release/stage.sh" + "path": ".kokoro/release/drop.sh" }, { - "path": ".kokoro/release/bump_snapshot.sh" + "path": ".kokoro/release/stage.cfg" }, { "path": ".kokoro/release/promote.cfg" }, { - "path": ".kokoro/release/drop.sh" + "path": ".kokoro/release/publish_javadoc.cfg" }, { - "path": ".kokoro/release/common.cfg" + "path": ".kokoro/release/bump_snapshot.cfg" + }, + { + "path": ".kokoro/release/promote.sh" + }, + { + "path": ".kokoro/release/stage.sh" }, { "path": ".kokoro/release/snapshot.sh" }, { - "path": ".kokoro/nightly/java11.cfg" + "path": ".kokoro/release/snapshot.cfg" }, { - "path": ".kokoro/nightly/java8-win.cfg" + "path": ".kokoro/release/common.cfg" }, { - "path": ".kokoro/nightly/lint.cfg" + "path": ".kokoro/release/bump_snapshot.sh" }, { - "path": ".kokoro/nightly/java8-osx.cfg" + "path": ".kokoro/release/common.sh" }, { - "path": ".kokoro/nightly/integration.cfg" + "path": ".kokoro/release/drop.cfg" }, { - "path": ".kokoro/nightly/java7.cfg" + "path": ".kokoro/release/publish_javadoc.sh" }, { - "path": ".kokoro/nightly/java8.cfg" + "path": ".kokoro/presubmit/dependencies.cfg" }, { - "path": ".kokoro/nightly/dependencies.cfg" + "path": ".kokoro/presubmit/samples.cfg" }, { - "path": ".kokoro/nightly/common.cfg" + "path": ".kokoro/presubmit/java7.cfg" }, { - "path": ".kokoro/presubmit/java11.cfg" + "path": ".kokoro/presubmit/java8-osx.cfg" + }, + { + "path": ".kokoro/presubmit/linkage-monitor.cfg" }, { "path": ".kokoro/presubmit/java8-win.cfg" @@ -170,67 +176,67 @@ "path": ".kokoro/presubmit/lint.cfg" }, { - "path": ".kokoro/presubmit/clirr.cfg" + "path": ".kokoro/presubmit/java11.cfg" }, { - "path": ".kokoro/presubmit/java8-osx.cfg" + "path": ".kokoro/presubmit/common.cfg" }, { - "path": ".kokoro/presubmit/integration.cfg" + "path": ".kokoro/presubmit/clirr.cfg" }, { - "path": ".kokoro/presubmit/java7.cfg" + "path": ".kokoro/presubmit/java8.cfg" }, { - "path": ".kokoro/presubmit/java8.cfg" + "path": ".kokoro/presubmit/integration.cfg" }, { - "path": ".kokoro/presubmit/dependencies.cfg" + "path": ".kokoro/nightly/dependencies.cfg" }, { - "path": ".kokoro/presubmit/linkage-monitor.cfg" + "path": ".kokoro/nightly/samples.cfg" }, { - "path": ".kokoro/presubmit/common.cfg" + "path": ".kokoro/nightly/java7.cfg" }, { - "path": ".kokoro/continuous/propose_release.cfg" + "path": ".kokoro/nightly/java8-osx.cfg" }, { - "path": ".kokoro/continuous/java11.cfg" + "path": ".kokoro/nightly/java8-win.cfg" }, { - "path": ".kokoro/continuous/java8-win.cfg" + "path": ".kokoro/nightly/lint.cfg" }, { - "path": ".kokoro/continuous/lint.cfg" + "path": ".kokoro/nightly/java11.cfg" }, { - "path": ".kokoro/continuous/java8-osx.cfg" + "path": ".kokoro/nightly/common.cfg" }, { - "path": ".kokoro/continuous/propose_release.sh" + "path": ".kokoro/nightly/java8.cfg" }, { - "path": ".kokoro/continuous/integration.cfg" + "path": ".kokoro/nightly/integration.cfg" }, { - "path": ".kokoro/continuous/java7.cfg" + "path": ".github/release-please.yml" }, { - "path": ".kokoro/continuous/java8.cfg" + "path": ".github/PULL_REQUEST_TEMPLATE.md" }, { - "path": ".kokoro/continuous/dependencies.cfg" + "path": ".github/ISSUE_TEMPLATE/bug_report.md" }, { - "path": ".kokoro/continuous/common.cfg" + "path": ".github/ISSUE_TEMPLATE/support_request.md" }, { - "path": "__pycache__/synth.cpython-36.pyc" + "path": ".github/ISSUE_TEMPLATE/feature_request.md" }, { - "path": ".git/shallow" + "path": "__pycache__/synth.cpython-36.pyc" }, { "path": ".git/index" @@ -241,221 +247,263 @@ { "path": ".git/HEAD" }, + { + "path": ".git/description" + }, { "path": ".git/config" }, { - "path": ".git/logs/HEAD" + "path": ".git/shallow" }, { - "path": ".git/logs/refs/heads/autosynth" + "path": ".git/objects/9d/96c112a0c3d94a1f9ecbebe55601e4f831fd48" }, { - "path": ".git/logs/refs/heads/master" + "path": ".git/objects/7f/f7c44d5bd90254d3cb8a27bf70cf96536e1522" }, { - "path": ".git/logs/refs/remotes/origin/HEAD" + "path": ".git/objects/7f/810ec7e8ea1917cce8e2aaef22568ec7f5b504" }, { - "path": ".git/objects/09/8168a7373cddb2bbe4427ae1c909800f18b590" + "path": ".git/objects/d6/45695673349e3947e8e5ae42332d0ac3164cd7" }, { - "path": ".git/objects/7f/810ec7e8ea1917cce8e2aaef22568ec7f5b504" + "path": ".git/objects/b4/fe918239302fdbe75e0b2bd6c8b1690abf45df" }, { - "path": ".git/objects/7f/f7c44d5bd90254d3cb8a27bf70cf96536e1522" + "path": ".git/objects/1c/c91882b93da7fc5415bec586c39d7925d9d9ae" }, { - "path": ".git/objects/dc/2936ef76a81a2984b8461d4d0d09ce533a3dce" + "path": ".git/objects/fa/dd6afc2dfdba6b3d35c169c9984ce1d5b58577" }, { - "path": ".git/objects/fc/1014801fc17ec26474594ac420fe5c64e7a692" + "path": ".git/objects/58/304f32127a995087a2a826d1786906321b13ca" }, { - "path": ".git/objects/ec/572442e2e79abe9f00dc8214a08ac5302d90fd" + "path": ".git/objects/87/efce51dfa359132d68c5932939de675d735699" }, { - "path": ".git/objects/56/f8362b8e8b6d553d8b8fd077ea129e87a0c7e0" + "path": ".git/objects/86/efceb4f41f54ea29e3f03e9e0e23935de65ba7" }, { - "path": ".git/objects/56/abc2c617b76bb3459b7aaba897a7fa3895f873" + "path": ".git/objects/80/6c23a2de9c7257d188e2c4810bcb1b5956f1e7" + }, + { + "path": ".git/objects/70/9f2b4c73db4ed19af9dac308f9bd1d7f94f046" + }, + { + "path": ".git/objects/75/4e30c68a00fccdb4f58f2d331f8709da8bf0ce" + }, + { + "path": ".git/objects/75/4446a93c59ffdd4d596ebaa06fc1e804993ee2" + }, + { + "path": ".git/objects/13/c74e459d6a9e58764c95e2e5915a5896bb3550" + }, + { + "path": ".git/objects/2a/c35459ecc11067adb615bf23bce3bbbc1fdeaf" }, { "path": ".git/objects/42/7c14833e1ef4aa6885b691dffbfaf7a852dc62" }, { - "path": ".git/objects/cb/24f44eea3b43ebbbbfaec7fd663bf7c762413a" + "path": ".git/objects/6b/2238bb75e0a238278b3ce8c7ce3fe76b0ab7a4" + }, + { + "path": ".git/objects/1f/a95fa537a3e7bb9f9cbdbf0120cf0894845973" }, { "path": ".git/objects/cb/1ab503b7e35efde64bb3caa593e25d63c64a1d" }, { - "path": ".git/objects/3a/9b503aa24fe32edbe535ea2c738bd3acf437b4" + "path": ".git/objects/cb/24f44eea3b43ebbbbfaec7fd663bf7c762413a" }, { - "path": ".git/objects/13/c74e459d6a9e58764c95e2e5915a5896bb3550" + "path": ".git/objects/22/245df8165b6474dd8b5302a9dc89a7fa9b85c0" }, { - "path": ".git/objects/6b/2238bb75e0a238278b3ce8c7ce3fe76b0ab7a4" + "path": ".git/objects/02/b713a06a557aa844f08472c8adf1a85d5c0b8e" }, { - "path": ".git/objects/d0/1639aa55ebb1bc7fc184754d2290a91cac8340" + "path": ".git/objects/c5/d99e7d09f1799f7f79e4082bb60265b3920235" }, { - "path": ".git/objects/ac/4f9feb31d02b11a085a18c6f0cb4041f9084f4" + "path": ".git/objects/ba/17ce01466baca99d6ec9aa01c0fdbb0aa2035f" }, { - "path": ".git/objects/eb/bb59e5310f80a2b1b9ec6dba27b4a871d7ad77" + "path": ".git/objects/99/5869032125fb2e0d6830a2898ea07e0c061499" }, { - "path": ".git/objects/6d/323c8ae768078404d0c427bed6c610aac336ae" + "path": ".git/objects/3c/482cbc55f126bf64b230f51c31b47ee7444eca" }, { - "path": ".git/objects/2c/137534ca56d41afd474eed8bb99d225a2ea99f" + "path": ".git/objects/56/abc2c617b76bb3459b7aaba897a7fa3895f873" }, { - "path": ".git/objects/65/97fced808e81942a9630c70edf4729de93e57c" + "path": ".git/objects/eb/bb59e5310f80a2b1b9ec6dba27b4a871d7ad77" }, { - "path": ".git/objects/d6/45695673349e3947e8e5ae42332d0ac3164cd7" + "path": ".git/objects/09/8168a7373cddb2bbe4427ae1c909800f18b590" }, { - "path": ".git/objects/80/6c23a2de9c7257d188e2c4810bcb1b5956f1e7" + "path": ".git/objects/d0/14232c57bf970000b8882e41ed942f9c44a789" }, { - "path": ".git/objects/14/1f90c13c56d6ab627e11aa861f2636bc1f0ed2" + "path": ".git/objects/57/24ea9478d717c05010eae9ac2dbd62fc0d8324" }, { - "path": ".git/objects/14/f44ff859bbd675a7ca0d5627c1c30b636911fa" + "path": ".git/objects/cc/8366024550d495ee4647c38c6a949749e3cb5c" }, { - "path": ".git/objects/43/1f83037dcd18b9679e40ef0aac1297abdb21b2" + "path": ".git/objects/82/7446828034abb719df29ff88f7b37c79a95766" + }, + { + "path": ".git/objects/04/4a22c4fcbf96361549c7ef5ae1598665fc9297" }, { "path": ".git/objects/8f/8965cb456479ec3bdf564ec09649f5b6ebd545" }, { - "path": ".git/objects/02/b713a06a557aa844f08472c8adf1a85d5c0b8e" + "path": ".git/objects/a9/39472e1c6b5ff7e2fc4598f93e817791af4ac3" }, { - "path": ".git/objects/4e/1733f800ab443a1efaabe5822b09b88085d9eb" + "path": ".git/objects/3b/017fc80f04b84c231cb792308d1ceae48375de" }, { - "path": ".git/objects/27/f2c6306af5bcea9f358691f0b21f3cbb84ea35" + "path": ".git/objects/3b/7dd4b87832789f7ca852c05c5a8946a9a043ff" }, { - "path": ".git/objects/fb/36cef454a586e5ae765e9f198507ede55f8888" + "path": ".git/objects/15/53fb75a8071df859400c4432ccaafe335dca95" + }, + { + "path": ".git/objects/6d/323c8ae768078404d0c427bed6c610aac336ae" }, { "path": ".git/objects/f5/9b9baf80e30bca82dece630058fc9ec0330edb" }, { - "path": ".git/objects/3c/482cbc55f126bf64b230f51c31b47ee7444eca" + "path": ".git/objects/2c/137534ca56d41afd474eed8bb99d225a2ea99f" }, { - "path": ".git/objects/9d/96c112a0c3d94a1f9ecbebe55601e4f831fd48" + "path": ".git/objects/3a/9b503aa24fe32edbe535ea2c738bd3acf437b4" }, { - "path": ".git/objects/5c/f31b784945c2dceba3bc4e3c65f1556a8772a2" + "path": ".git/objects/5c/f7ba49e6bb7a1805c5b6f3d04461eaae6c0b58" }, { "path": ".git/objects/5c/4551efa2c0bf28182078ef9843c736f35f8a88" }, { - "path": ".git/objects/5c/f7ba49e6bb7a1805c5b6f3d04461eaae6c0b58" + "path": ".git/objects/5c/f31b784945c2dceba3bc4e3c65f1556a8772a2" }, { - "path": ".git/objects/1e/0179ae282df70e05bab17db21e4abcd6426155" + "path": ".git/objects/ec/572442e2e79abe9f00dc8214a08ac5302d90fd" }, { - "path": ".git/objects/ba/17ce01466baca99d6ec9aa01c0fdbb0aa2035f" + "path": ".git/objects/6e/3f65999b3da8f4bfcd1b1741799958953be862" }, { - "path": ".git/objects/99/810470034c787b1647504844419d3b7b275583" + "path": ".git/objects/6e/ec4f1b6242ecb08171565aa44df160bcb026f2" }, { - "path": ".git/objects/99/5869032125fb2e0d6830a2898ea07e0c061499" + "path": ".git/objects/14/1f90c13c56d6ab627e11aa861f2636bc1f0ed2" }, { - "path": ".git/objects/15/53fb75a8071df859400c4432ccaafe335dca95" + "path": ".git/objects/14/f44ff859bbd675a7ca0d5627c1c30b636911fa" }, { - "path": ".git/objects/cc/8366024550d495ee4647c38c6a949749e3cb5c" + "path": ".git/objects/3e/124ff169a52928804ddf3bb4284feaafd120b5" }, { - "path": ".git/objects/70/9f2b4c73db4ed19af9dac308f9bd1d7f94f046" + "path": ".git/objects/23/aed64542bfda2f409508fc183c22b93db4d269" }, { - "path": ".git/objects/a9/39472e1c6b5ff7e2fc4598f93e817791af4ac3" + "path": ".git/objects/c2/2797880be8ef05daf57902c6cb9fa1161de820" }, { - "path": ".git/objects/57/24ea9478d717c05010eae9ac2dbd62fc0d8324" + "path": ".git/objects/ac/4f9feb31d02b11a085a18c6f0cb4041f9084f4" }, { - "path": ".git/objects/fa/dd6afc2dfdba6b3d35c169c9984ce1d5b58577" + "path": ".git/objects/65/97fced808e81942a9630c70edf4729de93e57c" }, { - "path": ".git/objects/58/304f32127a995087a2a826d1786906321b13ca" + "path": ".git/objects/9f/5a161066aedd679ec3a1c0ef5d56c835a3eb7e" }, { - "path": ".git/objects/82/7446828034abb719df29ff88f7b37c79a95766" + "path": ".git/objects/dc/2936ef76a81a2984b8461d4d0d09ce533a3dce" }, { - "path": ".git/objects/c2/2797880be8ef05daf57902c6cb9fa1161de820" + "path": ".git/objects/1e/0179ae282df70e05bab17db21e4abcd6426155" }, { - "path": ".git/objects/04/4a22c4fcbf96361549c7ef5ae1598665fc9297" + "path": ".git/objects/0b/d0ee0620f9f1b6de097d93928204fd3af6aa16" }, { - "path": ".git/objects/3b/7dd4b87832789f7ca852c05c5a8946a9a043ff" + "path": ".git/objects/27/f2c6306af5bcea9f358691f0b21f3cbb84ea35" }, { - "path": ".git/objects/3b/017fc80f04b84c231cb792308d1ceae48375de" + "path": ".git/objects/fe/69c01c3931138d4ffdb4f02ee1370693703e7c" }, { - "path": ".git/objects/cf/8758e5d9cdf6e78347f69c40ee6d33b5b4a7b5" + "path": ".git/objects/43/1f83037dcd18b9679e40ef0aac1297abdb21b2" }, { - "path": ".git/objects/1f/a95fa537a3e7bb9f9cbdbf0120cf0894845973" + "path": ".git/refs/remotes/origin/HEAD" }, { - "path": ".git/objects/2a/c35459ecc11067adb615bf23bce3bbbc1fdeaf" + "path": ".git/refs/heads/autosynth" }, { - "path": ".git/objects/6e/3f65999b3da8f4bfcd1b1741799958953be862" + "path": ".git/refs/heads/master" }, { - "path": ".git/objects/6e/ec4f1b6242ecb08171565aa44df160bcb026f2" + "path": ".git/hooks/pre-applypatch.sample" }, { - "path": ".git/objects/53/66fa62d906dc87f8fcb15729fc80f8c3bc61a4" + "path": ".git/hooks/pre-commit.sample" }, { - "path": ".git/objects/0b/d0ee0620f9f1b6de097d93928204fd3af6aa16" + "path": ".git/hooks/fsmonitor-watchman.sample" }, { - "path": ".git/objects/3e/124ff169a52928804ddf3bb4284feaafd120b5" + "path": ".git/hooks/pre-rebase.sample" }, { - "path": ".git/objects/87/efce51dfa359132d68c5932939de675d735699" + "path": ".git/hooks/update.sample" }, { - "path": ".git/objects/75/4e30c68a00fccdb4f58f2d331f8709da8bf0ce" + "path": ".git/hooks/pre-push.sample" }, { - "path": ".git/objects/c5/d99e7d09f1799f7f79e4082bb60265b3920235" + "path": ".git/hooks/applypatch-msg.sample" }, { - "path": ".git/objects/22/245df8165b6474dd8b5302a9dc89a7fa9b85c0" + "path": ".git/hooks/prepare-commit-msg.sample" }, { - "path": ".git/refs/heads/autosynth" + "path": ".git/hooks/commit-msg.sample" }, { - "path": ".git/refs/heads/master" + "path": ".git/hooks/post-update.sample" }, { - "path": ".git/refs/remotes/origin/HEAD" + "path": ".git/hooks/pre-receive.sample" + }, + { + "path": ".git/info/exclude" + }, + { + "path": ".git/logs/HEAD" + }, + { + "path": ".git/logs/refs/remotes/origin/HEAD" + }, + { + "path": ".git/logs/refs/heads/autosynth" + }, + { + "path": ".git/logs/refs/heads/master" } ] } \ No newline at end of file From 985a58288b44242b34dbb124a3318e6efd2dff10 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 7 Jan 2020 11:38:29 -0800 Subject: [PATCH 069/794] chore: allow unstable renovate updates --- java-shared-config/renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index d014232c57bf..f3a70c9703f1 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -52,6 +52,12 @@ ], "semanticCommitType": "build", "semanticCommitScope": "deps" + }, + { + "packagePatterns": [ + "^com.google.cloud:google-cloud-" + ], + "ignoreUnstable": false } ], "semanticCommits": true From 6ee45b019723f212454186248a23d3c5e1c3c8ba Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Wed, 8 Jan 2020 15:23:26 -0500 Subject: [PATCH 070/794] feat: add new enable-integration-tests profile (#75) Integration tests generally require credentials and access to external GCP services which is not always available to every contributor. This change skips the running of integration tests by default (they are still compiled) in favor of explicitly enabling. To enable the running of integration tests activate the `enable-integration-tests` profile when executing maven (command line are: `-Penable-integration-tests`) --- java-shared-config/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 754446a93c59..319179ab9973 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -59,6 +59,7 @@ ${project.artifactId} false + true @@ -556,5 +557,11 @@ + + enable-integration-tests + + false + + From bbd4ea331e09aaeeed20b88e18596f69e5b178be Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2020 12:33:01 -0800 Subject: [PATCH 071/794] chore: release 0.4.0 (#86) * updated CHANGELOG.md [ci skip] * updated README.md [ci skip] * updated versions.txt [ci skip] * updated pom.xml [ci skip] --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index b4fe91823930..0cb6db300c5e 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.4.0](https://www.github.com/googleapis/java-shared-config/compare/v0.3.1...v0.4.0) (2020-01-08) + + +### Features + +* add new enable-integration-tests profile ([#75](https://www.github.com/googleapis/java-shared-config/issues/75)) ([836c442](https://www.github.com/googleapis/java-shared-config/commit/836c44294a3cae9ea38b1464431ebac1bef6633d)) + ### [0.3.1](https://www.github.com/googleapis/java-shared-config/compare/v0.3.0...v0.3.1) (2020-01-03) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index fe69c01c3931..112982da8606 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.3.1 + 0.4.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 319179ab9973..42a2a2525066 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.3.2-SNAPSHOT + 0.4.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 86efceb4f41f..f00d3627b3ad 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.3.1:0.3.2-SNAPSHOT +google-cloud-shared-config:0.4.0:0.4.0 From 8db79c12fd53d78adf81406d82946d8496280a9e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2020 14:19:17 -0800 Subject: [PATCH 072/794] chore: release 0.4.1-SNAPSHOT (#87) * updated versions.txt [ci skip] * updated pom.xml [ci skip] --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 42a2a2525066..53a821aa7e47 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.4.0 + 0.4.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index f00d3627b3ad..214f581ff60d 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.4.0:0.4.0 +google-cloud-shared-config:0.4.0:0.4.1-SNAPSHOT From d90dcc486f324e4f964d60630b0337c024879514 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 17 Jan 2020 10:11:46 -0800 Subject: [PATCH 073/794] chore(regen): update common renovate configuration --- java-shared-config/renovate.json | 6 + java-shared-config/synth.metadata | 412 +++++------------------------- 2 files changed, 77 insertions(+), 341 deletions(-) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index f3a70c9703f1..a5cdff45c319 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -58,6 +58,12 @@ "^com.google.cloud:google-cloud-" ], "ignoreUnstable": false + }, + { + "packagePatterns": [ + "^com.fasterxml.jackson.core" + ], + "groupName": "jackson dependencies" } ], "semanticCommits": true diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index b9c8a651780f..28769c16b171 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2020-01-07T09:14:19.430524Z", + "updateTime": "2020-01-16T09:11:02.982025Z", "sources": [ { "template": { @@ -10,215 +10,50 @@ } ], "newFiles": [ - { - "path": ".repo-metadata.json" - }, - { - "path": "renovate.json" - }, - { - "path": "license-checks.xml" - }, - { - "path": "synth.py" - }, - { - "path": "CHANGELOG.md" - }, - { - "path": "codecov.yaml" - }, - { - "path": "LICENSE" - }, - { - "path": ".gitignore" - }, { "path": "pom.xml" }, { - "path": "CODE_OF_CONDUCT.md" - }, - { - "path": "synth.metadata" - }, - { - "path": "README.md" - }, - { - "path": "versions.txt" - }, - { - "path": "CONTRIBUTING.md" + "path": ".repo-metadata.json" }, { "path": "java.header" }, { - "path": ".kokoro/build.bat" - }, - { - "path": ".kokoro/build.sh" - }, - { - "path": ".kokoro/dependencies.sh" - }, - { - "path": ".kokoro/common.cfg" - }, - { - "path": ".kokoro/trampoline.sh" - }, - { - "path": ".kokoro/coerce_logs.sh" - }, - { - "path": ".kokoro/linkage-monitor.sh" - }, - { - "path": ".kokoro/continuous/dependencies.cfg" - }, - { - "path": ".kokoro/continuous/samples.cfg" - }, - { - "path": ".kokoro/continuous/java7.cfg" - }, - { - "path": ".kokoro/continuous/java8-osx.cfg" - }, - { - "path": ".kokoro/continuous/java8-win.cfg" - }, - { - "path": ".kokoro/continuous/propose_release.sh" - }, - { - "path": ".kokoro/continuous/lint.cfg" - }, - { - "path": ".kokoro/continuous/java11.cfg" - }, - { - "path": ".kokoro/continuous/common.cfg" - }, - { - "path": ".kokoro/continuous/propose_release.cfg" - }, - { - "path": ".kokoro/continuous/java8.cfg" - }, - { - "path": ".kokoro/continuous/integration.cfg" - }, - { - "path": ".kokoro/release/drop.sh" - }, - { - "path": ".kokoro/release/stage.cfg" - }, - { - "path": ".kokoro/release/promote.cfg" - }, - { - "path": ".kokoro/release/publish_javadoc.cfg" - }, - { - "path": ".kokoro/release/bump_snapshot.cfg" - }, - { - "path": ".kokoro/release/promote.sh" - }, - { - "path": ".kokoro/release/stage.sh" - }, - { - "path": ".kokoro/release/snapshot.sh" - }, - { - "path": ".kokoro/release/snapshot.cfg" - }, - { - "path": ".kokoro/release/common.cfg" - }, - { - "path": ".kokoro/release/bump_snapshot.sh" - }, - { - "path": ".kokoro/release/common.sh" - }, - { - "path": ".kokoro/release/drop.cfg" - }, - { - "path": ".kokoro/release/publish_javadoc.sh" - }, - { - "path": ".kokoro/presubmit/dependencies.cfg" - }, - { - "path": ".kokoro/presubmit/samples.cfg" - }, - { - "path": ".kokoro/presubmit/java7.cfg" - }, - { - "path": ".kokoro/presubmit/java8-osx.cfg" - }, - { - "path": ".kokoro/presubmit/linkage-monitor.cfg" - }, - { - "path": ".kokoro/presubmit/java8-win.cfg" - }, - { - "path": ".kokoro/presubmit/lint.cfg" - }, - { - "path": ".kokoro/presubmit/java11.cfg" - }, - { - "path": ".kokoro/presubmit/common.cfg" - }, - { - "path": ".kokoro/presubmit/clirr.cfg" - }, - { - "path": ".kokoro/presubmit/java8.cfg" + "path": "CONTRIBUTING.md" }, { - "path": ".kokoro/presubmit/integration.cfg" + "path": "synth.metadata" }, { - "path": ".kokoro/nightly/dependencies.cfg" + "path": "renovate.json" }, { - "path": ".kokoro/nightly/samples.cfg" + "path": "versions.txt" }, { - "path": ".kokoro/nightly/java7.cfg" + "path": "synth.py" }, { - "path": ".kokoro/nightly/java8-osx.cfg" + "path": "license-checks.xml" }, { - "path": ".kokoro/nightly/java8-win.cfg" + "path": "CHANGELOG.md" }, { - "path": ".kokoro/nightly/lint.cfg" + "path": "CODE_OF_CONDUCT.md" }, { - "path": ".kokoro/nightly/java11.cfg" + "path": "LICENSE" }, { - "path": ".kokoro/nightly/common.cfg" + "path": "codecov.yaml" }, { - "path": ".kokoro/nightly/java8.cfg" + "path": ".gitignore" }, { - "path": ".kokoro/nightly/integration.cfg" + "path": "README.md" }, { "path": ".github/release-please.yml" @@ -226,284 +61,179 @@ { "path": ".github/PULL_REQUEST_TEMPLATE.md" }, - { - "path": ".github/ISSUE_TEMPLATE/bug_report.md" - }, - { - "path": ".github/ISSUE_TEMPLATE/support_request.md" - }, { "path": ".github/ISSUE_TEMPLATE/feature_request.md" }, { - "path": "__pycache__/synth.cpython-36.pyc" - }, - { - "path": ".git/index" - }, - { - "path": ".git/packed-refs" - }, - { - "path": ".git/HEAD" - }, - { - "path": ".git/description" - }, - { - "path": ".git/config" - }, - { - "path": ".git/shallow" - }, - { - "path": ".git/objects/9d/96c112a0c3d94a1f9ecbebe55601e4f831fd48" - }, - { - "path": ".git/objects/7f/f7c44d5bd90254d3cb8a27bf70cf96536e1522" - }, - { - "path": ".git/objects/7f/810ec7e8ea1917cce8e2aaef22568ec7f5b504" - }, - { - "path": ".git/objects/d6/45695673349e3947e8e5ae42332d0ac3164cd7" - }, - { - "path": ".git/objects/b4/fe918239302fdbe75e0b2bd6c8b1690abf45df" - }, - { - "path": ".git/objects/1c/c91882b93da7fc5415bec586c39d7925d9d9ae" - }, - { - "path": ".git/objects/fa/dd6afc2dfdba6b3d35c169c9984ce1d5b58577" - }, - { - "path": ".git/objects/58/304f32127a995087a2a826d1786906321b13ca" - }, - { - "path": ".git/objects/87/efce51dfa359132d68c5932939de675d735699" - }, - { - "path": ".git/objects/86/efceb4f41f54ea29e3f03e9e0e23935de65ba7" - }, - { - "path": ".git/objects/80/6c23a2de9c7257d188e2c4810bcb1b5956f1e7" - }, - { - "path": ".git/objects/70/9f2b4c73db4ed19af9dac308f9bd1d7f94f046" - }, - { - "path": ".git/objects/75/4e30c68a00fccdb4f58f2d331f8709da8bf0ce" - }, - { - "path": ".git/objects/75/4446a93c59ffdd4d596ebaa06fc1e804993ee2" - }, - { - "path": ".git/objects/13/c74e459d6a9e58764c95e2e5915a5896bb3550" - }, - { - "path": ".git/objects/2a/c35459ecc11067adb615bf23bce3bbbc1fdeaf" - }, - { - "path": ".git/objects/42/7c14833e1ef4aa6885b691dffbfaf7a852dc62" - }, - { - "path": ".git/objects/6b/2238bb75e0a238278b3ce8c7ce3fe76b0ab7a4" - }, - { - "path": ".git/objects/1f/a95fa537a3e7bb9f9cbdbf0120cf0894845973" - }, - { - "path": ".git/objects/cb/1ab503b7e35efde64bb3caa593e25d63c64a1d" - }, - { - "path": ".git/objects/cb/24f44eea3b43ebbbbfaec7fd663bf7c762413a" - }, - { - "path": ".git/objects/22/245df8165b6474dd8b5302a9dc89a7fa9b85c0" - }, - { - "path": ".git/objects/02/b713a06a557aa844f08472c8adf1a85d5c0b8e" - }, - { - "path": ".git/objects/c5/d99e7d09f1799f7f79e4082bb60265b3920235" - }, - { - "path": ".git/objects/ba/17ce01466baca99d6ec9aa01c0fdbb0aa2035f" - }, - { - "path": ".git/objects/99/5869032125fb2e0d6830a2898ea07e0c061499" - }, - { - "path": ".git/objects/3c/482cbc55f126bf64b230f51c31b47ee7444eca" + "path": ".github/ISSUE_TEMPLATE/support_request.md" }, { - "path": ".git/objects/56/abc2c617b76bb3459b7aaba897a7fa3895f873" + "path": ".github/ISSUE_TEMPLATE/bug_report.md" }, { - "path": ".git/objects/eb/bb59e5310f80a2b1b9ec6dba27b4a871d7ad77" + "path": ".kokoro/build.sh" }, { - "path": ".git/objects/09/8168a7373cddb2bbe4427ae1c909800f18b590" + "path": ".kokoro/common.cfg" }, { - "path": ".git/objects/d0/14232c57bf970000b8882e41ed942f9c44a789" + "path": ".kokoro/build.bat" }, { - "path": ".git/objects/57/24ea9478d717c05010eae9ac2dbd62fc0d8324" + "path": ".kokoro/linkage-monitor.sh" }, { - "path": ".git/objects/cc/8366024550d495ee4647c38c6a949749e3cb5c" + "path": ".kokoro/coerce_logs.sh" }, { - "path": ".git/objects/82/7446828034abb719df29ff88f7b37c79a95766" + "path": ".kokoro/dependencies.sh" }, { - "path": ".git/objects/04/4a22c4fcbf96361549c7ef5ae1598665fc9297" + "path": ".kokoro/trampoline.sh" }, { - "path": ".git/objects/8f/8965cb456479ec3bdf564ec09649f5b6ebd545" + "path": ".kokoro/continuous/samples.cfg" }, { - "path": ".git/objects/a9/39472e1c6b5ff7e2fc4598f93e817791af4ac3" + "path": ".kokoro/continuous/java8.cfg" }, { - "path": ".git/objects/3b/017fc80f04b84c231cb792308d1ceae48375de" + "path": ".kokoro/continuous/integration.cfg" }, { - "path": ".git/objects/3b/7dd4b87832789f7ca852c05c5a8946a9a043ff" + "path": ".kokoro/continuous/java11.cfg" }, { - "path": ".git/objects/15/53fb75a8071df859400c4432ccaafe335dca95" + "path": ".kokoro/continuous/propose_release.cfg" }, { - "path": ".git/objects/6d/323c8ae768078404d0c427bed6c610aac336ae" + "path": ".kokoro/continuous/common.cfg" }, { - "path": ".git/objects/f5/9b9baf80e30bca82dece630058fc9ec0330edb" + "path": ".kokoro/continuous/propose_release.sh" }, { - "path": ".git/objects/2c/137534ca56d41afd474eed8bb99d225a2ea99f" + "path": ".kokoro/continuous/java7.cfg" }, { - "path": ".git/objects/3a/9b503aa24fe32edbe535ea2c738bd3acf437b4" + "path": ".kokoro/continuous/lint.cfg" }, { - "path": ".git/objects/5c/f7ba49e6bb7a1805c5b6f3d04461eaae6c0b58" + "path": ".kokoro/continuous/java8-osx.cfg" }, { - "path": ".git/objects/5c/4551efa2c0bf28182078ef9843c736f35f8a88" + "path": ".kokoro/continuous/dependencies.cfg" }, { - "path": ".git/objects/5c/f31b784945c2dceba3bc4e3c65f1556a8772a2" + "path": ".kokoro/continuous/java8-win.cfg" }, { - "path": ".git/objects/ec/572442e2e79abe9f00dc8214a08ac5302d90fd" + "path": ".kokoro/nightly/samples.cfg" }, { - "path": ".git/objects/6e/3f65999b3da8f4bfcd1b1741799958953be862" + "path": ".kokoro/nightly/java8.cfg" }, { - "path": ".git/objects/6e/ec4f1b6242ecb08171565aa44df160bcb026f2" + "path": ".kokoro/nightly/integration.cfg" }, { - "path": ".git/objects/14/1f90c13c56d6ab627e11aa861f2636bc1f0ed2" + "path": ".kokoro/nightly/java11.cfg" }, { - "path": ".git/objects/14/f44ff859bbd675a7ca0d5627c1c30b636911fa" + "path": ".kokoro/nightly/common.cfg" }, { - "path": ".git/objects/3e/124ff169a52928804ddf3bb4284feaafd120b5" + "path": ".kokoro/nightly/java7.cfg" }, { - "path": ".git/objects/23/aed64542bfda2f409508fc183c22b93db4d269" + "path": ".kokoro/nightly/lint.cfg" }, { - "path": ".git/objects/c2/2797880be8ef05daf57902c6cb9fa1161de820" + "path": ".kokoro/nightly/java8-osx.cfg" }, { - "path": ".git/objects/ac/4f9feb31d02b11a085a18c6f0cb4041f9084f4" + "path": ".kokoro/nightly/dependencies.cfg" }, { - "path": ".git/objects/65/97fced808e81942a9630c70edf4729de93e57c" + "path": ".kokoro/nightly/java8-win.cfg" }, { - "path": ".git/objects/9f/5a161066aedd679ec3a1c0ef5d56c835a3eb7e" + "path": ".kokoro/release/publish_javadoc.cfg" }, { - "path": ".git/objects/dc/2936ef76a81a2984b8461d4d0d09ce533a3dce" + "path": ".kokoro/release/common.sh" }, { - "path": ".git/objects/1e/0179ae282df70e05bab17db21e4abcd6426155" + "path": ".kokoro/release/promote.sh" }, { - "path": ".git/objects/0b/d0ee0620f9f1b6de097d93928204fd3af6aa16" + "path": ".kokoro/release/common.cfg" }, { - "path": ".git/objects/27/f2c6306af5bcea9f358691f0b21f3cbb84ea35" + "path": ".kokoro/release/publish_javadoc.sh" }, { - "path": ".git/objects/fe/69c01c3931138d4ffdb4f02ee1370693703e7c" + "path": ".kokoro/release/drop.sh" }, { - "path": ".git/objects/43/1f83037dcd18b9679e40ef0aac1297abdb21b2" + "path": ".kokoro/release/stage.sh" }, { - "path": ".git/refs/remotes/origin/HEAD" + "path": ".kokoro/release/promote.cfg" }, { - "path": ".git/refs/heads/autosynth" + "path": ".kokoro/release/snapshot.cfg" }, { - "path": ".git/refs/heads/master" + "path": ".kokoro/release/bump_snapshot.cfg" }, { - "path": ".git/hooks/pre-applypatch.sample" + "path": ".kokoro/release/drop.cfg" }, { - "path": ".git/hooks/pre-commit.sample" + "path": ".kokoro/release/bump_snapshot.sh" }, { - "path": ".git/hooks/fsmonitor-watchman.sample" + "path": ".kokoro/release/stage.cfg" }, { - "path": ".git/hooks/pre-rebase.sample" + "path": ".kokoro/release/snapshot.sh" }, { - "path": ".git/hooks/update.sample" + "path": ".kokoro/presubmit/samples.cfg" }, { - "path": ".git/hooks/pre-push.sample" + "path": ".kokoro/presubmit/java8.cfg" }, { - "path": ".git/hooks/applypatch-msg.sample" + "path": ".kokoro/presubmit/integration.cfg" }, { - "path": ".git/hooks/prepare-commit-msg.sample" + "path": ".kokoro/presubmit/java11.cfg" }, { - "path": ".git/hooks/commit-msg.sample" + "path": ".kokoro/presubmit/linkage-monitor.cfg" }, { - "path": ".git/hooks/post-update.sample" + "path": ".kokoro/presubmit/common.cfg" }, { - "path": ".git/hooks/pre-receive.sample" + "path": ".kokoro/presubmit/java7.cfg" }, { - "path": ".git/info/exclude" + "path": ".kokoro/presubmit/lint.cfg" }, { - "path": ".git/logs/HEAD" + "path": ".kokoro/presubmit/java8-osx.cfg" }, { - "path": ".git/logs/refs/remotes/origin/HEAD" + "path": ".kokoro/presubmit/dependencies.cfg" }, { - "path": ".git/logs/refs/heads/autosynth" + "path": ".kokoro/presubmit/clirr.cfg" }, { - "path": ".git/logs/refs/heads/master" + "path": ".kokoro/presubmit/java8-win.cfg" } ] } \ No newline at end of file From d6c6350df496349c2350707ac2a8f347e2e0c1eb Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 27 Jan 2020 10:47:53 -0800 Subject: [PATCH 074/794] fix: declare com.coveo:fmt-maven-plugin version/configuration (#90) --- java-shared-config/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 53a821aa7e47..e8b84c058fec 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -195,6 +195,15 @@ clirr-maven-plugin 2.8 + + com.coveo + fmt-maven-plugin + 2.9 + + + true + + From 9663cb286d5ad12b62554b795636889b8dec67ac Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 31 Jan 2020 09:34:08 -0800 Subject: [PATCH 075/794] chore: group guava with other core dependencies --- java-shared-config/renovate.json | 3 +- java-shared-config/synth.metadata | 229 +----------------------------- 2 files changed, 3 insertions(+), 229 deletions(-) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index a5cdff45c319..268a4669abfd 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -22,7 +22,8 @@ "^com.google.api:gax", "^com.google.auth:", "^com.google.cloud:google-cloud-core", - "^io.grpc:" + "^io.grpc:", + "^com.google.guava:" ], "groupName": "core dependencies" }, diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 28769c16b171..eaed3228b949 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2020-01-16T09:11:02.982025Z", + "updateTime": "2020-01-31T09:14:02.265122Z", "sources": [ { "template": { @@ -8,232 +8,5 @@ "version": "2019.10.17" } } - ], - "newFiles": [ - { - "path": "pom.xml" - }, - { - "path": ".repo-metadata.json" - }, - { - "path": "java.header" - }, - { - "path": "CONTRIBUTING.md" - }, - { - "path": "synth.metadata" - }, - { - "path": "renovate.json" - }, - { - "path": "versions.txt" - }, - { - "path": "synth.py" - }, - { - "path": "license-checks.xml" - }, - { - "path": "CHANGELOG.md" - }, - { - "path": "CODE_OF_CONDUCT.md" - }, - { - "path": "LICENSE" - }, - { - "path": "codecov.yaml" - }, - { - "path": ".gitignore" - }, - { - "path": "README.md" - }, - { - "path": ".github/release-please.yml" - }, - { - "path": ".github/PULL_REQUEST_TEMPLATE.md" - }, - { - "path": ".github/ISSUE_TEMPLATE/feature_request.md" - }, - { - "path": ".github/ISSUE_TEMPLATE/support_request.md" - }, - { - "path": ".github/ISSUE_TEMPLATE/bug_report.md" - }, - { - "path": ".kokoro/build.sh" - }, - { - "path": ".kokoro/common.cfg" - }, - { - "path": ".kokoro/build.bat" - }, - { - "path": ".kokoro/linkage-monitor.sh" - }, - { - "path": ".kokoro/coerce_logs.sh" - }, - { - "path": ".kokoro/dependencies.sh" - }, - { - "path": ".kokoro/trampoline.sh" - }, - { - "path": ".kokoro/continuous/samples.cfg" - }, - { - "path": ".kokoro/continuous/java8.cfg" - }, - { - "path": ".kokoro/continuous/integration.cfg" - }, - { - "path": ".kokoro/continuous/java11.cfg" - }, - { - "path": ".kokoro/continuous/propose_release.cfg" - }, - { - "path": ".kokoro/continuous/common.cfg" - }, - { - "path": ".kokoro/continuous/propose_release.sh" - }, - { - "path": ".kokoro/continuous/java7.cfg" - }, - { - "path": ".kokoro/continuous/lint.cfg" - }, - { - "path": ".kokoro/continuous/java8-osx.cfg" - }, - { - "path": ".kokoro/continuous/dependencies.cfg" - }, - { - "path": ".kokoro/continuous/java8-win.cfg" - }, - { - "path": ".kokoro/nightly/samples.cfg" - }, - { - "path": ".kokoro/nightly/java8.cfg" - }, - { - "path": ".kokoro/nightly/integration.cfg" - }, - { - "path": ".kokoro/nightly/java11.cfg" - }, - { - "path": ".kokoro/nightly/common.cfg" - }, - { - "path": ".kokoro/nightly/java7.cfg" - }, - { - "path": ".kokoro/nightly/lint.cfg" - }, - { - "path": ".kokoro/nightly/java8-osx.cfg" - }, - { - "path": ".kokoro/nightly/dependencies.cfg" - }, - { - "path": ".kokoro/nightly/java8-win.cfg" - }, - { - "path": ".kokoro/release/publish_javadoc.cfg" - }, - { - "path": ".kokoro/release/common.sh" - }, - { - "path": ".kokoro/release/promote.sh" - }, - { - "path": ".kokoro/release/common.cfg" - }, - { - "path": ".kokoro/release/publish_javadoc.sh" - }, - { - "path": ".kokoro/release/drop.sh" - }, - { - "path": ".kokoro/release/stage.sh" - }, - { - "path": ".kokoro/release/promote.cfg" - }, - { - "path": ".kokoro/release/snapshot.cfg" - }, - { - "path": ".kokoro/release/bump_snapshot.cfg" - }, - { - "path": ".kokoro/release/drop.cfg" - }, - { - "path": ".kokoro/release/bump_snapshot.sh" - }, - { - "path": ".kokoro/release/stage.cfg" - }, - { - "path": ".kokoro/release/snapshot.sh" - }, - { - "path": ".kokoro/presubmit/samples.cfg" - }, - { - "path": ".kokoro/presubmit/java8.cfg" - }, - { - "path": ".kokoro/presubmit/integration.cfg" - }, - { - "path": ".kokoro/presubmit/java11.cfg" - }, - { - "path": ".kokoro/presubmit/linkage-monitor.cfg" - }, - { - "path": ".kokoro/presubmit/common.cfg" - }, - { - "path": ".kokoro/presubmit/java7.cfg" - }, - { - "path": ".kokoro/presubmit/lint.cfg" - }, - { - "path": ".kokoro/presubmit/java8-osx.cfg" - }, - { - "path": ".kokoro/presubmit/dependencies.cfg" - }, - { - "path": ".kokoro/presubmit/clirr.cfg" - }, - { - "path": ".kokoro/presubmit/java8-win.cfg" - } ] } \ No newline at end of file From b876954dc0ad297c75c4f8b904ec136454db6323 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 3 Feb 2020 10:13:14 -0800 Subject: [PATCH 076/794] chore: linkage monitor check should skipp clirr and enforcer --- java-shared-config/.kokoro/linkage-monitor.sh | 7 ++++++- java-shared-config/synth.metadata | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.kokoro/linkage-monitor.sh b/java-shared-config/.kokoro/linkage-monitor.sh index 56abc2c617b7..70eaee03afae 100755 --- a/java-shared-config/.kokoro/linkage-monitor.sh +++ b/java-shared-config/.kokoro/linkage-monitor.sh @@ -23,7 +23,12 @@ cd github/java-shared-config/ java -version echo ${JOB_TYPE} -mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V +mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.javadoc.skip=true \ + -Dgcloud.download.skip=true # Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR JAR=linkage-monitor-latest-all-deps.jar diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index eaed3228b949..c4df984a9280 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2020-01-31T09:14:02.265122Z", + "updateTime": "2020-02-01T09:13:31.413508Z", "sources": [ { "template": { From fb9875d37176b6a9d81471eaeeb9c9cfe0152fed Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 24 Feb 2020 11:14:40 -0800 Subject: [PATCH 077/794] chore: update common templates This PR was generated using Autosynth. :rainbow: Commits in this repo since last synth:
Log from Synthtool ``` synthtool > Executing /tmpfs/src/git/autosynth/working_repo/synth.py. On branch autosynth nothing to commit, working tree clean HEAD detached at FETCH_HEAD nothing to commit, working tree clean .github/ISSUE_TEMPLATE/bug_report.md .github/ISSUE_TEMPLATE/feature_request.md .github/ISSUE_TEMPLATE/support_request.md .github/PULL_REQUEST_TEMPLATE.md .github/release-please.yml .kokoro/build.bat .kokoro/build.sh .kokoro/coerce_logs.sh .kokoro/common.cfg .kokoro/continuous/common.cfg .kokoro/continuous/dependencies.cfg .kokoro/continuous/integration.cfg .kokoro/continuous/java11.cfg .kokoro/continuous/java7.cfg .kokoro/continuous/java8-osx.cfg .kokoro/continuous/java8-win.cfg .kokoro/continuous/java8.cfg .kokoro/continuous/lint.cfg .kokoro/continuous/propose_release.cfg .kokoro/continuous/propose_release.sh .kokoro/continuous/samples.cfg .kokoro/dependencies.sh .kokoro/linkage-monitor.sh .kokoro/nightly/common.cfg .kokoro/nightly/dependencies.cfg .kokoro/nightly/integration.cfg .kokoro/nightly/java11.cfg .kokoro/nightly/java7.cfg .kokoro/nightly/java8-osx.cfg .kokoro/nightly/java8-win.cfg .kokoro/nightly/java8.cfg .kokoro/nightly/lint.cfg .kokoro/nightly/samples.cfg .kokoro/presubmit/clirr.cfg .kokoro/presubmit/common.cfg .kokoro/presubmit/dependencies.cfg .kokoro/presubmit/integration.cfg .kokoro/presubmit/java11.cfg .kokoro/presubmit/java7.cfg .kokoro/presubmit/java8-osx.cfg .kokoro/presubmit/java8-win.cfg .kokoro/presubmit/java8.cfg .kokoro/presubmit/linkage-monitor.cfg .kokoro/presubmit/lint.cfg .kokoro/presubmit/samples.cfg .kokoro/release/bump_snapshot.cfg .kokoro/release/bump_snapshot.sh .kokoro/release/common.cfg .kokoro/release/common.sh .kokoro/release/drop.cfg .kokoro/release/drop.sh .kokoro/release/promote.cfg .kokoro/release/promote.sh .kokoro/release/publish_javadoc.cfg .kokoro/release/publish_javadoc.sh .kokoro/release/snapshot.cfg .kokoro/release/snapshot.sh .kokoro/release/stage.cfg .kokoro/release/stage.sh .kokoro/trampoline.sh CODE_OF_CONDUCT.md CONTRIBUTING.md LICENSE README.md codecov.yaml java.header license-checks.xml renovate.json synthtool > Wrote metadata to synth.metadata. ```
--- java-shared-config/.kokoro/build.sh | 23 +++++++++++++++-------- java-shared-config/renovate.json | 7 +++++++ java-shared-config/synth.metadata | 18 ++++++++++++++++-- 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index f1ae58408da5..d11958c5a67e 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -62,14 +62,21 @@ integration) bash .kokoro/coerce_logs.sh ;; samples) - mvn -B \ - -Penable-samples \ - -DtrimStackTrace=false \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -fae \ - verify - bash .kokoro/coerce_logs.sh + if [[ -f samples/pom.xml ]] + then + pushd samples + mvn -B \ + -Penable-samples \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify + bash .kokoro/coerce_logs.sh + popd + else + echo "no sample pom.xml found - skipping sample tests" + fi ;; clirr) mvn -B -Denforcer.skip=true clirr:check diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index 268a4669abfd..fc6412701ada 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -54,6 +54,13 @@ "semanticCommitType": "build", "semanticCommitScope": "deps" }, + { + "packagePatterns": [ + "^com.google.cloud:libraries-bom" + ], + "semanticCommitType": "chore", + "semanticCommitScope": "deps" + }, { "packagePatterns": [ "^com.google.cloud:google-cloud-" diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index c4df984a9280..f14518fd508d 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,11 +1,25 @@ { - "updateTime": "2020-02-01T09:13:31.413508Z", + "updateTime": "2020-02-21T23:10:46.787999Z", "sources": [ + { + "git": { + "name": ".", + "remote": "https://github.com/googleapis/java-shared-config.git", + "sha": "1dfe2847cbd18a015e555585ea4e5ef779af29ce" + } + }, + { + "git": { + "name": "synthtool", + "remote": "rpc://devrel/cloud/libraries/tools/autosynth", + "sha": "706a38c26db42299845396cdae55db635c38794a" + } + }, { "template": { "name": "java_library", "origin": "synthtool.gcp", - "version": "2019.10.17" + "version": "2020.2.4" } } ] From c2d6c97cf8ade222d21932cd5c5ada915af6d130 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 24 Feb 2020 21:45:17 +0100 Subject: [PATCH 078/794] deps: update dependency com.puppycrawl.tools:checkstyle to v8.29 This PR contains the following updates: | Package | Update | Change | |---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | minor | `8.24` -> `8.29` | --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e8b84c058fec..923f4c13b3ef 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -534,7 +534,7 @@ com.puppycrawl.tools checkstyle - 8.24 + 8.29 From 1b45536f42db937078eebd942742e3a53be2d142 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 24 Feb 2020 21:45:45 +0100 Subject: [PATCH 079/794] build(deps): update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.1.1 This PR contains the following updates: | Package | Update | Change | |---|---|---| | org.apache.maven.plugins:maven-checkstyle-plugin | patch | `3.1.0` -> `3.1.1` | --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 923f4c13b3ef..83a64c75d432 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -529,7 +529,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.0 + 3.1.1 com.puppycrawl.tools From 75f5db2287759493e4160601ff9e00349bcedb9e Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 25 Feb 2020 13:06:13 -0800 Subject: [PATCH 080/794] chore: only allow renovate-bot for trusted-contribution auto-labeling (#95) Co-authored-by: gcf-merge-on-green[bot] <60162190+gcf-merge-on-green[bot]@users.noreply.github.com> --- java-shared-config/.github/trusted-contribution.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 java-shared-config/.github/trusted-contribution.yml diff --git a/java-shared-config/.github/trusted-contribution.yml b/java-shared-config/.github/trusted-contribution.yml new file mode 100644 index 000000000000..f247d5c78934 --- /dev/null +++ b/java-shared-config/.github/trusted-contribution.yml @@ -0,0 +1,2 @@ +trustedContributors: +- renovate-bot \ No newline at end of file From 217478036159bb277acdb3076565679ead9f98de Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 25 Feb 2020 16:28:59 -0800 Subject: [PATCH 081/794] chore: update common templates (#100) --- java-shared-config/.kokoro/build.sh | 30 ++++++++++++++++--- .../.kokoro/continuous/java8.cfg | 5 ++++ .../.kokoro/nightly/integration.cfg | 14 +++++++++ java-shared-config/.kokoro/nightly/java8.cfg | 5 ++++ .../.kokoro/nightly/samples.cfg | 21 ++++++++----- .../.kokoro/presubmit/java8.cfg | 5 ++++ java-shared-config/synth.metadata | 16 +--------- 7 files changed, 69 insertions(+), 27 deletions(-) diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index d11958c5a67e..3b3f3ce46e44 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -37,19 +37,23 @@ if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTI export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS}) fi +RETURN_CODE=0 +set +e + case ${JOB_TYPE} in test) mvn test -B -Dclirr.skip=true -Denforcer.skip=true - bash ${KOKORO_GFILE_DIR}/codecov.sh - bash .kokoro/coerce_logs.sh + RETURN_CODE=$? ;; lint) mvn \ -Penable-samples \ com.coveo:fmt-maven-plugin:check + RETURN_CODE=$? ;; javadoc) mvn javadoc:javadoc javadoc:test-javadoc + RETURN_CODE=$? ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ @@ -59,7 +63,7 @@ integration) -Denforcer.skip=true \ -fae \ verify - bash .kokoro/coerce_logs.sh + RETURN_CODE=$? ;; samples) if [[ -f samples/pom.xml ]] @@ -72,7 +76,7 @@ samples) -Denforcer.skip=true \ -fae \ verify - bash .kokoro/coerce_logs.sh + RETURN_CODE=$? popd else echo "no sample pom.xml found - skipping sample tests" @@ -80,7 +84,25 @@ samples) ;; clirr) mvn -B -Denforcer.skip=true clirr:check + RETURN_CODE=$? ;; *) ;; esac + +if [ "${REPORT_COVERAGE}" == "true" ] +then + bash ${KOKORO_GFILE_DIR}/codecov.sh +fi + +# fix output location of logs +bash .kokoro/coerce_logs.sh + +if [[ "${ENABLE_BUILD_COP}" == "true" ]] +then + chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop + ${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/java-shared-config +fi + +echo "exiting with ${RETURN_CODE}" +exit ${RETURN_CODE} diff --git a/java-shared-config/.kokoro/continuous/java8.cfg b/java-shared-config/.kokoro/continuous/java8.cfg index 3b017fc80f04..495cc7bacd63 100644 --- a/java-shared-config/.kokoro/continuous/java8.cfg +++ b/java-shared-config/.kokoro/continuous/java8.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "REPORT_COVERAGE" + value: "true" +} diff --git a/java-shared-config/.kokoro/nightly/integration.cfg b/java-shared-config/.kokoro/nightly/integration.cfg index 3b017fc80f04..8bf59c02edd6 100644 --- a/java-shared-config/.kokoro/nightly/integration.cfg +++ b/java-shared-config/.kokoro/nightly/integration.cfg @@ -5,3 +5,17 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/java-shared-config/.kokoro/nightly/java8.cfg b/java-shared-config/.kokoro/nightly/java8.cfg index 3b017fc80f04..495cc7bacd63 100644 --- a/java-shared-config/.kokoro/nightly/java8.cfg +++ b/java-shared-config/.kokoro/nightly/java8.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "REPORT_COVERAGE" + value: "true" +} diff --git a/java-shared-config/.kokoro/nightly/samples.cfg b/java-shared-config/.kokoro/nightly/samples.cfg index 9a9102490d54..b4b051cd016f 100644 --- a/java-shared-config/.kokoro/nightly/samples.cfg +++ b/java-shared-config/.kokoro/nightly/samples.cfg @@ -2,23 +2,28 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" } env_vars: { - key: "JOB_TYPE" - value: "samples" + key: "JOB_TYPE" + value: "samples" } env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" + key: "GCLOUD_PROJECT" + value: "gcloud-devel" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" } before_action { diff --git a/java-shared-config/.kokoro/presubmit/java8.cfg b/java-shared-config/.kokoro/presubmit/java8.cfg index 3b017fc80f04..495cc7bacd63 100644 --- a/java-shared-config/.kokoro/presubmit/java8.cfg +++ b/java-shared-config/.kokoro/presubmit/java8.cfg @@ -5,3 +5,8 @@ env_vars: { key: "TRAMPOLINE_IMAGE" value: "gcr.io/cloud-devrel-kokoro-resources/java8" } + +env_vars: { + key: "REPORT_COVERAGE" + value: "true" +} diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index f14518fd508d..de45afc6ef1f 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,20 +1,6 @@ { - "updateTime": "2020-02-21T23:10:46.787999Z", + "updateTime": "2020-02-24T23:15:15.882653Z", "sources": [ - { - "git": { - "name": ".", - "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "1dfe2847cbd18a015e555585ea4e5ef779af29ce" - } - }, - { - "git": { - "name": "synthtool", - "remote": "rpc://devrel/cloud/libraries/tools/autosynth", - "sha": "706a38c26db42299845396cdae55db635c38794a" - } - }, { "template": { "name": "java_library", From 2c85be30a2e786ad518d1d3248cd4275bb5406e6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 16 Mar 2020 16:12:28 +0100 Subject: [PATCH 082/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.2.0 (#109) This PR contains the following updates: | Package | Update | Change | |---|---|---| | org.apache.maven.plugins:maven-javadoc-plugin | minor | `3.1.1` -> `3.2.0` | --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-shared-config). --- java-shared-config/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 83a64c75d432..0f65974394e5 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -382,7 +382,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 html @@ -467,7 +467,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.1.1 + 3.2.0 attach-javadocs From 26bd3cdb037b1ebe1daa83c36f01a7aac5ee42a0 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 16 Mar 2020 08:29:09 -0700 Subject: [PATCH 083/794] chore: update PR template (#108) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2020-03-14 02:16:48,104 synthtool > Executing /tmpfs/src/git/autosynth/working_repo/synth.py. .github/ISSUE_TEMPLATE/bug_report.md .github/ISSUE_TEMPLATE/feature_request.md .github/ISSUE_TEMPLATE/support_request.md .github/PULL_REQUEST_TEMPLATE.md .github/release-please.yml .github/trusted-contribution.yml .kokoro/build.bat .kokoro/build.sh .kokoro/coerce_logs.sh .kokoro/common.cfg .kokoro/continuous/common.cfg .kokoro/continuous/dependencies.cfg .kokoro/continuous/integration.cfg .kokoro/continuous/java11.cfg .kokoro/continuous/java7.cfg .kokoro/continuous/java8-osx.cfg .kokoro/continuous/java8-win.cfg .kokoro/continuous/java8.cfg .kokoro/continuous/lint.cfg .kokoro/continuous/propose_release.cfg .kokoro/continuous/samples.cfg .kokoro/dependencies.sh .kokoro/linkage-monitor.sh .kokoro/nightly/common.cfg .kokoro/nightly/dependencies.cfg .kokoro/nightly/integration.cfg .kokoro/nightly/java11.cfg .kokoro/nightly/java7.cfg .kokoro/nightly/java8-osx.cfg .kokoro/nightly/java8-win.cfg .kokoro/nightly/java8.cfg .kokoro/nightly/lint.cfg .kokoro/nightly/samples.cfg .kokoro/presubmit/clirr.cfg .kokoro/presubmit/common.cfg .kokoro/presubmit/dependencies.cfg .kokoro/presubmit/integration.cfg .kokoro/presubmit/java11.cfg .kokoro/presubmit/java7.cfg .kokoro/presubmit/java8-osx.cfg .kokoro/presubmit/java8-win.cfg .kokoro/presubmit/java8.cfg .kokoro/presubmit/linkage-monitor.cfg .kokoro/presubmit/lint.cfg .kokoro/presubmit/samples.cfg .kokoro/release/bump_snapshot.cfg .kokoro/release/common.cfg .kokoro/release/common.sh .kokoro/release/drop.cfg .kokoro/release/drop.sh .kokoro/release/promote.cfg .kokoro/release/promote.sh .kokoro/release/publish_javadoc.cfg .kokoro/release/publish_javadoc.sh .kokoro/release/snapshot.cfg .kokoro/release/snapshot.sh .kokoro/release/stage.cfg .kokoro/release/stage.sh .kokoro/trampoline.sh CODE_OF_CONDUCT.md CONTRIBUTING.md LICENSE README.md codecov.yaml java.header license-checks.xml renovate.json 2020-03-14 02:16:48,303 synthtool > Wrote metadata to synth.metadata. ```
--- java-shared-config/.github/PULL_REQUEST_TEMPLATE.md | 8 +++++++- java-shared-config/synth.metadata | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.github/PULL_REQUEST_TEMPLATE.md b/java-shared-config/.github/PULL_REQUEST_TEMPLATE.md index 0bd0ee0620f9..c016681712a2 100644 --- a/java-shared-config/.github/PULL_REQUEST_TEMPLATE.md +++ b/java-shared-config/.github/PULL_REQUEST_TEMPLATE.md @@ -1 +1,7 @@ -Fixes # (it's a good idea to open an issue first for context and/or discussion) \ No newline at end of file +Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: +- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/java-shared-config/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea +- [ ] Ensure the tests and linter pass +- [ ] Code coverage does not decrease (if any source code was changed) +- [ ] Appropriate docs were updated (if necessary) + +Fixes # ☕️ diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index de45afc6ef1f..5bb76e7b0d59 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2020-02-24T23:15:15.882653Z", + "updateTime": "2020-03-14T09:16:48.303278Z", "sources": [ { "template": { From b5655464d921084efecc2a90bd348642ee9b8f9a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 17 Mar 2020 16:12:22 -0700 Subject: [PATCH 084/794] samples: scaffold pom.xml files (#111) This PR was generated using Autosynth. :rainbow:
Log from Synthtool ``` 2020-03-17 12:21:36,422 synthtool > Executing /tmpfs/src/git/autosynth/working_repo/synth.py. .github/ISSUE_TEMPLATE/bug_report.md .github/ISSUE_TEMPLATE/feature_request.md .github/ISSUE_TEMPLATE/support_request.md .github/PULL_REQUEST_TEMPLATE.md .github/release-please.yml .github/trusted-contribution.yml .kokoro/build.bat .kokoro/build.sh .kokoro/coerce_logs.sh .kokoro/common.cfg .kokoro/continuous/common.cfg .kokoro/continuous/dependencies.cfg .kokoro/continuous/integration.cfg .kokoro/continuous/java11.cfg .kokoro/continuous/java7.cfg .kokoro/continuous/java8-osx.cfg .kokoro/continuous/java8-win.cfg .kokoro/continuous/java8.cfg .kokoro/continuous/lint.cfg .kokoro/continuous/propose_release.cfg .kokoro/continuous/samples.cfg .kokoro/dependencies.sh .kokoro/linkage-monitor.sh .kokoro/nightly/common.cfg .kokoro/nightly/dependencies.cfg .kokoro/nightly/integration.cfg .kokoro/nightly/java11.cfg .kokoro/nightly/java7.cfg .kokoro/nightly/java8-osx.cfg .kokoro/nightly/java8-win.cfg .kokoro/nightly/java8.cfg .kokoro/nightly/lint.cfg .kokoro/nightly/samples.cfg .kokoro/presubmit/clirr.cfg .kokoro/presubmit/common.cfg .kokoro/presubmit/dependencies.cfg .kokoro/presubmit/integration.cfg .kokoro/presubmit/java11.cfg .kokoro/presubmit/java7.cfg .kokoro/presubmit/java8-osx.cfg .kokoro/presubmit/java8-win.cfg .kokoro/presubmit/java8.cfg .kokoro/presubmit/linkage-monitor.cfg .kokoro/presubmit/lint.cfg .kokoro/presubmit/samples.cfg .kokoro/release/bump_snapshot.cfg .kokoro/release/common.cfg .kokoro/release/common.sh .kokoro/release/drop.cfg .kokoro/release/drop.sh .kokoro/release/promote.cfg .kokoro/release/promote.sh .kokoro/release/publish_javadoc.cfg .kokoro/release/publish_javadoc.sh .kokoro/release/snapshot.cfg .kokoro/release/snapshot.sh .kokoro/release/stage.cfg .kokoro/release/stage.sh .kokoro/trampoline.sh CODE_OF_CONDUCT.md CONTRIBUTING.md LICENSE README.md codecov.yaml java.header license-checks.xml renovate.json samples/install-without-bom/pom.xml samples/pom.xml samples/snapshot/pom.xml samples/snippets/pom.xml 2020-03-17 12:21:36,633 synthtool > Wrote metadata to synth.metadata. ```
--- .../samples/install-without-bom/pom.xml | 84 +++++++++++++++++++ java-shared-config/samples/pom.xml | 56 +++++++++++++ java-shared-config/samples/snapshot/pom.xml | 83 ++++++++++++++++++ java-shared-config/samples/snippets/pom.xml | 60 +++++++++++++ java-shared-config/synth.metadata | 2 +- 5 files changed, 284 insertions(+), 1 deletion(-) create mode 100644 java-shared-config/samples/install-without-bom/pom.xml create mode 100644 java-shared-config/samples/pom.xml create mode 100644 java-shared-config/samples/snapshot/pom.xml create mode 100644 java-shared-config/samples/snippets/pom.xml diff --git a/java-shared-config/samples/install-without-bom/pom.xml b/java-shared-config/samples/install-without-bom/pom.xml new file mode 100644 index 000000000000..0be45a59828b --- /dev/null +++ b/java-shared-config/samples/install-without-bom/pom.xml @@ -0,0 +1,84 @@ + + + 4.0.0 + com.google.cloud + google-cloud-shared-config-install-without-bom + jar + Google Google Cloud Shared Build Configs Install Without Bom + https://github.com/googleapis/java-shared-config + + + + com.google.cloud.samples + shared-configuration + 1.0.12 + + + + 1.8 + 1.8 + UTF-8 + + + + + + + google-cloud-shared-config + google-cloud-shared-config + + + + + + junit + junit + 4.13 + test + + + com.google.truth + truth + 1.0.1 + test + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.1.0 + + + add-snippets-source + + add-source + + + + ../snippets/src/main/java + + + + + add-snippets-tests + + add-test-source + + + + ../snippets/src/test/java + + + + + + + + diff --git a/java-shared-config/samples/pom.xml b/java-shared-config/samples/pom.xml new file mode 100644 index 000000000000..7bd2053142d8 --- /dev/null +++ b/java-shared-config/samples/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + com.google.cloud + google-cloud-google-cloud-shared-config-samples + 0.0.1-SNAPSHOT + pom + Google Google Cloud Shared Build Configs Samples Parent + https://github.com/googleapis/java-shared-config + + Java idiomatic client for Google Cloud Platform services. + + + + + com.google.cloud.samples + shared-configuration + 1.0.12 + + + + 1.8 + 1.8 + UTF-8 + + + + install-without-bom + snapshot + snippets + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + true + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + true + + + + + diff --git a/java-shared-config/samples/snapshot/pom.xml b/java-shared-config/samples/snapshot/pom.xml new file mode 100644 index 000000000000..9d99f488972e --- /dev/null +++ b/java-shared-config/samples/snapshot/pom.xml @@ -0,0 +1,83 @@ + + + 4.0.0 + com.google.cloud + google-cloud-shared-config-snapshot + jar + Google Google Cloud Shared Build Configs Snapshot Samples + https://github.com/googleapis/java-shared-config + + + + com.google.cloud.samples + shared-configuration + 1.0.12 + + + + 1.8 + 1.8 + UTF-8 + + + + + + google-cloud-shared-config + google-cloud-shared-config + + + + + junit + junit + 4.13 + test + + + com.google.truth + truth + 1.0.1 + test + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.1.0 + + + add-snippets-source + + add-source + + + + ../snippets/src/main/java + + + + + add-snippets-tests + + add-test-source + + + + ../snippets/src/test/java + + + + + + + + \ No newline at end of file diff --git a/java-shared-config/samples/snippets/pom.xml b/java-shared-config/samples/snippets/pom.xml new file mode 100644 index 000000000000..885854c64ffc --- /dev/null +++ b/java-shared-config/samples/snippets/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + com.google.cloud + google-cloud-shared-config-snippets + jar + Google Google Cloud Shared Build Configs Snippets + https://github.com/googleapis/java-shared-config + + + + com.google.cloud.samples + shared-configuration + 1.0.12 + + + + 1.8 + 1.8 + UTF-8 + + + + + + + + com.google.cloud + libraries-bom + + pom + import + + + + + + + google-cloud-shared-config + google-cloud-shared-config + + + + + junit + junit + 4.13 + test + + + com.google.truth + truth + 1.0.1 + test + + + diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 5bb76e7b0d59..bedd56915815 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2020-03-14T09:16:48.303278Z", + "updateTime": "2020-03-17T19:21:36.633045Z", "sources": [ { "template": { From d2f4b5dbf3e523db6e0a3167eb2b65d2c3c31c73 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 18 Mar 2020 08:56:23 -0700 Subject: [PATCH 085/794] samples: fix snippet closing tag (#112) --- java-shared-config/samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/samples/install-without-bom/pom.xml b/java-shared-config/samples/install-without-bom/pom.xml index 0be45a59828b..866b4ee436db 100644 --- a/java-shared-config/samples/install-without-bom/pom.xml +++ b/java-shared-config/samples/install-without-bom/pom.xml @@ -31,7 +31,7 @@ google-cloud-shared-config - + junit From e6165af5a55ca4f1b0d637866a78f31d6da30f1b Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 23 Mar 2020 16:05:51 -0700 Subject: [PATCH 086/794] chore: use java helper for templates (#113) --- java-shared-config/synth.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/java-shared-config/synth.py b/java-shared-config/synth.py index 2ac35459ecc1..897e7597de7d 100644 --- a/java-shared-config/synth.py +++ b/java-shared-config/synth.py @@ -14,14 +14,9 @@ """This script is used to synthesize generated parts of this library.""" -import synthtool as s -import synthtool.gcp as gcp -import logging -logging.basicConfig(level=logging.DEBUG) -common_templates = gcp.CommonTemplates() -templates = common_templates.java_library() -s.copy(templates, excludes=[ - ".gitignore", +import synthtool.languages.java as java + +java.common_templates(excludes=[ "README.md", ".github/release-please.yml", ]) From 1c1018f8426d85becc82028d8daab94e248f9d66 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 23 Mar 2020 20:56:41 -0700 Subject: [PATCH 087/794] chore: enable context aware commits (#115) --- java-shared-config/synth.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java-shared-config/synth.py b/java-shared-config/synth.py index 897e7597de7d..7656b8913fb9 100644 --- a/java-shared-config/synth.py +++ b/java-shared-config/synth.py @@ -16,6 +16,8 @@ import synthtool.languages.java as java +AUTOSYNTH_MULTIPLE_COMMITS = True + java.common_templates(excludes=[ "README.md", ".github/release-please.yml", From e3e0bd0b502c86e45c5c76aa5686523464edda38 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 24 Mar 2020 12:38:18 -0700 Subject: [PATCH 088/794] chore: fix distribution_name (#117) --- java-shared-config/.repo-metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/.repo-metadata.json b/java-shared-config/.repo-metadata.json index 1553fb75a807..6eb837f18b35 100644 --- a/java-shared-config/.repo-metadata.json +++ b/java-shared-config/.repo-metadata.json @@ -5,5 +5,5 @@ "language": "java", "repo": "googleapis/java-shared-config", "repo_short": "java-shared-config", - "distribution_name": "google-cloud-shared-config" + "distribution_name": "com.google.cloud:google-cloud-shared-config" } From bef549e389295e947ad5364f787af0f00fec6e31 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 25 Mar 2020 22:10:38 -0700 Subject: [PATCH 089/794] chore: update common templates (#119) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/f193fffb-af3a-401a-a8ed-2548fbd8844c/targets --- java-shared-config/.kokoro/build.sh | 19 +++++--- java-shared-config/.kokoro/common.sh | 44 +++++++++++++++++++ java-shared-config/.kokoro/dependencies.sh | 15 +++++-- java-shared-config/.kokoro/linkage-monitor.sh | 22 +++++++--- java-shared-config/renovate.json | 6 ++- java-shared-config/synth.metadata | 10 ++--- 6 files changed, 91 insertions(+), 25 deletions(-) create mode 100644 java-shared-config/.kokoro/common.sh diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index 3b3f3ce46e44..7b0fd0b246ae 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -20,17 +20,22 @@ scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) ## cd to the parent directory, i.e. the root of the git repo cd ${scriptDir}/.. +# include common functions +source ${scriptDir}/common.sh + # Print out Java version java -version echo ${JOB_TYPE} -mvn install -B -V \ - -DskipTests=true \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dmaven.javadoc.skip=true \ - -Dgcloud.download.skip=true \ - -T 1C +# attempt to install 3 times with exponential backoff (starting with 10 seconds) +retry_with_backoff 3 10 \ + mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.javadoc.skip=true \ + -Dgcloud.download.skip=true \ + -T 1C # if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then diff --git a/java-shared-config/.kokoro/common.sh b/java-shared-config/.kokoro/common.sh new file mode 100644 index 000000000000..a3bbc5f67963 --- /dev/null +++ b/java-shared-config/.kokoro/common.sh @@ -0,0 +1,44 @@ +#!/bin/bash +# 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. + +# set -eo pipefail + +function retry_with_backoff { + attempts_left=$1 + sleep_seconds=$2 + shift 2 + command=$@ + + echo "${command}" + ${command} + exit_code=$? + + if [[ $exit_code == 0 ]] + then + return 0 + fi + + # failure + if [[ ${attempts_left} > 0 ]] + then + echo "failure (${exit_code}), sleeping ${sleep_seconds}..." + sleep ${sleep_seconds} + new_attempts=$((${attempts_left} - 1)) + new_sleep=$((${sleep_seconds} * 2)) + retry_with_backoff ${new_attempts} ${new_sleep} ${command} + fi + + return $exit_code +} diff --git a/java-shared-config/.kokoro/dependencies.sh b/java-shared-config/.kokoro/dependencies.sh index cc8366024550..0aade871ce10 100755 --- a/java-shared-config/.kokoro/dependencies.sh +++ b/java-shared-config/.kokoro/dependencies.sh @@ -15,7 +15,13 @@ set -eo pipefail -cd github/java-shared-config/ +## Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +# include common functions +source ${scriptDir}/common.sh # Print out Java java -version @@ -24,8 +30,9 @@ echo $JOB_TYPE export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" # this should run maven enforcer -mvn install -B -V \ - -DskipTests=true \ - -Dclirr.skip=true +retry_with_backoff 3 10 \ + mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true diff --git a/java-shared-config/.kokoro/linkage-monitor.sh b/java-shared-config/.kokoro/linkage-monitor.sh index 70eaee03afae..759ab4e2c220 100755 --- a/java-shared-config/.kokoro/linkage-monitor.sh +++ b/java-shared-config/.kokoro/linkage-monitor.sh @@ -17,18 +17,26 @@ set -eo pipefail # Display commands being run. set -x -cd github/java-shared-config/ +## Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +# include common functions +source ${scriptDir}/common.sh # Print out Java version java -version echo ${JOB_TYPE} -mvn install -B -V \ - -DskipTests=true \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dmaven.javadoc.skip=true \ - -Dgcloud.download.skip=true +# attempt to install 3 times with exponential backoff (starting with 10 seconds) +retry_with_backoff 3 10 \ + mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.javadoc.skip=true \ + -Dgcloud.download.skip=true # Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR JAR=linkage-monitor-latest-all-deps.jar diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index fc6412701ada..03092819c996 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -56,7 +56,9 @@ }, { "packagePatterns": [ - "^com.google.cloud:libraries-bom" + "^com.google.cloud:google-cloud-shared-config", + "^com.google.cloud:libraries-bom", + "^com.google.cloud.samples:shared-configuration" ], "semanticCommitType": "chore", "semanticCommitScope": "deps" @@ -75,4 +77,4 @@ } ], "semanticCommits": true -} +} \ No newline at end of file diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index bedd56915815..ea71b0e65ffe 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,11 +1,11 @@ { - "updateTime": "2020-03-17T19:21:36.633045Z", + "updateTime": "2020-03-25T23:36:14.700013Z", "sources": [ { - "template": { - "name": "java_library", - "origin": "synthtool.gcp", - "version": "2020.2.4" + "git": { + "name": "synthtool", + "remote": "https://github.com/googleapis/synthtool.git", + "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8" } } ] From 15cac9b83ab3cb299c5bbdb771d4d7bfd11e5d56 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 26 Mar 2020 16:57:28 +0100 Subject: [PATCH 090/794] deps: update dependency com.google.cloud.samples:shared-configuration to v1.0.13 (#118) --- java-shared-config/samples/install-without-bom/pom.xml | 2 +- java-shared-config/samples/pom.xml | 2 +- java-shared-config/samples/snapshot/pom.xml | 2 +- java-shared-config/samples/snippets/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-shared-config/samples/install-without-bom/pom.xml b/java-shared-config/samples/install-without-bom/pom.xml index 866b4ee436db..5c8c5f723c2d 100644 --- a/java-shared-config/samples/install-without-bom/pom.xml +++ b/java-shared-config/samples/install-without-bom/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.12 + 1.0.13 diff --git a/java-shared-config/samples/pom.xml b/java-shared-config/samples/pom.xml index 7bd2053142d8..440cd72f5d09 100644 --- a/java-shared-config/samples/pom.xml +++ b/java-shared-config/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.12 + 1.0.13 diff --git a/java-shared-config/samples/snapshot/pom.xml b/java-shared-config/samples/snapshot/pom.xml index 9d99f488972e..38f9bb6e2734 100644 --- a/java-shared-config/samples/snapshot/pom.xml +++ b/java-shared-config/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.12 + 1.0.13 diff --git a/java-shared-config/samples/snippets/pom.xml b/java-shared-config/samples/snippets/pom.xml index 885854c64ffc..54b28095d940 100644 --- a/java-shared-config/samples/snippets/pom.xml +++ b/java-shared-config/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.12 + 1.0.13 From b6412d6ecf3596b9fc4cddd1dd99cc9303e832b6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 30 Mar 2020 19:58:14 +0200 Subject: [PATCH 091/794] chore(deps): update dependency com.google.cloud.samples:shared-configuration to v1.0.14 (#120) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [com.google.cloud.samples:shared-configuration](https://togithub.com/GoogleCloudPlatform/java-repo-tools) | patch | `1.0.13` -> `1.0.14` | --- ### Release Notes
GoogleCloudPlatform/java-repo-tools ### [`v1.0.14`](https://togithub.com/GoogleCloudPlatform/java-repo-tools/releases/v1.0.14) [Compare Source](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.13...v1.0.14) - Update CheckStyle to 8.31 - Add SpotBugs
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-shared-config). --- java-shared-config/samples/install-without-bom/pom.xml | 2 +- java-shared-config/samples/pom.xml | 2 +- java-shared-config/samples/snapshot/pom.xml | 2 +- java-shared-config/samples/snippets/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-shared-config/samples/install-without-bom/pom.xml b/java-shared-config/samples/install-without-bom/pom.xml index 5c8c5f723c2d..4c8f44c15943 100644 --- a/java-shared-config/samples/install-without-bom/pom.xml +++ b/java-shared-config/samples/install-without-bom/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.13 + 1.0.14 diff --git a/java-shared-config/samples/pom.xml b/java-shared-config/samples/pom.xml index 440cd72f5d09..1ac897081516 100644 --- a/java-shared-config/samples/pom.xml +++ b/java-shared-config/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.13 + 1.0.14 diff --git a/java-shared-config/samples/snapshot/pom.xml b/java-shared-config/samples/snapshot/pom.xml index 38f9bb6e2734..dc262caa9ba2 100644 --- a/java-shared-config/samples/snapshot/pom.xml +++ b/java-shared-config/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.13 + 1.0.14 diff --git a/java-shared-config/samples/snippets/pom.xml b/java-shared-config/samples/snippets/pom.xml index 54b28095d940..9af3d0271e36 100644 --- a/java-shared-config/samples/snippets/pom.xml +++ b/java-shared-config/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.13 + 1.0.14 From 92d90ca2cdc9a5befd31880fc28ce4bf35b41908 Mon Sep 17 00:00:00 2001 From: Tyler Bui-Palsulich <26876514+tbpg@users.noreply.github.com> Date: Thu, 2 Apr 2020 13:38:35 -0400 Subject: [PATCH 092/794] feat: add devsite javadoc profile (#121) * feat: add Devsite Javadoc profile * fix: output dir, google/io, comments, remove memory flag * Don't delete package-list * Fix _project.yaml path * Remove docs from path --- java-shared-config/pom.xml | 95 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 0f65974394e5..e2092c2a7575 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -572,5 +572,100 @@ false + + devsite-apidocs + + + + devsite.template + + + + + + + maven-javadoc-plugin + + 3.1.1 + + + site + + aggregate + + + + + + com.google.doclava + doclava + 1.0.6 + + com.google.doclava.Doclava + ${sun.boot.class.path} + + + com.google.j2objc + j2objc-annotations + 1.3 + + + + -hdf + book.path + /java/_book.yaml + -hdf + project.path + /java/_project.yaml + -hdf + devsite.path + /java/reference/ + -d + ${project.build.directory}/devsite + -templatedir + ${devsite.template} + -toroot + /java/reference/ + -yaml + _toc.yaml + -warning + 101 + + false + + + + + maven-antrun-plugin + 1.7 + + + site + + run + + + + + + + + + + + + + + + + + + + + + + + + From d96c78473b02b37cd42148d3617976cb0ba6f5b1 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 2 Apr 2020 11:01:06 -0700 Subject: [PATCH 093/794] chore: remove samples pom.xml files (#123) We don't plan to write or need samples for this artifact. --- .../samples/install-without-bom/pom.xml | 84 ------------------- java-shared-config/samples/pom.xml | 56 ------------- java-shared-config/samples/snapshot/pom.xml | 83 ------------------ java-shared-config/samples/snippets/pom.xml | 60 ------------- java-shared-config/synth.py | 1 + 5 files changed, 1 insertion(+), 283 deletions(-) delete mode 100644 java-shared-config/samples/install-without-bom/pom.xml delete mode 100644 java-shared-config/samples/pom.xml delete mode 100644 java-shared-config/samples/snapshot/pom.xml delete mode 100644 java-shared-config/samples/snippets/pom.xml diff --git a/java-shared-config/samples/install-without-bom/pom.xml b/java-shared-config/samples/install-without-bom/pom.xml deleted file mode 100644 index 4c8f44c15943..000000000000 --- a/java-shared-config/samples/install-without-bom/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-shared-config-install-without-bom - jar - Google Google Cloud Shared Build Configs Install Without Bom - https://github.com/googleapis/java-shared-config - - - - com.google.cloud.samples - shared-configuration - 1.0.14 - - - - 1.8 - 1.8 - UTF-8 - - - - - - - google-cloud-shared-config - google-cloud-shared-config - - - - - - junit - junit - 4.13 - test - - - com.google.truth - truth - 1.0.1 - test - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.1.0 - - - add-snippets-source - - add-source - - - - ../snippets/src/main/java - - - - - add-snippets-tests - - add-test-source - - - - ../snippets/src/test/java - - - - - - - - diff --git a/java-shared-config/samples/pom.xml b/java-shared-config/samples/pom.xml deleted file mode 100644 index 1ac897081516..000000000000 --- a/java-shared-config/samples/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-google-cloud-shared-config-samples - 0.0.1-SNAPSHOT - pom - Google Google Cloud Shared Build Configs Samples Parent - https://github.com/googleapis/java-shared-config - - Java idiomatic client for Google Cloud Platform services. - - - - - com.google.cloud.samples - shared-configuration - 1.0.14 - - - - 1.8 - 1.8 - UTF-8 - - - - install-without-bom - snapshot - snippets - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - true - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 - - true - - - - - diff --git a/java-shared-config/samples/snapshot/pom.xml b/java-shared-config/samples/snapshot/pom.xml deleted file mode 100644 index dc262caa9ba2..000000000000 --- a/java-shared-config/samples/snapshot/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-shared-config-snapshot - jar - Google Google Cloud Shared Build Configs Snapshot Samples - https://github.com/googleapis/java-shared-config - - - - com.google.cloud.samples - shared-configuration - 1.0.14 - - - - 1.8 - 1.8 - UTF-8 - - - - - - google-cloud-shared-config - google-cloud-shared-config - - - - - junit - junit - 4.13 - test - - - com.google.truth - truth - 1.0.1 - test - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.1.0 - - - add-snippets-source - - add-source - - - - ../snippets/src/main/java - - - - - add-snippets-tests - - add-test-source - - - - ../snippets/src/test/java - - - - - - - - \ No newline at end of file diff --git a/java-shared-config/samples/snippets/pom.xml b/java-shared-config/samples/snippets/pom.xml deleted file mode 100644 index 9af3d0271e36..000000000000 --- a/java-shared-config/samples/snippets/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - 4.0.0 - com.google.cloud - google-cloud-shared-config-snippets - jar - Google Google Cloud Shared Build Configs Snippets - https://github.com/googleapis/java-shared-config - - - - com.google.cloud.samples - shared-configuration - 1.0.14 - - - - 1.8 - 1.8 - UTF-8 - - - - - - - - com.google.cloud - libraries-bom - - pom - import - - - - - - - google-cloud-shared-config - google-cloud-shared-config - - - - - junit - junit - 4.13 - test - - - com.google.truth - truth - 1.0.1 - test - - - diff --git a/java-shared-config/synth.py b/java-shared-config/synth.py index 7656b8913fb9..d5717dc9fb86 100644 --- a/java-shared-config/synth.py +++ b/java-shared-config/synth.py @@ -21,5 +21,6 @@ java.common_templates(excludes=[ "README.md", ".github/release-please.yml", + "samples/*" ]) From 86c0ebeb2b9ec401086873904b0b465de22d24d9 Mon Sep 17 00:00:00 2001 From: Stephanie Wang Date: Tue, 7 Apr 2020 15:42:57 -0400 Subject: [PATCH 094/794] feat: add maven flatten plugin (#127) --- java-shared-config/pom.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e2092c2a7575..a9990aa70c2a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -204,6 +204,36 @@ true + + org.codehaus.mojo + flatten-maven-plugin + 1.2.2 + + + + flatten + process-resources + + flatten + + + + + flatten.clean + clean + + clean + + + + + oss + all + + remove + + + From 927d84a2e9fd5b68ff9b4a05eaec22a36f05d872 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Apr 2020 22:00:57 +0200 Subject: [PATCH 095/794] deps: update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.1.2 (#107) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index a9990aa70c2a..191a203bcaea 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -183,7 +183,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.1 + 3.1.2 org.codehaus.mojo From d7c957a43b5ae8b7a7fbcd1fa83e846fcc4a52f9 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Apr 2020 22:01:47 +0200 Subject: [PATCH 096/794] deps: update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.1.0 (#101) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 191a203bcaea..8d13ae4f7fe8 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -188,7 +188,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.1.0 org.codehaus.mojo From a08e757f42536f6e08fc398fbd93b6fa191c8fd3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Apr 2020 22:05:37 +0200 Subject: [PATCH 097/794] deps: update dependency org.apache.maven.plugins:maven-site-plugin to v3.9.0 (#103) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 8d13ae4f7fe8..bd6414c9777f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -170,7 +170,7 @@ org.apache.maven.plugins maven-site-plugin - 3.8.2 + 3.9.0 true From a1f0754472d371b179e5996b4f30c402f4128e9a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Apr 2020 22:17:39 +0200 Subject: [PATCH 098/794] deps: update dependency org.apache.maven.plugins:maven-antrun-plugin to v1.8 (#124) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index bd6414c9777f..814854c09c5f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -667,7 +667,7 @@ maven-antrun-plugin - 1.7 + 1.8 site From b65257ac00b9552d568dae942366fe1d81152dfa Mon Sep 17 00:00:00 2001 From: Stephanie Wang Date: Tue, 7 Apr 2020 18:01:33 -0400 Subject: [PATCH 099/794] feat: add ban duplicate classes rule (#126) * feat: add ban duplicate classes rule * feat: add extra enforcer dep --- java-shared-config/pom.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 814854c09c5f..8437f9963fbb 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -101,6 +101,13 @@ org.apache.maven.plugins maven-enforcer-plugin 3.0.0-M3 + + + org.codehaus.mojo + extra-enforcer-rules + 1.2 + + org.codehaus.mojo @@ -259,6 +266,14 @@ [1.7,) + + + compile + provided + + true + true + From 0b3f4171c7eaa7d4d2b35c83c578df2be7f9f456 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 7 Apr 2020 23:36:15 +0000 Subject: [PATCH 100/794] chore: release 0.5.0 (#122) :robot: I have created a release \*beep\* \*boop\* --- ## [0.5.0](https://www.github.com/googleapis/java-shared-config/compare/v0.4.0...v0.5.0) (2020-04-07) ### Features * add ban duplicate classes rule ([#126](https://www.github.com/googleapis/java-shared-config/issues/126)) ([b65257a](https://www.github.com/googleapis/java-shared-config/commit/b65257ac00b9552d568dae942366fe1d81152dfa)) * add devsite javadoc profile ([#121](https://www.github.com/googleapis/java-shared-config/issues/121)) ([92d90ca](https://www.github.com/googleapis/java-shared-config/commit/92d90ca2cdc9a5befd31880fc28ce4bf35b41908)) * add maven flatten plugin ([#127](https://www.github.com/googleapis/java-shared-config/issues/127)) ([86c0ebe](https://www.github.com/googleapis/java-shared-config/commit/86c0ebeb2b9ec401086873904b0b465de22d24d9)) ### Bug Fixes * declare com.coveo:fmt-maven-plugin version/configuration ([#90](https://www.github.com/googleapis/java-shared-config/issues/90)) ([d6c6350](https://www.github.com/googleapis/java-shared-config/commit/d6c6350df496349c2350707ac2a8f347e2e0c1eb)) ### Dependencies * update dependency com.google.cloud.samples:shared-configuration to v1.0.13 ([#118](https://www.github.com/googleapis/java-shared-config/issues/118)) ([15cac9b](https://www.github.com/googleapis/java-shared-config/commit/15cac9b83ab3cb299c5bbdb771d4d7bfd11e5d56)) * update dependency com.puppycrawl.tools:checkstyle to v8.29 ([c2d6c97](https://www.github.com/googleapis/java-shared-config/commit/c2d6c97cf8ade222d21932cd5c5ada915af6d130)) * update dependency org.apache.maven.plugins:maven-antrun-plugin to v1.8 ([#124](https://www.github.com/googleapis/java-shared-config/issues/124)) ([a1f0754](https://www.github.com/googleapis/java-shared-config/commit/a1f0754472d371b179e5996b4f30c402f4128e9a)) * update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.1.2 ([#107](https://www.github.com/googleapis/java-shared-config/issues/107)) ([927d84a](https://www.github.com/googleapis/java-shared-config/commit/927d84a2e9fd5b68ff9b4a05eaec22a36f05d872)) * update dependency org.apache.maven.plugins:maven-site-plugin to v3.9.0 ([#103](https://www.github.com/googleapis/java-shared-config/issues/103)) ([a08e757](https://www.github.com/googleapis/java-shared-config/commit/a08e757f42536f6e08fc398fbd93b6fa191c8fd3)) * update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.1.0 ([#101](https://www.github.com/googleapis/java-shared-config/issues/101)) ([d7c957a](https://www.github.com/googleapis/java-shared-config/commit/d7c957a43b5ae8b7a7fbcd1fa83e846fcc4a52f9)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- java-shared-config/CHANGELOG.md | 24 ++++++++++++++++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 0cb6db300c5e..a2cb7a76e863 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,29 @@ # Changelog +## [0.5.0](https://www.github.com/googleapis/java-shared-config/compare/v0.4.0...v0.5.0) (2020-04-07) + + +### Features + +* add ban duplicate classes rule ([#126](https://www.github.com/googleapis/java-shared-config/issues/126)) ([e38a7cc](https://www.github.com/googleapis/java-shared-config/commit/e38a7cc949396f8f5696e62cd060e0c076047b8d)) +* add devsite javadoc profile ([#121](https://www.github.com/googleapis/java-shared-config/issues/121)) ([7f452fb](https://www.github.com/googleapis/java-shared-config/commit/7f452fb6c5704f6ce0f731085479a28fb99ebcb9)) +* add maven flatten plugin ([#127](https://www.github.com/googleapis/java-shared-config/issues/127)) ([fb00799](https://www.github.com/googleapis/java-shared-config/commit/fb00799c416d324d68da5b660a26f7ef595c26d9)) + + +### Bug Fixes + +* declare com.coveo:fmt-maven-plugin version/configuration ([#90](https://www.github.com/googleapis/java-shared-config/issues/90)) ([5cf71a6](https://www.github.com/googleapis/java-shared-config/commit/5cf71a6ed699907082756e70c2fdee6ad3632f38)) + + +### Dependencies + +* update dependency com.google.cloud.samples:shared-configuration to v1.0.13 ([#118](https://www.github.com/googleapis/java-shared-config/issues/118)) ([58ae69e](https://www.github.com/googleapis/java-shared-config/commit/58ae69eb5ba037963cdaed0c2b0e30663bc873eb)) +* update dependency com.puppycrawl.tools:checkstyle to v8.29 ([f62292d](https://www.github.com/googleapis/java-shared-config/commit/f62292dab75699a75f8a7d499fe2ccfb7ee93783)) +* update dependency org.apache.maven.plugins:maven-antrun-plugin to v1.8 ([#124](https://www.github.com/googleapis/java-shared-config/issues/124)) ([a681536](https://www.github.com/googleapis/java-shared-config/commit/a68153643400c3f3b5c5959cda4dc3b552336427)) +* update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.1.2 ([#107](https://www.github.com/googleapis/java-shared-config/issues/107)) ([c9b096b](https://www.github.com/googleapis/java-shared-config/commit/c9b096b81b1f4f8dc2d1302f259f0321722e1ca5)) +* update dependency org.apache.maven.plugins:maven-site-plugin to v3.9.0 ([#103](https://www.github.com/googleapis/java-shared-config/issues/103)) ([abe7140](https://www.github.com/googleapis/java-shared-config/commit/abe714060e858c70a83888fb34438c45d97b1168)) +* update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.1.0 ([#101](https://www.github.com/googleapis/java-shared-config/issues/101)) ([ac69572](https://www.github.com/googleapis/java-shared-config/commit/ac69572be76e4462fdf65fa6e7f0935c3d51d827)) + ## [0.4.0](https://www.github.com/googleapis/java-shared-config/compare/v0.3.1...v0.4.0) (2020-01-08) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 112982da8606..ae212a8283ef 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.4.0 + 0.5.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 8437f9963fbb..196bd703305b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.4.1-SNAPSHOT + 0.5.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 214f581ff60d..62c14b0f96ec 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.4.0:0.4.1-SNAPSHOT +google-cloud-shared-config:0.5.0:0.5.0 From bf8d01a76ab584b1c400fb8a60faa53d5cfb26b6 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 10 Apr 2020 08:50:17 -0700 Subject: [PATCH 101/794] chore: update common templates (#128) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/d6bf982d-3f70-479b-8cc3-60d7907932a0/targets --- java-shared-config/.kokoro/common.sh | 14 ++++++++++++-- .../.kokoro/nightly/integration.cfg | 15 +++++++++++++++ java-shared-config/synth.metadata | 11 +++++++++-- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/java-shared-config/.kokoro/common.sh b/java-shared-config/.kokoro/common.sh index a3bbc5f67963..8f09de5d3d10 100644 --- a/java-shared-config/.kokoro/common.sh +++ b/java-shared-config/.kokoro/common.sh @@ -13,18 +13,28 @@ # See the License for the specific language governing permissions and # limitations under the License. -# set -eo pipefail - function retry_with_backoff { attempts_left=$1 sleep_seconds=$2 shift 2 command=$@ + + # store current flag state + flags=$- + + # allow a failures to continue + set +e echo "${command}" ${command} exit_code=$? + # restore "e" flag + if [[ ${flags} =~ e ]] + then set -e + else set +e + fi + if [[ $exit_code == 0 ]] then return 0 diff --git a/java-shared-config/.kokoro/nightly/integration.cfg b/java-shared-config/.kokoro/nightly/integration.cfg index 8bf59c02edd6..ca027480092f 100644 --- a/java-shared-config/.kokoro/nightly/integration.cfg +++ b/java-shared-config/.kokoro/nightly/integration.cfg @@ -6,11 +6,26 @@ env_vars: { value: "gcr.io/cloud-devrel-kokoro-resources/java8" } +env_vars: { + key: "JOB_TYPE" + value: "integration" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + env_vars: { key: "ENABLE_BUILD_COP" value: "true" } +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + before_action { fetch_keystore { keystore_resource { diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index ea71b0e65ffe..2768918eb8e0 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -1,11 +1,18 @@ { - "updateTime": "2020-03-25T23:36:14.700013Z", "sources": [ + { + "git": { + "name": ".", + "remote": "https://github.com/googleapis/java-shared-config.git", + "sha": "3ea95a0fcc6f5162c14cb0d90602b68c987700c0" + } + }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8" + "sha": "c7e0e517d7f46f77bebd27da2e5afcaa6eee7e25", + "log": "c7e0e517d7f46f77bebd27da2e5afcaa6eee7e25\nbuild(java): fix nightly integration test config to run integrations (#465)\n\nThis was only running the units.\nbd69a2aa7b70875f3c988e269706b22fefbef40e\nbuild(java): fix retry_with_backoff when -e option set (#475)\n\n\nd9b173c427bfa0c6cca818233562e7e8841a357c\nfix: record version of working repo in synth.metadata (#473)\n\nPartial revert of b37cf74d12e9a42b9de9e61a4f26133d7cd9c168.\nf73a541770d95a609e5be6bf6b3b220d17cefcbe\nfeat(discogapic): allow local discovery-artifact-manager (#474)\n\n\n8cf0f5d93a70c3dcb0b4999d3152c46d4d9264bf\ndoc: describe the Autosynth & Synthtool protocol (#472)\n\n* doc: describe the Autosynth & Synthtool protocol\n\n* Accommodate review comments.\n980baaa738a1ad8fa02b4fdbd56be075ee77ece5\nfix: pin sphinx to <3.0.0 as new version causes new error (#471)\n\nThe error `toctree contains reference to document changlelog that doesn't have a title: no link will be generated` occurs as of 3.0.0. Pinning to 2.x until we address the docs build issue.\n\nTowards #470\n\nI did this manually for python-datastore https://github.com/googleapis/python-datastore/pull/22\n928b2998ac5023e7c7e254ab935f9ef022455aad\nchore(deps): update dependency com.google.cloud.samples:shared-configuration to v1.0.15 (#466)\n\nCo-authored-by: Jeffrey Rennie \n188f1b1d53181f739b98f8aa5d40cfe99eb90c47\nfix: allow local and external deps to be specified (#469)\n\nModify noxfile.py to allow local and external dependencies for\nsystem tests to be specified.\n1df68ed6735ddce6797d0f83641a731c3c3f75b4\nfix: apache license URL (#468)\n\n\nf4a59efa54808c4b958263de87bc666ce41e415f\nfeat: Add discogapic support for GAPICBazel generation (#459)\n\n* feat: Add discogapic support for GAPICBazel generation\n\n* reformat with black\n\n* Rename source repository variable\n\nCo-authored-by: Jeffrey Rennie \n99820243d348191bc9c634f2b48ddf65096285ed\nfix: update template files for Node.js libraries (#463)\n\n\n3cbe6bcd5623139ac9834c43818424ddca5430cb\nfix(ruby): remove dead troubleshooting link from generated auth guide (#462)\n\n\na003d8655d3ebec2bbbd5fc3898e91e152265c67\ndocs: remove \"install stable\" instructions (#461)\n\nThe package hasn't been released to PyPI in some time\nf5e8c88d9870d8aa4eb43fa0b39f07e02bfbe4df\nchore(python): add license headers to config files; make small tweaks to templates (#458)\n\n\n" } } ] From ad3d3072256ab537277dbd9107b519d752eb8bcd Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 10 Apr 2020 16:14:04 +0000 Subject: [PATCH 102/794] chore: release 0.5.1-SNAPSHOT (#129) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 196bd703305b..ab630e88e738 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.5.0 + 0.5.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 62c14b0f96ec..5935489f5e13 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.5.0:0.5.0 +google-cloud-shared-config:0.5.0:0.5.1-SNAPSHOT From 1d6e71421d49c9b17616897386f04066fb2bb0ee Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 16 Apr 2020 08:42:55 -0700 Subject: [PATCH 103/794] chore: update common templates (#132) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/01a7440e-1f0c-4d68-a4a7-71ae1d8c3c3a/targets --- java-shared-config/.kokoro/common.sh | 5 ++ java-shared-config/.kokoro/dependencies.sh | 48 +++++++++++++++++++ .../.kokoro/nightly/integration.cfg | 11 +++-- .../.kokoro/nightly/samples.cfg | 8 +++- .../.kokoro/presubmit/integration.cfg | 14 ++++-- .../.kokoro/presubmit/samples.cfg | 14 ++++-- java-shared-config/synth.metadata | 3 +- 7 files changed, 89 insertions(+), 14 deletions(-) diff --git a/java-shared-config/.kokoro/common.sh b/java-shared-config/.kokoro/common.sh index 8f09de5d3d10..a8d0ea04d37d 100644 --- a/java-shared-config/.kokoro/common.sh +++ b/java-shared-config/.kokoro/common.sh @@ -52,3 +52,8 @@ function retry_with_backoff { return $exit_code } + +## Helper functionss +function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; } +function msg() { println "$*" >&2; } +function println() { printf '%s\n' "$(now) $*"; } \ No newline at end of file diff --git a/java-shared-config/.kokoro/dependencies.sh b/java-shared-config/.kokoro/dependencies.sh index 0aade871ce10..cf3bb4347e01 100755 --- a/java-shared-config/.kokoro/dependencies.sh +++ b/java-shared-config/.kokoro/dependencies.sh @@ -36,3 +36,51 @@ retry_with_backoff 3 10 \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true + +echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************" +## Run dependency list completeness check +function completenessCheck() { + # Output dep list with compile scope generated using the original pom + msg "Generating dependency list using original pom..." + mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt + + # Output dep list generated using the flattened pom (test scope deps are ommitted) + msg "Generating dependency list using flattened pom..." + mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt + + # Compare two dependency lists + msg "Comparing dependency lists..." + diff .org-list.txt .new-list.txt >.diff.txt + if [[ $? == 0 ]] + then + msg "Success. No diff!" + else + msg "Diff found. See below: " + msg "You can also check .diff.txt file located in $1." + cat .diff.txt + return 1 + fi +} + +# Allow failures to continue running the script +set +e + +error_count=0 +for path in $(find -name ".flattened-pom.xml") +do + # Check flattened pom in each dir that contains it for completeness + dir=$(dirname "$path") + pushd "$dir" + completenessCheck "$dir" + error_count=$(($error_count + $?)) + popd +done + +if [[ $error_count == 0 ]] +then + msg "All checks passed." + exit 0 +else + msg "Errors found. See log statements above." + exit 1 +fi diff --git a/java-shared-config/.kokoro/nightly/integration.cfg b/java-shared-config/.kokoro/nightly/integration.cfg index ca027480092f..40c4abb7bf08 100644 --- a/java-shared-config/.kokoro/nightly/integration.cfg +++ b/java-shared-config/.kokoro/nightly/integration.cfg @@ -10,20 +10,25 @@ 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_BUILD_COP" value: "true" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" } before_action { diff --git a/java-shared-config/.kokoro/nightly/samples.cfg b/java-shared-config/.kokoro/nightly/samples.cfg index b4b051cd016f..20aabd55de11 100644 --- a/java-shared-config/.kokoro/nightly/samples.cfg +++ b/java-shared-config/.kokoro/nightly/samples.cfg @@ -11,9 +11,15 @@ env_vars: { value: "samples" } +# 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: "java-docs-samples-testing" } env_vars: { diff --git a/java-shared-config/.kokoro/presubmit/integration.cfg b/java-shared-config/.kokoro/presubmit/integration.cfg index 141f90c13c56..522e5b10101c 100644 --- a/java-shared-config/.kokoro/presubmit/integration.cfg +++ b/java-shared-config/.kokoro/presubmit/integration.cfg @@ -11,14 +11,20 @@ env_vars: { value: "integration" } +# TODO: remove this after we've migrated all tests and scripts env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" + key: "GCLOUD_PROJECT" + value: "gcloud-devel" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" } before_action { diff --git a/java-shared-config/.kokoro/presubmit/samples.cfg b/java-shared-config/.kokoro/presubmit/samples.cfg index fa7b493d0b5c..1171aead01f0 100644 --- a/java-shared-config/.kokoro/presubmit/samples.cfg +++ b/java-shared-config/.kokoro/presubmit/samples.cfg @@ -11,14 +11,20 @@ env_vars: { value: "samples" } +# TODO: remove this after we've migrated all tests and scripts env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" + key: "GCLOUD_PROJECT" + value: "java-docs-samples-testing" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_CLOUD_PROJECT" + value: "java-docs-samples-testing" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" } before_action { diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 2768918eb8e0..76fd33c5dcf2 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -11,8 +11,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "c7e0e517d7f46f77bebd27da2e5afcaa6eee7e25", - "log": "c7e0e517d7f46f77bebd27da2e5afcaa6eee7e25\nbuild(java): fix nightly integration test config to run integrations (#465)\n\nThis was only running the units.\nbd69a2aa7b70875f3c988e269706b22fefbef40e\nbuild(java): fix retry_with_backoff when -e option set (#475)\n\n\nd9b173c427bfa0c6cca818233562e7e8841a357c\nfix: record version of working repo in synth.metadata (#473)\n\nPartial revert of b37cf74d12e9a42b9de9e61a4f26133d7cd9c168.\nf73a541770d95a609e5be6bf6b3b220d17cefcbe\nfeat(discogapic): allow local discovery-artifact-manager (#474)\n\n\n8cf0f5d93a70c3dcb0b4999d3152c46d4d9264bf\ndoc: describe the Autosynth & Synthtool protocol (#472)\n\n* doc: describe the Autosynth & Synthtool protocol\n\n* Accommodate review comments.\n980baaa738a1ad8fa02b4fdbd56be075ee77ece5\nfix: pin sphinx to <3.0.0 as new version causes new error (#471)\n\nThe error `toctree contains reference to document changlelog that doesn't have a title: no link will be generated` occurs as of 3.0.0. Pinning to 2.x until we address the docs build issue.\n\nTowards #470\n\nI did this manually for python-datastore https://github.com/googleapis/python-datastore/pull/22\n928b2998ac5023e7c7e254ab935f9ef022455aad\nchore(deps): update dependency com.google.cloud.samples:shared-configuration to v1.0.15 (#466)\n\nCo-authored-by: Jeffrey Rennie \n188f1b1d53181f739b98f8aa5d40cfe99eb90c47\nfix: allow local and external deps to be specified (#469)\n\nModify noxfile.py to allow local and external dependencies for\nsystem tests to be specified.\n1df68ed6735ddce6797d0f83641a731c3c3f75b4\nfix: apache license URL (#468)\n\n\nf4a59efa54808c4b958263de87bc666ce41e415f\nfeat: Add discogapic support for GAPICBazel generation (#459)\n\n* feat: Add discogapic support for GAPICBazel generation\n\n* reformat with black\n\n* Rename source repository variable\n\nCo-authored-by: Jeffrey Rennie \n99820243d348191bc9c634f2b48ddf65096285ed\nfix: update template files for Node.js libraries (#463)\n\n\n3cbe6bcd5623139ac9834c43818424ddca5430cb\nfix(ruby): remove dead troubleshooting link from generated auth guide (#462)\n\n\na003d8655d3ebec2bbbd5fc3898e91e152265c67\ndocs: remove \"install stable\" instructions (#461)\n\nThe package hasn't been released to PyPI in some time\nf5e8c88d9870d8aa4eb43fa0b39f07e02bfbe4df\nchore(python): add license headers to config files; make small tweaks to templates (#458)\n\n\n" + "sha": "52638600f387deb98efb5f9c85fec39e82aa9052" } } ] From 65ae17da2fe569b44d112d41714ec8d24f58bc0c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 12 May 2020 08:46:36 -0700 Subject: [PATCH 104/794] ci: enable GitHub actions (#134) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/8807a95d-0d7c-4251-bd7e-a87799fc9f67/targets Source-Link: https://github.com/googleapis/synthtool/commit/98c50772ec23295c64cf0d2ddf199ea52961fd4c Source-Link: https://github.com/googleapis/synthtool/commit/55cdc844877d97139f25004229842624a6a86a02 --- java-shared-config/.github/workflows/ci.yaml | 76 ++++++++++++++++++++ java-shared-config/.kokoro/build.bat | 2 +- java-shared-config/synth.metadata | 4 +- 3 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 java-shared-config/.github/workflows/ci.yaml diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml new file mode 100644 index 000000000000..445b4bf82ffd --- /dev/null +++ b/java-shared-config/.github/workflows/ci.yaml @@ -0,0 +1,76 @@ +on: + push: + branches: + - master + pull_request: +name: ci +jobs: + units: + runs-on: ubuntu-latest + strategy: + matrix: + java: [7, 8, 11] + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: ${{matrix.java}} + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: test + - name: coverage + uses: codecov/codecov-action@v1 + with: + name: actions ${{matrix.java}} + windows: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - run: .kokoro/build.bat + env: + JOB_TYPE: test + dependencies: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - run: .kokoro/dependencies.sh + linkage-monitor: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - run: .kokoro/linkage-monitor.sh + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: lint + clirr: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: clirr \ No newline at end of file diff --git a/java-shared-config/.kokoro/build.bat b/java-shared-config/.kokoro/build.bat index c22797880be8..05826ad93fe8 100644 --- a/java-shared-config/.kokoro/build.bat +++ b/java-shared-config/.kokoro/build.bat @@ -1,3 +1,3 @@ :: See documentation in type-shell-output.bat -"C:\Program Files\Git\bin\bash.exe" github/java-shared-config/.kokoro/build.sh +"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 76fd33c5dcf2..346243143015 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "3ea95a0fcc6f5162c14cb0d90602b68c987700c0" + "sha": "b73a1adf765d3a31701305c9e4dbb5d20797e9a4" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "52638600f387deb98efb5f9c85fec39e82aa9052" + "sha": "98c50772ec23295c64cf0d2ddf199ea52961fd4c" } } ] From c60cdf24e53d6f7a4484d54d38172d88a9606868 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 18 May 2020 12:50:45 -0700 Subject: [PATCH 105/794] chore: update CONTRIBUTING.md to include code formatting (#135) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/0ba8d2f8-7f35-417b-8c9a-d829ca01eac0/targets Source-Link: https://github.com/googleapis/synthtool/commit/5b48b0716a36ca069db3038da7e205c87a22ed19 --- java-shared-config/CONTRIBUTING.md | 11 ++++++++++- java-shared-config/synth.metadata | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CONTRIBUTING.md b/java-shared-config/CONTRIBUTING.md index 085021ddec26..f2dbdee06bc3 100644 --- a/java-shared-config/CONTRIBUTING.md +++ b/java-shared-config/CONTRIBUTING.md @@ -99,7 +99,16 @@ mvn -Penable-samples clean verify ``` 2. [Activate](#profile-activation) the profile. -3. Define your samples in a normal Maven project in the `samples/` directory +3. Define your samples in a normal Maven project in the `samples/` directory. + +### Code Formatting + +Code in this repo is formatted with +[google-java-format](https://github.com/google/google-java-format). +To run formatting on your project, you can run: +``` +mvn com.coveo:fmt-maven-plugin:format +``` ### Profile Activation diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 346243143015..53358346346a 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "b73a1adf765d3a31701305c9e4dbb5d20797e9a4" + "sha": "eb4b86aaf49f899bbcb08fd4993cef471b1e5b0f" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "98c50772ec23295c64cf0d2ddf199ea52961fd4c" + "sha": "5b48b0716a36ca069db3038da7e205c87a22ed19" } } ] From a0205408ea223107687429ec46873425d8afaa74 Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Tue, 19 May 2020 13:58:42 -0400 Subject: [PATCH 106/794] feat: add new configuration necessary to support auto-value (#136) Normally we would want to include auto-value in java-shared-dependencies, however auto-value includes a compiler extension and requires build configuration. #### Dependencies This change adds a dependencyManagement section with contains auto-value-annotations to manage which version of auto-value-annotations is used by projects and included in the dependency tree. #### Profiles Two new profiles have been added with the necessary configuration to include auto-value in the annotationProcessorPath when compiling. Auto value does not support java7 across all its artifacts consistently and requires us to have build configuration for java7 and java8+ to deal with this fact. When we drop support for java7 the autovalue-java7 profile can be deleted, and the jdk based activation of autovalue-java8 can be removed. ##### Activation Activation of each of the profiles is accomplished using a combination of jdk version and file-exists rules. Not all modules underneath this shared config use auto-value and thus we don't want to modify the annotationProcessorPath for everything. This allows the use of auto-value to be opt-in per module. To use either autovalue-java* profile, create an empty file in the module root named `EnableAutoValue.txt`. When the maven config is loaded it will look for this file, and if present activate the respective profile based on which version of java is running. Related to: https://github.com/googleapis/java-shared-dependencies/issues/37 --- java-shared-config/pom.xml | 102 +++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ab630e88e738..eff28cb49ef0 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -60,6 +60,7 @@ ${project.artifactId} false true + 1.7.2 @@ -486,6 +487,21 @@ + + + + + com.google.auto.value + auto-value-annotations + ${auto-value-annotation.version} + + + + release @@ -712,5 +728,91 @@ + + autovalue-java7 + + 1.7 + + ${basedir}/EnableAutoValue.txt + + + + + 1.4 + + + + + maven-compiler-plugin + + + + com.google.auto.value + auto-value + ${auto-value.version} + + + + + + + + + + autovalue-java8 + + [1.8,) + + ${basedir}/EnableAutoValue.txt + + + + + + maven-compiler-plugin + + + + com.google.auto.value + auto-value + ${auto-value-annotation.version} + + + + com.google.auto.service + auto-service-annotations + 1.0-rc7 + + + + + + + + From 338d9aa53d8ab8fd4113ab32f90ebc855da64aef Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 19 May 2020 19:40:07 +0000 Subject: [PATCH 107/794] chore: release 0.6.0 (#137) :robot: I have created a release \*beep\* \*boop\* --- ## [0.6.0](https://www.github.com/googleapis/java-shared-config/compare/v0.5.0...v0.6.0) (2020-05-19) ### Features * add new configuration necessary to support auto-value ([#136](https://www.github.com/googleapis/java-shared-config/issues/136)) ([a020540](https://www.github.com/googleapis/java-shared-config/commit/a0205408ea223107687429ec46873425d8afaa74)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index a2cb7a76e863..41d615e1fe21 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.6.0](https://www.github.com/googleapis/java-shared-config/compare/v0.5.0...v0.6.0) (2020-05-19) + + +### Features + +* add new configuration necessary to support auto-value ([#136](https://www.github.com/googleapis/java-shared-config/issues/136)) ([c14689b](https://www.github.com/googleapis/java-shared-config/commit/c14689b8791c173687f719d73156a989aedd7ba6)) + ## [0.5.0](https://www.github.com/googleapis/java-shared-config/compare/v0.4.0...v0.5.0) (2020-04-07) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index ae212a8283ef..f88a22b8d402 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.5.0 + 0.6.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index eff28cb49ef0..8c2b7ae3299a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.5.1-SNAPSHOT + 0.6.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 5935489f5e13..f959652348ac 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.5.0:0.5.1-SNAPSHOT +google-cloud-shared-config:0.6.0:0.6.0 From 04242e51b8dfb212434ef3240f8dac335e4b2bfc Mon Sep 17 00:00:00 2001 From: Les Vogel Date: Thu, 21 May 2020 19:58:37 -0700 Subject: [PATCH 108/794] chore: Update the javadoc plugin to 3.2.0 (#140) * Update the javadoc plugin to 3.2.0 * chore: Update the javadoc plugin to 3.2.0 * Add docRoot It can be changed with -DdocRoot=/path/to/root/ --- java-shared-config/pom.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 8c2b7ae3299a..e5420198abb1 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -61,6 +61,7 @@ false true 1.7.2 + /java/reference/ @@ -647,7 +648,7 @@ maven-javadoc-plugin - 3.1.1 + 3.2.0 site @@ -680,13 +681,13 @@ /java/_project.yaml -hdf devsite.path - /java/reference/ + ${docRoot} -d ${project.build.directory}/devsite -templatedir ${devsite.template} -toroot - /java/reference/ + ${docRoot} -yaml _toc.yaml -warning @@ -709,9 +710,9 @@ - - - + + + From b5a852e810dc7d2f1f4ed5e7ce97eacc8ee19279 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 4 Jun 2020 22:34:44 +0200 Subject: [PATCH 109/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.1.0 (#143) This PR contains the following updates: | Package | Update | Change | |---|---|---| | org.apache.maven.plugins:maven-project-info-reports-plugin | minor | `3.0.0` -> `3.1.0` | --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e5420198abb1..4d9be3022262 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -402,7 +402,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.0.0 + 3.1.0 From fd118f3c0d1d3bc611dea5b459131dab5ae16e29 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 4 Jun 2020 15:16:09 -0700 Subject: [PATCH 110/794] chore(java_templates): add default CODEOWNERS files for samples reviews (#146) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/cee9e42c-941c-49fe-b176-a9e83c067c7c/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/8b65daa222d193b689279162781baf0aa1f0ffd2 --- java-shared-config/.github/CODEOWNERS | 8 ++++++++ java-shared-config/synth.metadata | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 java-shared-config/.github/CODEOWNERS diff --git a/java-shared-config/.github/CODEOWNERS b/java-shared-config/.github/CODEOWNERS new file mode 100644 index 000000000000..6137bef2a259 --- /dev/null +++ b/java-shared-config/.github/CODEOWNERS @@ -0,0 +1,8 @@ +# Code owners file. +# This file controls who is tagged for review for any given pull request. + +# For syntax help see: +# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax + +# The java-samples-reviewers team is the default owner for samples changes +samples/**/*.java @googleapis/java-samples-reviewers diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 53358346346a..58496f51d3c9 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "eb4b86aaf49f899bbcb08fd4993cef471b1e5b0f" + "sha": "b0a8651af1f3662d4e75ef38fba9261744e6417c" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "5b48b0716a36ca069db3038da7e205c87a22ed19" + "sha": "8b65daa222d193b689279162781baf0aa1f0ffd2" } } ] From efc559f5a417310a39b55479da4098fada882d4a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 5 Jun 2020 00:37:07 -0700 Subject: [PATCH 111/794] chore: turn on renovate-bot master issue for java repos (#147) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/5a6d8b4a-5d51-4aa7-bbe3-089dd415efba/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/cac9eef310652bf138dd76b716e4986e757d62ac --- java-shared-config/renovate.json | 3 ++- java-shared-config/synth.metadata | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index 03092819c996..cff15d8bf50a 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -76,5 +76,6 @@ "groupName": "jackson dependencies" } ], - "semanticCommits": true + "semanticCommits": true, + "masterIssue": true } \ No newline at end of file diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 58496f51d3c9..27fc1b442940 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "b0a8651af1f3662d4e75ef38fba9261744e6417c" + "sha": "a33cbd4653796046621af5857ce1161ae180c75c" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8b65daa222d193b689279162781baf0aa1f0ffd2" + "sha": "cac9eef310652bf138dd76b716e4986e757d62ac" } } ] From 45cb5e07d73a22db1714ce9dc7bf37c22fd2e0da Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 5 Jun 2020 21:44:11 +0000 Subject: [PATCH 112/794] chore: release 0.6.1-SNAPSHOT (#141) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 4d9be3022262..d8d48df44d70 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.6.0 + 0.6.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index f959652348ac..98e05151addf 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.6.0:0.6.0 +google-cloud-shared-config:0.6.0:0.6.1-SNAPSHOT From a3f1939a0a4399e2e4bc22f321f4cda143702d8c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 5 Jun 2020 22:25:07 -0700 Subject: [PATCH 113/794] build(java): skip lint on samples directory (#150) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/d76bfbb4-fde1-4909-a913-608cdb170a49/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/987270824bd26f6a8c716d5e2022057b8ae7b26e --- java-shared-config/.kokoro/build.sh | 4 +--- java-shared-config/synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index 7b0fd0b246ae..8937c70e2339 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -51,9 +51,7 @@ test) RETURN_CODE=$? ;; lint) - mvn \ - -Penable-samples \ - com.coveo:fmt-maven-plugin:check + mvn com.coveo:fmt-maven-plugin:check RETURN_CODE=$? ;; javadoc) diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 27fc1b442940..3bd5c88fc536 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "a33cbd4653796046621af5857ce1161ae180c75c" + "sha": "ded3ce9d4e8b4c69daca6c175eeaf319d36e97b9" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "cac9eef310652bf138dd76b716e4986e757d62ac" + "sha": "987270824bd26f6a8c716d5e2022057b8ae7b26e" } } ] From 637fc595a4be7f6ff33edcb9c2801895d78c2090 Mon Sep 17 00:00:00 2001 From: Stephanie Wang Date: Tue, 9 Jun 2020 17:38:57 -0400 Subject: [PATCH 114/794] feat: mark auto-value-annotations scope as provided (#151) * feat: mark auto-value-annotations scope as provided recommeneded by AutoValue creator, Eamonn McManus experimented in java-bigquery https://github.com/googleapis/java-bigquery/pull/402/files * remove extra char --- java-shared-config/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d8d48df44d70..f309ead72287 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -499,6 +499,8 @@ com.google.auto.value auto-value-annotations ${auto-value-annotation.version} + + provided From 76d9c098fd1cb27126098fb8f84d144d299dce70 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 9 Jun 2020 21:56:36 -0700 Subject: [PATCH 115/794] fix: lock the google-java-format version used by formatter plugin (#149) --- java-shared-config/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index f309ead72287..5f8fb5adafb8 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -212,6 +212,13 @@ true + + + com.google.googlejavaformat + google-java-format + 1.7 + + org.codehaus.mojo From 6a7b1976cc02d4922884fc5ef4b9c5abf27fdc31 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 10 Jun 2020 05:02:15 +0000 Subject: [PATCH 116/794] chore: release 0.7.0 (#152) :robot: I have created a release \*beep\* \*boop\* --- ## [0.7.0](https://www.github.com/googleapis/java-shared-config/compare/v0.6.0...v0.7.0) (2020-06-10) ### Features * mark auto-value-annotations scope as provided ([#151](https://www.github.com/googleapis/java-shared-config/issues/151)) ([637fc59](https://www.github.com/googleapis/java-shared-config/commit/637fc595a4be7f6ff33edcb9c2801895d78c2090)) ### Bug Fixes * lock the google-java-format version used by formatter plugin ([#149](https://www.github.com/googleapis/java-shared-config/issues/149)) ([76d9c09](https://www.github.com/googleapis/java-shared-config/commit/76d9c098fd1cb27126098fb8f84d144d299dce70)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- java-shared-config/CHANGELOG.md | 12 ++++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 41d615e1fe21..8584631b9f3b 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.7.0](https://www.github.com/googleapis/java-shared-config/compare/v0.6.0...v0.7.0) (2020-06-10) + + +### Features + +* mark auto-value-annotations scope as provided ([#151](https://www.github.com/googleapis/java-shared-config/issues/151)) ([44ea4cb](https://www.github.com/googleapis/java-shared-config/commit/44ea4cbbf92b4ad35ffaffb7a01a1bce05063daf)) + + +### Bug Fixes + +* lock the google-java-format version used by formatter plugin ([#149](https://www.github.com/googleapis/java-shared-config/issues/149)) ([d58c054](https://www.github.com/googleapis/java-shared-config/commit/d58c05437a4ea8767db2bebfcc405ec77aeb9705)) + ## [0.6.0](https://www.github.com/googleapis/java-shared-config/compare/v0.5.0...v0.6.0) (2020-05-19) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index f88a22b8d402..36b4f212187e 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.6.0 + 0.7.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 5f8fb5adafb8..dbe107442ced 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.6.1-SNAPSHOT + 0.7.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 98e05151addf..d3da15e02956 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.6.0:0.6.1-SNAPSHOT +google-cloud-shared-config:0.7.0:0.7.0 From 6459c511f40b347152b14808eace9dc9d3887776 Mon Sep 17 00:00:00 2001 From: Stephanie Wang Date: Wed, 10 Jun 2020 16:48:17 -0400 Subject: [PATCH 117/794] feat: revert "feat: mark auto-value-annotations scope as provided" (#154) due to discrepancies in dependency:list resolving >1 level provided transitive deps vs. flatten plugin flattendenpendencymode==all --- java-shared-config/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index dbe107442ced..db78c2bf6764 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -506,8 +506,6 @@ com.google.auto.value auto-value-annotations ${auto-value-annotation.version} - - provided From e452f1c90a7ddfbfe1be1bcf18f0e393cc662894 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 10 Jun 2020 22:36:13 +0000 Subject: [PATCH 118/794] chore: release 0.7.1-SNAPSHOT (#155) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index db78c2bf6764..b5e4d5148474 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.7.0 + 0.7.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index d3da15e02956..c38f6734ea2e 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.7.0:0.7.0 +google-cloud-shared-config:0.7.0:0.7.1-SNAPSHOT From acb21e5b6cdef3c849e47886eeb27504521f1e3f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 10 Jun 2020 18:46:35 -0400 Subject: [PATCH 119/794] chore: release 0.8.0 (#156) * updated CHANGELOG.md [ci skip] * updated README.md [ci skip] * updated versions.txt [ci skip] * updated pom.xml Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 8584631b9f3b..32f7df1f69d1 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.8.0](https://www.github.com/googleapis/java-shared-config/compare/v0.7.0...v0.8.0) (2020-06-10) + + +### Features + +* revert "feat: mark auto-value-annotations scope as provided" ([#154](https://www.github.com/googleapis/java-shared-config/issues/154)) ([88afb4e](https://www.github.com/googleapis/java-shared-config/commit/88afb4e7c57cb6e00929c098135314a926d9da30)) + ## [0.7.0](https://www.github.com/googleapis/java-shared-config/compare/v0.6.0...v0.7.0) (2020-06-10) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 36b4f212187e..6f73a9b228ae 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.7.0 + 0.8.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b5e4d5148474..2313cc770710 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.7.1-SNAPSHOT + 0.8.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index c38f6734ea2e..ee8fe3cc1760 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.7.0:0.7.1-SNAPSHOT +google-cloud-shared-config:0.8.0:0.8.0 From a63eb1a976723aa6ecf8998c5083636b393651a7 Mon Sep 17 00:00:00 2001 From: Stephanie Wang Date: Mon, 15 Jun 2020 14:02:16 -0400 Subject: [PATCH 120/794] fix: bump flatten plugin version to fix missing version in profile section issue (#159) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2313cc770710..087fcfbb944e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -223,7 +223,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.2.2 + 1.2.3 From 8175ca9b06f375ab6d0d75164c9043817c937496 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 15 Jun 2020 14:09:57 -0400 Subject: [PATCH 121/794] chore: release 0.8.1-SNAPSHOT (#160) * updated versions.txt [ci skip] * updated pom.xml Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 087fcfbb944e..99de0c6ddd1b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.8.0 + 0.8.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index ee8fe3cc1760..c402996027a0 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.8.0:0.8.0 +google-cloud-shared-config:0.8.0:0.8.1-SNAPSHOT From 3f3d237d39ef9882c6103d4f93b0494a35e27e27 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 15 Jun 2020 18:28:07 +0000 Subject: [PATCH 122/794] chore: release 0.8.1 (#161) :robot: I have created a release \*beep\* \*boop\* --- ### [0.8.1](https://www.github.com/googleapis/java-shared-config/compare/v0.8.0...v0.8.1) (2020-06-15) ### Bug Fixes * bump flatten plugin version to fix missing version in profile section issue ([#159](https://www.github.com/googleapis/java-shared-config/issues/159)) ([a63eb1a](https://www.github.com/googleapis/java-shared-config/commit/a63eb1a976723aa6ecf8998c5083636b393651a7)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 32f7df1f69d1..0cbdd9a7bfee 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.8.1](https://www.github.com/googleapis/java-shared-config/compare/v0.8.0...v0.8.1) (2020-06-15) + + +### Bug Fixes + +* bump flatten plugin version to fix missing version in profile section issue ([#159](https://www.github.com/googleapis/java-shared-config/issues/159)) ([5b34939](https://www.github.com/googleapis/java-shared-config/commit/5b349399a590b589718b7049f66c82ee38742372)) + ## [0.8.0](https://www.github.com/googleapis/java-shared-config/compare/v0.7.0...v0.8.0) (2020-06-10) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 6f73a9b228ae..fa531ae6319c 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.8.0 + 0.8.1 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 99de0c6ddd1b..77083031a732 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.8.1-SNAPSHOT + 0.8.1 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index c402996027a0..53b494efd1cf 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.8.0:0.8.1-SNAPSHOT +google-cloud-shared-config:0.8.1:0.8.1 From a603c89769be0fa14cd07a8bf5f5229fa469ca25 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 17 Jun 2020 23:32:07 -0700 Subject: [PATCH 123/794] ci: switch to secret manager for sample/integration tests (#163) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/2c593734-539a-435d-8a04-27f04c90082f/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/c4f3059c27591eb24d6942a0e357ec94c80459f2 Source-Link: https://github.com/googleapis/synthtool/commit/6eb80fa9f96433af8dbeb1c8323aa80cda49b374 Source-Link: https://github.com/googleapis/synthtool/commit/6d3eed67a45fd58f9c7bfa173c32e4fd4fed058f Source-Link: https://github.com/googleapis/synthtool/commit/d1addcdf80aa9ddef8c932c89c919024bbad7af3 --- java-shared-config/.kokoro/build.sh | 2 +- .../.kokoro/nightly/integration.cfg | 12 ++---- .../.kokoro/nightly/samples.cfg | 16 +++---- .../.kokoro/populate-secrets.sh | 43 +++++++++++++++++++ .../.kokoro/presubmit/integration.cfg | 12 ++---- .../.kokoro/presubmit/samples.cfg | 14 +++--- java-shared-config/.kokoro/trampoline.sh | 2 + java-shared-config/synth.metadata | 4 +- 8 files changed, 67 insertions(+), 38 deletions(-) create mode 100755 java-shared-config/.kokoro/populate-secrets.sh diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index 8937c70e2339..fe8106ce9b17 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -39,7 +39,7 @@ retry_with_backoff 3 10 \ # if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then - export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS}) + export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) fi RETURN_CODE=0 diff --git a/java-shared-config/.kokoro/nightly/integration.cfg b/java-shared-config/.kokoro/nightly/integration.cfg index 40c4abb7bf08..0048c8ece7e5 100644 --- a/java-shared-config/.kokoro/nightly/integration.cfg +++ b/java-shared-config/.kokoro/nightly/integration.cfg @@ -28,14 +28,10 @@ env_vars: { env_vars: { key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + value: "secret_manager/java-it-service-account" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" } diff --git a/java-shared-config/.kokoro/nightly/samples.cfg b/java-shared-config/.kokoro/nightly/samples.cfg index 20aabd55de11..f25429314f4d 100644 --- a/java-shared-config/.kokoro/nightly/samples.cfg +++ b/java-shared-config/.kokoro/nightly/samples.cfg @@ -24,19 +24,15 @@ env_vars: { env_vars: { key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + value: "secret_manager/java-docs-samples-service-account" } env_vars: { - key: "ENABLE_BUILD_COP" - value: "true" + key: "SECRET_MANAGER_KEYS" + value: "java-docs-samples-service-account" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } +env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" } diff --git a/java-shared-config/.kokoro/populate-secrets.sh b/java-shared-config/.kokoro/populate-secrets.sh new file mode 100755 index 000000000000..f52514257ef0 --- /dev/null +++ b/java-shared-config/.kokoro/populate-secrets.sh @@ -0,0 +1,43 @@ +#!/bin/bash +# 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. + +set -eo pipefail + +function now { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n' ;} +function msg { println "$*" >&2 ;} +function println { printf '%s\n' "$(now) $*" ;} + + +# Populates requested secrets set in SECRET_MANAGER_KEYS from service account: +# kokoro-trampoline@cloud-devrel-kokoro-resources.iam.gserviceaccount.com +SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager" +msg "Creating folder on disk for secrets: ${SECRET_LOCATION}" +mkdir -p ${SECRET_LOCATION} +for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g") +do + msg "Retrieving secret ${key}" + docker run --entrypoint=gcloud \ + --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \ + gcr.io/google.com/cloudsdktool/cloud-sdk \ + secrets versions access latest \ + --project cloud-devrel-kokoro-resources \ + --secret ${key} > \ + "${SECRET_LOCATION}/${key}" + if [[ $? == 0 ]]; then + msg "Secret written to ${SECRET_LOCATION}/${key}" + else + msg "Error retrieving secret ${key}" + fi +done diff --git a/java-shared-config/.kokoro/presubmit/integration.cfg b/java-shared-config/.kokoro/presubmit/integration.cfg index 522e5b10101c..dded67a9d54a 100644 --- a/java-shared-config/.kokoro/presubmit/integration.cfg +++ b/java-shared-config/.kokoro/presubmit/integration.cfg @@ -24,14 +24,10 @@ env_vars: { env_vars: { key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + value: "secret_manager/java-it-service-account" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" } diff --git a/java-shared-config/.kokoro/presubmit/samples.cfg b/java-shared-config/.kokoro/presubmit/samples.cfg index 1171aead01f0..01e0960047b8 100644 --- a/java-shared-config/.kokoro/presubmit/samples.cfg +++ b/java-shared-config/.kokoro/presubmit/samples.cfg @@ -24,14 +24,10 @@ env_vars: { env_vars: { key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + value: "secret_manager/java-docs-samples-service-account" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } -} +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-docs-samples-service-account" +} \ No newline at end of file diff --git a/java-shared-config/.kokoro/trampoline.sh b/java-shared-config/.kokoro/trampoline.sh index ba17ce01466b..9da0f8398773 100644 --- a/java-shared-config/.kokoro/trampoline.sh +++ b/java-shared-config/.kokoro/trampoline.sh @@ -21,4 +21,6 @@ function cleanup() { echo "cleanup"; } trap cleanup EXIT + +$(dirname $0)/populate-secrets.sh # Secret Manager secrets. python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py" diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 3bd5c88fc536..69a71a8774b3 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "ded3ce9d4e8b4c69daca6c175eeaf319d36e97b9" + "sha": "d63d213b420b8205298392263baa575e23e91768" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "987270824bd26f6a8c716d5e2022057b8ae7b26e" + "sha": "c4f3059c27591eb24d6942a0e357ec94c80459f2" } } ] From bc3c6319e9c2b47ec23ba160283a066647c9484e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 18 Jun 2020 06:54:07 +0000 Subject: [PATCH 124/794] chore: release 0.8.2-SNAPSHOT (#167) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 77083031a732..1adbcaa7f4a4 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.8.1 + 0.8.2-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 53b494efd1cf..fb4284b3d2b1 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.8.1:0.8.1 +google-cloud-shared-config:0.8.1:0.8.2-SNAPSHOT From 2c6a0d8c5748f0861ec3fda55958afa666746b61 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 22 Jun 2020 22:53:26 +0200 Subject: [PATCH 125/794] build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.2.0 (#169) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [org.codehaus.mojo:build-helper-maven-plugin](http://www.mojohaus.org/build-helper-maven-plugin/) ([source](https://togithub.com/mojohaus/build-helper-maven-plugin)) | minor | `3.1.0` -> `3.2.0` | --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 1adbcaa7f4a4..bf0dcb52eef4 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -197,7 +197,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.1.0 + 3.2.0 org.codehaus.mojo From ec0ac9c686f2ad9c62b4a7f346cf1a18447a1496 Mon Sep 17 00:00:00 2001 From: Stephanie Wang Date: Thu, 25 Jun 2020 11:28:29 -0400 Subject: [PATCH 126/794] feat: add ignore rule for javax annotations to handle error in java11 (#171) --- java-shared-config/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index bf0dcb52eef4..94525fd42a57 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -193,6 +193,9 @@ org.apache.maven.plugins maven-dependency-plugin 3.1.2 + + javax.annotation:javax.annotation-api + org.codehaus.mojo From 8845d783270b653a06dfb8b4274c3da7afb05add Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 25 Jun 2020 18:28:08 +0000 Subject: [PATCH 127/794] chore: release 0.9.0 (#173) :robot: I have created a release \*beep\* \*boop\* --- ## [0.9.0](https://www.github.com/googleapis/java-shared-config/compare/v0.8.1...v0.9.0) (2020-06-25) ### Features * add ignore rule for javax annotations to handle error in java11 ([#171](https://www.github.com/googleapis/java-shared-config/issues/171)) ([ec0ac9c](https://www.github.com/googleapis/java-shared-config/commit/ec0ac9c686f2ad9c62b4a7f346cf1a18447a1496)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 0cbdd9a7bfee..9c34aaf08494 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.9.0](https://www.github.com/googleapis/java-shared-config/compare/v0.8.1...v0.9.0) (2020-06-25) + + +### Features + +* add ignore rule for javax annotations to handle error in java11 ([#171](https://www.github.com/googleapis/java-shared-config/issues/171)) ([cd635ad](https://www.github.com/googleapis/java-shared-config/commit/cd635ad6e8e5d71ac3a30e7656eb788027f1c370)) + ### [0.8.1](https://www.github.com/googleapis/java-shared-config/compare/v0.8.0...v0.8.1) (2020-06-15) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index fa531ae6319c..9e4ec782ce1e 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.8.1 + 0.9.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 94525fd42a57..f9dcb0ecfd75 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.8.2-SNAPSHOT + 0.9.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index fb4284b3d2b1..baf85b63914c 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.8.1:0.8.2-SNAPSHOT +google-cloud-shared-config:0.9.0:0.9.0 From 1a49af899834446e5863fec79d4b2a2023aa2b81 Mon Sep 17 00:00:00 2001 From: Tyler Bui-Palsulich <26876514+tbpg@users.noreply.github.com> Date: Mon, 29 Jun 2020 11:55:40 -0400 Subject: [PATCH 128/794] docs: change Devsite output path to /java/docs/reference (#176) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index f9dcb0ecfd75..b85a4f9c3abc 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -61,7 +61,7 @@ false true 1.7.2 - /java/reference/ + /java/docs/reference/ From a50e6a0cf6475c35fbe5d29e21a99084bf7d7441 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 1 Jul 2020 14:52:58 +0200 Subject: [PATCH 129/794] build(deps): update dependency org.codehaus.mojo:extra-enforcer-rules to v1.3 (#178) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b85a4f9c3abc..be7e7702d712 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -107,7 +107,7 @@ org.codehaus.mojo extra-enforcer-rules - 1.2 + 1.3 From 25b1c8b4d52feeb3e0e671bf9e3eaabd7d485cb9 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 1 Jul 2020 14:53:17 +0200 Subject: [PATCH 130/794] build(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-m5 (#165) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index be7e7702d712..3144797e1767 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -82,7 +82,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M4 + 3.0.0-M5 From 80fd1d040ac8fd5e7b69ed77ea7b1f764d8a0135 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 1 Jul 2020 14:53:54 +0200 Subject: [PATCH 131/794] build(deps): update dependency org.apache.maven.plugins:maven-site-plugin to v3.9.1 (#172) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 3144797e1767..b4d3fb165c4c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -179,7 +179,7 @@ org.apache.maven.plugins maven-site-plugin - 3.9.0 + 3.9.1 true From 1c25b563ce98e973a8613d454022722d0614bb3e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 1 Jul 2020 14:54:43 +0200 Subject: [PATCH 132/794] build(deps): update dependency org.codehaus.mojo:flatten-maven-plugin to v1.2.4 (#170) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b4d3fb165c4c..259774e23ab0 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -226,7 +226,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.2.3 + 1.2.4 From 1ddc0289c44014e275c10630faaaf07bfcb28126 Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Wed, 1 Jul 2020 12:12:35 -0400 Subject: [PATCH 133/794] fix: maven-dependency-plugin configuration breaking downstream config (#174) When providing configuration to the maven-dependency-plugin, `ignoredUnusedDeclaredDependencies` is a `java.lang.String[]` but mavens xml handling allows multiple formats for providing a list of values (comma separated string, or sub elements each specifying a single value). It appears that when loading the config, the value of the configuration at a lower level is blindly pre-pended as a string rather than first parsing and merging the results. Below is the debug output of the resolved configuration using the existing config added in ec0ac9c6, the output after this change and a diff of the two. Notice, in the left hand side of the diff the malformed xml. The change introduced in this commit switches from using the comma separated string representation, to using the sub element representation thereby allowing the config resolution to create a valid config. ###### Resolved config as of ec0ac9c6 ``` [DEBUG] Goal: org.apache.maven.plugins:maven-dependency-plugin:3.1.2:analyze (default-cli) [DEBUG] Style: Regular [DEBUG] Configuration: ${analyzer} ${failOnWarning} ${ignoreNonCompile} com.google.http-client:google-http-client-jackson2 com.google.oauth-client:google-oauth-client javax.annotation:javax.annotation-apijavax.annotation:javax.annotation-api ${outputXML} ${scriptableFlag} ${scriptableOutput} ${mdep.analyze.skip} ${verbose} ``` ###### Resolved config now ``` [DEBUG] Goal: org.apache.maven.plugins:maven-dependency-plugin:3.1.2:analyze (default-cli) [DEBUG] Style: Regular [DEBUG] Configuration: ${analyzer} ${failOnWarning} ${ignoreNonCompile} com.google.http-client:google-http-client-jackson2 com.google.oauth-client:google-oauth-client javax.annotation:javax.annotation-api ${outputXML} ${scriptableFlag} ${scriptableOutput} ${mdep.analyze.skip} ${verbose} ``` ##### Diff between resolved configs ```diff 12c12,13 < javax.annotation:javax.annotation-apijavax.annotation:javax.annotation-api --- > javax.annotation:javax.annotation-api > ``` --- java-shared-config/pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 259774e23ab0..ecd1de6eeb7d 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -194,7 +194,9 @@ maven-dependency-plugin 3.1.2 - javax.annotation:javax.annotation-api + + javax.annotation:javax.annotation-api + From 1fab329f3342d993de41202f1d6fc0a96da0b572 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2020 16:18:04 +0000 Subject: [PATCH 134/794] chore: release 0.9.1-SNAPSHOT (#177) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ecd1de6eeb7d..acc26b74439c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.9.0 + 0.9.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index baf85b63914c..430cf037fe43 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.9.0:0.9.0 +google-cloud-shared-config:0.9.0:0.9.1-SNAPSHOT From 01f9e4edfa073986f03c17f5513ffcb360b03425 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2020 16:28:06 +0000 Subject: [PATCH 135/794] chore: release 0.9.1 (#179) :robot: I have created a release \*beep\* \*boop\* --- ### [0.9.1](https://www.github.com/googleapis/java-shared-config/compare/v0.9.0...v0.9.1) (2020-07-01) ### Bug Fixes * maven-dependency-plugin configuration breaking downstream config ([#174](https://www.github.com/googleapis/java-shared-config/issues/174)) ([1ddc028](https://www.github.com/googleapis/java-shared-config/commit/1ddc0289c44014e275c10630faaaf07bfcb28126)) ### Documentation * change Devsite output path to /java/docs/reference ([#176](https://www.github.com/googleapis/java-shared-config/issues/176)) ([1a49af8](https://www.github.com/googleapis/java-shared-config/commit/1a49af899834446e5863fec79d4b2a2023aa2b81)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- java-shared-config/CHANGELOG.md | 12 ++++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 9c34aaf08494..d29ea390ae4e 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +### [0.9.1](https://www.github.com/googleapis/java-shared-config/compare/v0.9.0...v0.9.1) (2020-07-01) + + +### Bug Fixes + +* maven-dependency-plugin configuration breaking downstream config ([#174](https://www.github.com/googleapis/java-shared-config/issues/174)) ([507217f](https://www.github.com/googleapis/java-shared-config/commit/507217fe509cd4f16eb50c8075ab43229238e08d)) + + +### Documentation + +* change Devsite output path to /java/docs/reference ([#176](https://www.github.com/googleapis/java-shared-config/issues/176)) ([8b98af5](https://www.github.com/googleapis/java-shared-config/commit/8b98af54bf503d97bb86b6d02a5c4301b39384e1)) + ## [0.9.0](https://www.github.com/googleapis/java-shared-config/compare/v0.8.1...v0.9.0) (2020-06-25) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 9e4ec782ce1e..4835f224293b 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.9.0 + 0.9.1 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index acc26b74439c..2ac197b1a5d0 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.9.1-SNAPSHOT + 0.9.1 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 430cf037fe43..69db18e80ddb 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.9.0:0.9.1-SNAPSHOT +google-cloud-shared-config:0.9.1:0.9.1 From f3a8a9d0d826d2eb89154282212322ca5dc9d953 Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Wed, 1 Jul 2020 17:22:25 -0400 Subject: [PATCH 136/794] deps: update dependency org.apache.maven.surefire:surefire-junit47 to v3.0.0-M5 (#180) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2ac197b1a5d0..adab7d2358a8 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -95,7 +95,7 @@ org.apache.maven.surefire surefire-junit47 - 3.0.0-M4 + 3.0.0-M5 From 0fd4ff88ee7a2c27d7d84c002c70aaba4873b981 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2020 19:06:44 -0400 Subject: [PATCH 137/794] chore: release 0.9.2-SNAPSHOT (#181) * updated versions.txt [ci skip] * updated pom.xml Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index adab7d2358a8..952d5f1bfa57 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.9.1 + 0.9.2-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 69db18e80ddb..44b70b6a7737 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.9.1:0.9.1 +google-cloud-shared-config:0.9.1:0.9.2-SNAPSHOT From 0847906c15adea4ce0116d6a68dc0b2b2626c109 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 2 Jul 2020 21:09:13 -0400 Subject: [PATCH 138/794] chore: release 0.9.2 (#182) * updated CHANGELOG.md [ci skip] * updated README.md [ci skip] * updated versions.txt [ci skip] * updated pom.xml Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index d29ea390ae4e..265cea0a264f 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.9.2](https://www.github.com/googleapis/java-shared-config/compare/v0.9.1...v0.9.2) (2020-07-02) + + +### Dependencies + +* update dependency org.apache.maven.surefire:surefire-junit47 to v3.0.0-M5 ([#180](https://www.github.com/googleapis/java-shared-config/issues/180)) ([802d9c5](https://www.github.com/googleapis/java-shared-config/commit/802d9c528d34b386face69ca75a014ce57fc3ac1)) + ### [0.9.1](https://www.github.com/googleapis/java-shared-config/compare/v0.9.0...v0.9.1) (2020-07-01) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 4835f224293b..fa90965cb81a 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.9.1 + 0.9.2 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 952d5f1bfa57..63afd045be90 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.9.2-SNAPSHOT + 0.9.2 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 44b70b6a7737..13211a319d08 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.9.1:0.9.2-SNAPSHOT +google-cloud-shared-config:0.9.2:0.9.2 From 2cc8d0bad903d8cab636b5da06f345bde172ca9d Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 8 Jul 2020 12:48:19 -0700 Subject: [PATCH 139/794] ci(java): run dependency test on Java 8 and 11 (#175) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/351f1c1a-f71f-4cfc-968c-ac334fd05a73/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/4f2c9f752a94042472fc03c5bd9e06e89817d2bd --- java-shared-config/.github/workflows/ci.yaml | 5 ++++- java-shared-config/.kokoro/dependencies.sh | 4 +++- java-shared-config/synth.metadata | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index 445b4bf82ffd..683022075665 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -36,11 +36,14 @@ jobs: JOB_TYPE: test dependencies: runs-on: ubuntu-latest + strategy: + matrix: + java: [8, 11] steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: 8 + java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh linkage-monitor: diff --git a/java-shared-config/.kokoro/dependencies.sh b/java-shared-config/.kokoro/dependencies.sh index cf3bb4347e01..cee4f11e7547 100755 --- a/java-shared-config/.kokoro/dependencies.sh +++ b/java-shared-config/.kokoro/dependencies.sh @@ -41,8 +41,10 @@ echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************" ## Run dependency list completeness check function completenessCheck() { # Output dep list with compile scope generated using the original pom + # Running mvn dependency:list on Java versions that support modules will also include the module of the dependency. + # This is stripped from the output as it is not present in the flattened pom. msg "Generating dependency list using original pom..." - mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt + mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// | grep -v ':test$' >.org-list.txt # Output dep list generated using the flattened pom (test scope deps are ommitted) msg "Generating dependency list using flattened pom..." diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 69a71a8774b3..5d8333fcd6cb 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "d63d213b420b8205298392263baa575e23e91768" + "sha": "1b9c911ccf721882bec2ced5bc8bc1d2ad2429a6" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "c4f3059c27591eb24d6942a0e357ec94c80459f2" + "sha": "4f2c9f752a94042472fc03c5bd9e06e89817d2bd" } } ] From aba45ca9fd90ff027f7cdabfbd98f4bf25896e76 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 20 Jul 2020 15:37:34 -0700 Subject: [PATCH 140/794] chore: release 0.9.3-SNAPSHOT (#183) * updated versions.txt [ci skip] * updated pom.xml Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 63afd045be90..a039fe048b6e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.9.2 + 0.9.3-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 13211a319d08..61b87d851f39 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.9.2:0.9.2 +google-cloud-shared-config:0.9.2:0.9.3-SNAPSHOT From f93a6e9e09d4d115303b5fc7014630e33bb783a4 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 21 Jul 2020 00:38:47 +0200 Subject: [PATCH 141/794] deps: update auto-value-annotation.version to v1.7.4 (#157) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index a039fe048b6e..7605ba6ea34b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -60,7 +60,7 @@ ${project.artifactId} false true - 1.7.2 + 1.7.4 /java/docs/reference/ From b2258ce6878adfc111941fdf86a6a27d5f6a8cfb Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 6 Aug 2020 17:04:12 -0700 Subject: [PATCH 142/794] chore(docs): add cloud-RAD (#188) Co-authored-by: Jeff Ching Source-Author: Les Vogel Source-Date: Thu Jul 30 13:09:50 2020 -0700 Source-Repo: googleapis/synthtool Source-Sha: dd230c816f88d0141fcd0be83498986287220d1b Source-Link: https://github.com/googleapis/synthtool/commit/dd230c816f88d0141fcd0be83498986287220d1b --- .../.kokoro/release/publish_javadoc.cfg | 10 +++ .../.kokoro/release/publish_javadoc.sh | 25 ++++++- java-shared-config/synth.metadata | 75 ++++++++++++++++++- 3 files changed, 106 insertions(+), 4 deletions(-) diff --git a/java-shared-config/.kokoro/release/publish_javadoc.cfg b/java-shared-config/.kokoro/release/publish_javadoc.cfg index 3e124ff169a5..807e69a05181 100644 --- a/java-shared-config/.kokoro/release/publish_javadoc.cfg +++ b/java-shared-config/.kokoro/release/publish_javadoc.cfg @@ -1,14 +1,24 @@ # Format: //devtools/kokoro/config/proto/build.proto + +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/doc-templates/" + env_vars: { key: "STAGING_BUCKET" value: "docs-staging" } +env_vars: { + key: "STAGING_BUCKET_V2" + value: "docs-staging-v2-staging" + # Production will be at: docs-staging-v2 +} + env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-shared-config/.kokoro/release/publish_javadoc.sh" } + before_action { fetch_keystore { keystore_resource { diff --git a/java-shared-config/.kokoro/release/publish_javadoc.sh b/java-shared-config/.kokoro/release/publish_javadoc.sh index cb1ab503b7e3..38f5ebc17a4f 100755 --- a/java-shared-config/.kokoro/release/publish_javadoc.sh +++ b/java-shared-config/.kokoro/release/publish_javadoc.sh @@ -24,6 +24,11 @@ if [[ -z "${STAGING_BUCKET}" ]]; then exit 1 fi +if [[ -z "${STAGING_BUCKET_V2}" ]]; then + echo "Need to set STAGING_BUCKET_V2 environment variable" + exit 1 +fi + # work from the git root directory pushd $(dirname "$0")/../../ @@ -31,13 +36,13 @@ pushd $(dirname "$0")/../../ python3 -m pip install gcp-docuploader # compile all packages -mvn clean install -B -DskipTests=true +mvn clean install -B -q -DskipTests=true NAME=google-cloud-shared-config VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # build the docs -mvn site -B +mvn site -B -q pushd target/site/apidocs @@ -53,3 +58,19 @@ python3 -m docuploader upload . \ --staging-bucket ${STAGING_BUCKET} popd + +# V2 +mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/" + +pushd target/devsite + +# create metadata +python3 -m docuploader create-metadata \ + --name ${NAME} \ + --version ${VERSION} \ + --language java + +# upload docs +python3 -m docuploader upload . \ + --credentials ${CREDENTIALS} \ + --staging-bucket ${STAGING_BUCKET_V2} diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 5d8333fcd6cb..bb5ded6d23f6 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,15 +4,86 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "1b9c911ccf721882bec2ced5bc8bc1d2ad2429a6" + "sha": "5d7e394d964010a3e32af492cec4be85aabc3ebf" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "4f2c9f752a94042472fc03c5bd9e06e89817d2bd" + "sha": "dd230c816f88d0141fcd0be83498986287220d1b" } } + ], + "generatedFiles": [ + ".github/CODEOWNERS", + ".github/ISSUE_TEMPLATE/bug_report.md", + ".github/ISSUE_TEMPLATE/feature_request.md", + ".github/ISSUE_TEMPLATE/support_request.md", + ".github/PULL_REQUEST_TEMPLATE.md", + ".github/trusted-contribution.yml", + ".github/workflows/ci.yaml", + ".kokoro/build.bat", + ".kokoro/build.sh", + ".kokoro/coerce_logs.sh", + ".kokoro/common.cfg", + ".kokoro/common.sh", + ".kokoro/continuous/common.cfg", + ".kokoro/continuous/dependencies.cfg", + ".kokoro/continuous/integration.cfg", + ".kokoro/continuous/java11.cfg", + ".kokoro/continuous/java7.cfg", + ".kokoro/continuous/java8-osx.cfg", + ".kokoro/continuous/java8-win.cfg", + ".kokoro/continuous/java8.cfg", + ".kokoro/continuous/lint.cfg", + ".kokoro/continuous/propose_release.cfg", + ".kokoro/continuous/samples.cfg", + ".kokoro/dependencies.sh", + ".kokoro/linkage-monitor.sh", + ".kokoro/nightly/common.cfg", + ".kokoro/nightly/dependencies.cfg", + ".kokoro/nightly/integration.cfg", + ".kokoro/nightly/java11.cfg", + ".kokoro/nightly/java7.cfg", + ".kokoro/nightly/java8-osx.cfg", + ".kokoro/nightly/java8-win.cfg", + ".kokoro/nightly/java8.cfg", + ".kokoro/nightly/lint.cfg", + ".kokoro/nightly/samples.cfg", + ".kokoro/populate-secrets.sh", + ".kokoro/presubmit/clirr.cfg", + ".kokoro/presubmit/common.cfg", + ".kokoro/presubmit/dependencies.cfg", + ".kokoro/presubmit/integration.cfg", + ".kokoro/presubmit/java11.cfg", + ".kokoro/presubmit/java7.cfg", + ".kokoro/presubmit/java8-osx.cfg", + ".kokoro/presubmit/java8-win.cfg", + ".kokoro/presubmit/java8.cfg", + ".kokoro/presubmit/linkage-monitor.cfg", + ".kokoro/presubmit/lint.cfg", + ".kokoro/presubmit/samples.cfg", + ".kokoro/release/bump_snapshot.cfg", + ".kokoro/release/common.cfg", + ".kokoro/release/common.sh", + ".kokoro/release/drop.cfg", + ".kokoro/release/drop.sh", + ".kokoro/release/promote.cfg", + ".kokoro/release/promote.sh", + ".kokoro/release/publish_javadoc.cfg", + ".kokoro/release/publish_javadoc.sh", + ".kokoro/release/snapshot.cfg", + ".kokoro/release/snapshot.sh", + ".kokoro/release/stage.cfg", + ".kokoro/release/stage.sh", + ".kokoro/trampoline.sh", + "CODE_OF_CONDUCT.md", + "CONTRIBUTING.md", + "LICENSE", + "codecov.yaml", + "java.header", + "license-checks.xml", + "renovate.json" ] } \ No newline at end of file From 4bacfed2660ed01414129324be67c54385aa85f6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 24 Aug 2020 20:18:11 +0200 Subject: [PATCH 143/794] build(deps): update dependency org.codehaus.mojo:flatten-maven-plugin to v1.2.5 (#190) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 7605ba6ea34b..372799fc2a46 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -228,7 +228,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.2.4 + 1.2.5 From 9b1e0e2af796b8c2214be44878a32bc117ebb9ca Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 28 Sep 2020 10:51:14 -0700 Subject: [PATCH 144/794] chore: add repo settings configuration (#193) --- .../.github/sync-repo-settings.yaml | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 java-shared-config/.github/sync-repo-settings.yaml diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml new file mode 100644 index 000000000000..6bddd18eac90 --- /dev/null +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -0,0 +1,49 @@ + +# Whether or not rebase-merging is enabled on this repository. +# Defaults to `true` +rebaseMergeAllowed: false + +# Whether or not squash-merging is enabled on this repository. +# Defaults to `true` +squashMergeAllowed: true + +# Whether or not PRs are merged with a merge commit on this repository. +# Defaults to `false` +mergeCommitAllowed: false + +# Rules for master branch protection +branchProtectionRules: +# Identifies the protection rule pattern. Name of the branch to be protected. +# Defaults to `master` +- pattern: master + # Can admins overwrite branch protection. + # Defaults to `true` + isAdminEnforced: true + # Number of approving reviews required to update matching branches. + # Defaults to `1` + requiredApprovingReviewCount: 1 + # Are reviews from code owners required to update matching branches. + # Defaults to `false` + requiresCodeOwnerReviews: true + # Require up to date branches + requiresStrictStatusChecks: false + # List of required status check contexts that must pass for commits to be accepted to matching branches. + requiredStatusCheckContexts: + - "dependencies (8)" + - "dependencies (11)" + - "linkage-monitor" + - "lint" + - "clirr" + - "units (7)" + - "units (8)" + - "units (11)" + - "Kokoro - Test: Integration" + - "cla/google" +# List of explicit permissions to add (additive only) +permissionRules: +- team: yoshi-admins + permission: admin +- team: yoshi-java-admins + permission: admin +- team: yoshi-java + permission: push \ No newline at end of file From 1cf4459f41024d7a7698b02f6763bce30ed4c2ca Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 28 Sep 2020 10:52:06 -0700 Subject: [PATCH 145/794] chore: regenerate common templates (#189) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/b24e7806-61f7-4799-8de0-fc5993ab89fb/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/f8823dec98277a9516f2fb6fae9f58b3a59a23e1 Source-Link: https://github.com/googleapis/synthtool/commit/4530cc6ff080ef8aca258c1ec92c4db10a1bbfb4 --- .../.kokoro/continuous/dependencies.cfg | 12 ----- .../.kokoro/continuous/integration.cfg | 7 --- .../.kokoro/continuous/java11.cfg | 7 --- .../.kokoro/continuous/java7.cfg | 7 --- .../.kokoro/continuous/java8-osx.cfg | 3 -- .../.kokoro/continuous/java8-win.cfg | 3 -- .../.kokoro/continuous/lint.cfg | 13 ----- .../.kokoro/continuous/propose_release.cfg | 53 ------------------- .../.kokoro/continuous/samples.cfg | 31 ----------- java-shared-config/.kokoro/dependencies.sh | 9 ++-- .../.kokoro/nightly/dependencies.cfg | 12 ----- java-shared-config/.kokoro/nightly/lint.cfg | 13 ----- java-shared-config/synth.metadata | 15 +----- 13 files changed, 7 insertions(+), 178 deletions(-) delete mode 100644 java-shared-config/.kokoro/continuous/dependencies.cfg delete mode 100644 java-shared-config/.kokoro/continuous/integration.cfg delete mode 100644 java-shared-config/.kokoro/continuous/java11.cfg delete mode 100644 java-shared-config/.kokoro/continuous/java7.cfg delete mode 100644 java-shared-config/.kokoro/continuous/java8-osx.cfg delete mode 100644 java-shared-config/.kokoro/continuous/java8-win.cfg delete mode 100644 java-shared-config/.kokoro/continuous/lint.cfg delete mode 100644 java-shared-config/.kokoro/continuous/propose_release.cfg delete mode 100644 java-shared-config/.kokoro/continuous/samples.cfg delete mode 100644 java-shared-config/.kokoro/nightly/dependencies.cfg delete mode 100644 java-shared-config/.kokoro/nightly/lint.cfg diff --git a/java-shared-config/.kokoro/continuous/dependencies.cfg b/java-shared-config/.kokoro/continuous/dependencies.cfg deleted file mode 100644 index 14f44ff859bb..000000000000 --- a/java-shared-config/.kokoro/continuous/dependencies.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-shared-config/.kokoro/dependencies.sh" -} diff --git a/java-shared-config/.kokoro/continuous/integration.cfg b/java-shared-config/.kokoro/continuous/integration.cfg deleted file mode 100644 index 3b017fc80f04..000000000000 --- a/java-shared-config/.kokoro/continuous/integration.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} diff --git a/java-shared-config/.kokoro/continuous/java11.cfg b/java-shared-config/.kokoro/continuous/java11.cfg deleted file mode 100644 index 709f2b4c73db..000000000000 --- a/java-shared-config/.kokoro/continuous/java11.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java11" -} diff --git a/java-shared-config/.kokoro/continuous/java7.cfg b/java-shared-config/.kokoro/continuous/java7.cfg deleted file mode 100644 index cb24f44eea3b..000000000000 --- a/java-shared-config/.kokoro/continuous/java7.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java7" -} diff --git a/java-shared-config/.kokoro/continuous/java8-osx.cfg b/java-shared-config/.kokoro/continuous/java8-osx.cfg deleted file mode 100644 index ac4f9feb31d0..000000000000 --- a/java-shared-config/.kokoro/continuous/java8-osx.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "java-shared-config/.kokoro/build.sh" diff --git a/java-shared-config/.kokoro/continuous/java8-win.cfg b/java-shared-config/.kokoro/continuous/java8-win.cfg deleted file mode 100644 index 9d96c112a0c3..000000000000 --- a/java-shared-config/.kokoro/continuous/java8-win.cfg +++ /dev/null @@ -1,3 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -build_file: "java-shared-config/.kokoro/build.bat" diff --git a/java-shared-config/.kokoro/continuous/lint.cfg b/java-shared-config/.kokoro/continuous/lint.cfg deleted file mode 100644 index 6d323c8ae768..000000000000 --- a/java-shared-config/.kokoro/continuous/lint.cfg +++ /dev/null @@ -1,13 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "lint" -} \ No newline at end of file diff --git a/java-shared-config/.kokoro/continuous/propose_release.cfg b/java-shared-config/.kokoro/continuous/propose_release.cfg deleted file mode 100644 index 8f8965cb4564..000000000000 --- a/java-shared-config/.kokoro/continuous/propose_release.cfg +++ /dev/null @@ -1,53 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "java-shared-config/.kokoro/trampoline.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-shared-config/.kokoro/continuous/propose_release.sh" -} - -# tokens used by release-please to keep an up-to-date release PR. -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "github-magic-proxy-key-release-please" - } - } -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "github-magic-proxy-token-release-please" - } - } -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "github-magic-proxy-url-release-please" - } - } -} diff --git a/java-shared-config/.kokoro/continuous/samples.cfg b/java-shared-config/.kokoro/continuous/samples.cfg deleted file mode 100644 index fa7b493d0b5c..000000000000 --- a/java-shared-config/.kokoro/continuous/samples.cfg +++ /dev/null @@ -1,31 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "samples" -} - -env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" -} - -env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } -} diff --git a/java-shared-config/.kokoro/dependencies.sh b/java-shared-config/.kokoro/dependencies.sh index cee4f11e7547..c91e5a56937a 100755 --- a/java-shared-config/.kokoro/dependencies.sh +++ b/java-shared-config/.kokoro/dependencies.sh @@ -43,12 +43,13 @@ function completenessCheck() { # Output dep list with compile scope generated using the original pom # Running mvn dependency:list on Java versions that support modules will also include the module of the dependency. # This is stripped from the output as it is not present in the flattened pom. + # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list. msg "Generating dependency list using original pom..." - mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// | grep -v ':test$' >.org-list.txt + mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt - # Output dep list generated using the flattened pom (test scope deps are ommitted) + # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) msg "Generating dependency list using flattened pom..." - mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt + mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt # Compare two dependency lists msg "Comparing dependency lists..." @@ -85,4 +86,4 @@ then else msg "Errors found. See log statements above." exit 1 -fi +fi \ No newline at end of file diff --git a/java-shared-config/.kokoro/nightly/dependencies.cfg b/java-shared-config/.kokoro/nightly/dependencies.cfg deleted file mode 100644 index 14f44ff859bb..000000000000 --- a/java-shared-config/.kokoro/nightly/dependencies.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-shared-config/.kokoro/dependencies.sh" -} diff --git a/java-shared-config/.kokoro/nightly/lint.cfg b/java-shared-config/.kokoro/nightly/lint.cfg deleted file mode 100644 index 6d323c8ae768..000000000000 --- a/java-shared-config/.kokoro/nightly/lint.cfg +++ /dev/null @@ -1,13 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "JOB_TYPE" - value: "lint" -} \ No newline at end of file diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index bb5ded6d23f6..ad50bf8b127d 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "5d7e394d964010a3e32af492cec4be85aabc3ebf" + "sha": "3bdd06d838581fac811266667ffec98b7ed91eee" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "dd230c816f88d0141fcd0be83498986287220d1b" + "sha": "f8823dec98277a9516f2fb6fae9f58b3a59a23e1" } } ], @@ -29,27 +29,16 @@ ".kokoro/common.cfg", ".kokoro/common.sh", ".kokoro/continuous/common.cfg", - ".kokoro/continuous/dependencies.cfg", - ".kokoro/continuous/integration.cfg", - ".kokoro/continuous/java11.cfg", - ".kokoro/continuous/java7.cfg", - ".kokoro/continuous/java8-osx.cfg", - ".kokoro/continuous/java8-win.cfg", ".kokoro/continuous/java8.cfg", - ".kokoro/continuous/lint.cfg", - ".kokoro/continuous/propose_release.cfg", - ".kokoro/continuous/samples.cfg", ".kokoro/dependencies.sh", ".kokoro/linkage-monitor.sh", ".kokoro/nightly/common.cfg", - ".kokoro/nightly/dependencies.cfg", ".kokoro/nightly/integration.cfg", ".kokoro/nightly/java11.cfg", ".kokoro/nightly/java7.cfg", ".kokoro/nightly/java8-osx.cfg", ".kokoro/nightly/java8-win.cfg", ".kokoro/nightly/java8.cfg", - ".kokoro/nightly/lint.cfg", ".kokoro/nightly/samples.cfg", ".kokoro/populate-secrets.sh", ".kokoro/presubmit/clirr.cfg", From 6dca5e8879e6602807635541d5435b988c9f4882 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 28 Sep 2020 20:02:15 +0200 Subject: [PATCH 146/794] build(deps): update dependency org.jacoco:jacoco-maven-plugin to v0.8.6 (#192) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 372799fc2a46..597c5ba67a84 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -187,7 +187,7 @@ org.jacoco jacoco-maven-plugin - 0.8.5 + 0.8.6 org.apache.maven.plugins From a03426887acf0e0fcf3b89a2cbfbf09d74ffd886 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 28 Sep 2020 20:02:41 +0200 Subject: [PATCH 147/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.1.1 (#191) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 597c5ba67a84..470a909ca987 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -414,7 +414,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.0 + 3.1.1 From b9d1aedc68c3e3b50d89275e3cf3d54464103d5a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 15 Oct 2020 15:36:16 -0700 Subject: [PATCH 148/794] chore: regenerate common templates (#195) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/9000f390-5830-4388-9df6-3b2001b2e111/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/27e0e916cbfdb3d5ff6639b686cc04f78a0b0386 Source-Link: https://github.com/googleapis/synthtool/commit/b65ef07d99946d23e900ef2cc490274a16edd336 Source-Link: https://github.com/googleapis/synthtool/commit/0762e8ee2ec21cdfc4d82020b985a104feb0453b Source-Link: https://github.com/googleapis/synthtool/commit/8a7a3021fe97aa0a3641db642fe2b767f1c8110f Source-Link: https://github.com/googleapis/synthtool/commit/e6168630be3e31eede633ba2c6f1cd64248dec1c Source-Link: https://github.com/googleapis/synthtool/commit/da29da32b3a988457b49ae290112b74f14b713cc Source-Link: https://github.com/googleapis/synthtool/commit/95dbe1bee3c7f7e52ddb24a54c37080620e0d1a2 Source-Link: https://github.com/googleapis/synthtool/commit/916c10e8581804df2b48a0f0457d848f3faa582e Source-Link: https://github.com/googleapis/synthtool/commit/80003a3de2d8a75f5b47cb2e77e018f7f0f776cc Source-Link: https://github.com/googleapis/synthtool/commit/538a68019eb4a36a0cdfa4021f324dd01b784395 Source-Link: https://github.com/googleapis/synthtool/commit/019c7168faa0e56619f792693a8acdb30d6de19b Source-Link: https://github.com/googleapis/synthtool/commit/968465a1cad496e1292ef4584a054a35f756ff94 Source-Link: https://github.com/googleapis/synthtool/commit/9602086c6c5b05db77950c7f7495a2a3868f3537 Source-Link: https://github.com/googleapis/synthtool/commit/c3caf0704f25a0c365f1c315e804a30b87c62a75 --- java-shared-config/.github/CODEOWNERS | 2 + java-shared-config/.github/readme/synth.py | 19 ++++ .../.github/workflows/auto-release.yaml | 88 +++++++++++++++++++ .../.github/workflows/formatting.yaml | 25 ++++++ .../.github/workflows/samples.yaml | 14 +++ java-shared-config/.kokoro/build.sh | 11 ++- .../.kokoro/continuous/readme.cfg | 55 ++++++++++++ java-shared-config/.kokoro/readme.sh | 36 ++++++++ java-shared-config/.kokoro/release/stage.cfg | 31 +------ java-shared-config/synth.metadata | 10 ++- 10 files changed, 259 insertions(+), 32 deletions(-) create mode 100644 java-shared-config/.github/readme/synth.py create mode 100644 java-shared-config/.github/workflows/auto-release.yaml create mode 100644 java-shared-config/.github/workflows/formatting.yaml create mode 100644 java-shared-config/.github/workflows/samples.yaml create mode 100644 java-shared-config/.kokoro/continuous/readme.cfg create mode 100755 java-shared-config/.kokoro/readme.sh diff --git a/java-shared-config/.github/CODEOWNERS b/java-shared-config/.github/CODEOWNERS index 6137bef2a259..30fdb7b9c8f7 100644 --- a/java-shared-config/.github/CODEOWNERS +++ b/java-shared-config/.github/CODEOWNERS @@ -4,5 +4,7 @@ # For syntax help see: # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax +* @googleapis/yoshi-java + # The java-samples-reviewers team is the default owner for samples changes samples/**/*.java @googleapis/java-samples-reviewers diff --git a/java-shared-config/.github/readme/synth.py b/java-shared-config/.github/readme/synth.py new file mode 100644 index 000000000000..7b48cc28d361 --- /dev/null +++ b/java-shared-config/.github/readme/synth.py @@ -0,0 +1,19 @@ +# 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/java-shared-config/.github/workflows/auto-release.yaml b/java-shared-config/.github/workflows/auto-release.yaml new file mode 100644 index 000000000000..bc1554aecba2 --- /dev/null +++ b/java-shared-config/.github/workflows/auto-release.yaml @@ -0,0 +1,88 @@ +on: + pull_request: +name: auto-release +jobs: + approve: + runs-on: ubuntu-latest + if: contains(github.head_ref, 'release-v') + steps: + - uses: actions/github-script@v3.0.0 + with: + github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} + debug: true + script: | + // only approve PRs from release-please[bot] + if (context.payload.pull_request.user.login !== "release-please[bot]") { + return; + } + + // only approve PRs like "chore: release " + if ( !context.payload.pull_request.title.startsWith("chore: release") ) { + return; + } + + // only approve PRs with pom.xml and versions.txt changes + const filesPromise = github.pulls.listFiles.endpoint({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: context.payload.pull_request.number, + }); + const changed_files = await github.paginate(filesPromise) + + if ( changed_files.length < 1 ) { + console.log( "Not proceeding since PR is empty!" ) + return; + } + + if ( !changed_files.some(v => v.filename.includes("pom")) || !changed_files.some(v => v.filename.includes("versions.txt")) ) { + console.log( "PR file changes do not have pom.xml or versions.txt -- something is wrong. PTAL!" ) + return; + } + + // trigger auto-release when + // 1) it is a SNAPSHOT release (auto-generated post regular release) + // 2) there are dependency updates only + // 3) there are no open dependency update PRs in this repo (to avoid multiple releases) + if ( + context.payload.pull_request.body.includes("Fix") || + context.payload.pull_request.body.includes("Build") || + context.payload.pull_request.body.includes("Documentation") || + context.payload.pull_request.body.includes("BREAKING CHANGES") || + context.payload.pull_request.body.includes("Features") + ) { + console.log( "Not auto-releasing since it is not a dependency-update-only release." ); + return; + } + + const promise = github.pulls.list.endpoint({ + owner: context.repo.owner, + repo: context.repo.repo, + state: 'open' + }); + const open_pulls = await github.paginate(promise) + + if ( open_pulls.length > 1 && !context.payload.pull_request.title.includes("SNAPSHOT") ) { + for ( const pull of open_pulls ) { + if ( pull.title.startsWith("deps: update dependency") ) { + console.log( "Not auto-releasing yet since there are dependency update PRs open in this repo." ); + return; + } + } + } + + // approve release PR + await github.pulls.createReview({ + owner: context.repo.owner, + repo: context.repo.repo, + body: 'Rubber stamped release!', + pull_number: context.payload.pull_request.number, + event: 'APPROVE' + }); + + // attach kokoro:force-run and automerge labels + await github.issues.addLabels({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.payload.pull_request.number, + labels: ['kokoro:force-run', 'automerge'] + }); diff --git a/java-shared-config/.github/workflows/formatting.yaml b/java-shared-config/.github/workflows/formatting.yaml new file mode 100644 index 000000000000..d4d367cfce03 --- /dev/null +++ b/java-shared-config/.github/workflows/formatting.yaml @@ -0,0 +1,25 @@ +on: + pull_request_target: + types: [opened, synchronize] + branches: + - master +name: format +jobs: + format-code: + runs-on: ubuntu-latest + env: + ACCESS_TOKEN: ${{ secrets.YOSHI_CODE_BOT_TOKEN }} + steps: + - uses: actions/checkout@v2 + with: + ref: ${{github.event.pull_request.head.ref}} + repository: ${{github.event.pull_request.head.repo.full_name}} + - uses: actions/setup-java@v1 + with: + java-version: 11 + - run: "mvn com.coveo:fmt-maven-plugin:format" + - uses: googleapis/code-suggester@v1.8.0 + with: + command: review + pull_number: ${{ github.event.pull_request.number }} + git_dir: '.' diff --git a/java-shared-config/.github/workflows/samples.yaml b/java-shared-config/.github/workflows/samples.yaml new file mode 100644 index 000000000000..c46230a78c38 --- /dev/null +++ b/java-shared-config/.github/workflows/samples.yaml @@ -0,0 +1,14 @@ +on: + pull_request: +name: samples +jobs: + checkstyle: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 8 + - name: Run checkstyle + run: mvn -P lint --quiet --batch-mode checkstyle:check + working-directory: samples/snippets diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index fe8106ce9b17..ed44f5e37b41 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -69,9 +69,16 @@ integration) RETURN_CODE=$? ;; samples) - if [[ -f samples/pom.xml ]] + SAMPLES_DIR=samples + # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. + if [[ ! -z ${KOKORO_GITHUB_PULL_REQUEST_NUMBER} ]] then - pushd samples + SAMPLES_DIR=samples/snapshot + fi + + if [[ -f ${SAMPLES_DIR}/pom.xml ]] + then + pushd {SAMPLES_DIR} mvn -B \ -Penable-samples \ -DtrimStackTrace=false \ diff --git a/java-shared-config/.kokoro/continuous/readme.cfg b/java-shared-config/.kokoro/continuous/readme.cfg new file mode 100644 index 000000000000..c41a0ae88777 --- /dev/null +++ b/java-shared-config/.kokoro/continuous/readme.cfg @@ -0,0 +1,55 @@ +# 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-shared-config/.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/java-shared-config/.kokoro/readme.sh b/java-shared-config/.kokoro/readme.sh new file mode 100755 index 000000000000..2c5f134370a6 --- /dev/null +++ b/java-shared-config/.kokoro/readme.sh @@ -0,0 +1,36 @@ +#!/bin/bash +# 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. + +set -eo pipefail + +cd ${KOKORO_ARTIFACTS_DIR}/github/java-shared-config + +# Disable buffering, so that the logs stream through. +export PYTHONUNBUFFERED=1 + +# Kokoro exposes this as a file, but the scripts expect just a plain variable. +export GITHUB_TOKEN=$(cat ${KOKORO_KEYSTORE_DIR}/73713_yoshi-automation-github-key) + +# Setup git credentials +echo "https://${GITHUB_TOKEN}:@github.com" >> ~/.git-credentials +git config --global credential.helper 'store --file ~/.git-credentials' + +python3.6 -m pip install git+https://github.com/googleapis/synthtool.git#egg=gcp-synthtool +python3.6 -m autosynth.synth \ + --repository=googleapis/java-shared-config \ + --synth-file-name=.github/readme/synth.py \ + --metadata-path=.github/readme/synth.metadata \ + --pr-title="chore: regenerate README" \ + --branch-suffix="readme" \ No newline at end of file diff --git a/java-shared-config/.kokoro/release/stage.cfg b/java-shared-config/.kokoro/release/stage.cfg index 427c14833e1e..c1a342f6c803 100644 --- a/java-shared-config/.kokoro/release/stage.cfg +++ b/java-shared-config/.kokoro/release/stage.cfg @@ -13,32 +13,7 @@ action { } } -# Fetch the token needed for reporting release status to GitHub -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "yoshi-automation-github-key" - } - } -} - -# Fetch magictoken to use with Magic Github Proxy -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "releasetool-magictoken" - } - } -} - -# Fetch api key to use with Magic Github Proxy -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "magic-github-proxy-api-key" - } - } +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem" } diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index ad50bf8b127d..4847b753fa2f 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "3bdd06d838581fac811266667ffec98b7ed91eee" + "sha": "a0120d20589240e095499598ad277b2683f86ba9" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "f8823dec98277a9516f2fb6fae9f58b3a59a23e1" + "sha": "27e0e916cbfdb3d5ff6639b686cc04f78a0b0386" } } ], @@ -21,8 +21,12 @@ ".github/ISSUE_TEMPLATE/feature_request.md", ".github/ISSUE_TEMPLATE/support_request.md", ".github/PULL_REQUEST_TEMPLATE.md", + ".github/readme/synth.py", ".github/trusted-contribution.yml", + ".github/workflows/auto-release.yaml", ".github/workflows/ci.yaml", + ".github/workflows/formatting.yaml", + ".github/workflows/samples.yaml", ".kokoro/build.bat", ".kokoro/build.sh", ".kokoro/coerce_logs.sh", @@ -30,6 +34,7 @@ ".kokoro/common.sh", ".kokoro/continuous/common.cfg", ".kokoro/continuous/java8.cfg", + ".kokoro/continuous/readme.cfg", ".kokoro/dependencies.sh", ".kokoro/linkage-monitor.sh", ".kokoro/nightly/common.cfg", @@ -53,6 +58,7 @@ ".kokoro/presubmit/linkage-monitor.cfg", ".kokoro/presubmit/lint.cfg", ".kokoro/presubmit/samples.cfg", + ".kokoro/readme.sh", ".kokoro/release/bump_snapshot.cfg", ".kokoro/release/common.cfg", ".kokoro/release/common.sh", From 87354c0808a7a705526a0e0431ff7f2e29ea7eaf Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 15 Oct 2020 23:18:14 +0000 Subject: [PATCH 149/794] chore: release 0.9.3 (#186) :robot: I have created a release \*beep\* \*boop\* --- ### [0.9.3](https://www.github.com/googleapis/java-shared-config/compare/v0.9.2...v0.9.3) (2020-10-15) ### Dependencies * update auto-value-annotation.version to v1.7.4 ([#157](https://www.github.com/googleapis/java-shared-config/issues/157)) ([f93a6e9](https://www.github.com/googleapis/java-shared-config/commit/f93a6e9e09d4d115303b5fc7014630e33bb783a4)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 265cea0a264f..a0020996d36c 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.9.3](https://www.github.com/googleapis/java-shared-config/compare/v0.9.2...v0.9.3) (2020-10-15) + + +### Dependencies + +* update auto-value-annotation.version to v1.7.4 ([#157](https://www.github.com/googleapis/java-shared-config/issues/157)) ([5d7e394](https://www.github.com/googleapis/java-shared-config/commit/5d7e394d964010a3e32af492cec4be85aabc3ebf)) + ### [0.9.2](https://www.github.com/googleapis/java-shared-config/compare/v0.9.1...v0.9.2) (2020-07-02) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index fa90965cb81a..58ee58131666 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.9.2 + 0.9.3 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 470a909ca987..7d0a5df82abf 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.9.3-SNAPSHOT + 0.9.3 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 61b87d851f39..2aac9d0a9a51 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.9.2:0.9.3-SNAPSHOT +google-cloud-shared-config:0.9.3:0.9.3 From 90f36a3e8caa704b0b4c901033687820fb31b344 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 16 Oct 2020 08:08:04 +0000 Subject: [PATCH 150/794] chore: release 0.9.4-SNAPSHOT (#197) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 7d0a5df82abf..3051242ad9cd 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-config pom - 0.9.3 + 0.9.4-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 2aac9d0a9a51..decaebba2b94 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.9.3:0.9.3 +google-cloud-shared-config:0.9.3:0.9.4-SNAPSHOT From 314889746a920c82faff98054ef1389bc9372332 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 16 Oct 2020 09:08:49 -0700 Subject: [PATCH 151/794] build(java): auto-approve README regeneration (#198) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/c5774b2c-8184-4adf-a8e1-dd200c62b13a/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/7c5370937dd9ba9dcf9cd7d2af880a58b389b4f1 --- .../.github/workflows/approve-readme.yaml | 54 +++++++++++++++++++ java-shared-config/synth.metadata | 5 +- 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 java-shared-config/.github/workflows/approve-readme.yaml diff --git a/java-shared-config/.github/workflows/approve-readme.yaml b/java-shared-config/.github/workflows/approve-readme.yaml new file mode 100644 index 000000000000..e2d841d6c5a0 --- /dev/null +++ b/java-shared-config/.github/workflows/approve-readme.yaml @@ -0,0 +1,54 @@ +on: + pull_request: +name: auto-merge-readme +jobs: + approve: + runs-on: ubuntu-latest + if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' + steps: + - uses: actions/github-script@v3.0.0 + with: + github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} + script: | + // only approve PRs from yoshi-automation + if (context.payload.pull_request.user.login !== "yoshi-automation") { + return; + } + + // only approve PRs like "chore: release " + if (!context.payload.pull_request.title === "chore: regenerate README") { + return; + } + + // only approve PRs with README.md and synth.metadata changes + const files = new Set( + ( + await github.paginate( + github.pulls.listFiles.endpoint({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: context.payload.pull_request.number, + }) + ) + ).map(file => file.filename) + ); + if (files.size != 2 || !files.has("README.md") || !files.has(".github/readme/synth.metadata/synth.metadata")) { + return; + } + + // approve README regeneration PR + await github.pulls.createReview({ + owner: context.repo.owner, + repo: context.repo.repo, + body: 'Rubber stamped PR!', + pull_number: context.payload.pull_request.number, + event: 'APPROVE' + }); + + // attach automerge label + await github.issues.addLabels({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.payload.pull_request.number, + labels: ['automerge'] + }); diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 4847b753fa2f..3650df6e1c6e 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "a0120d20589240e095499598ad277b2683f86ba9" + "sha": "ca37617b2c3d580f30d67c6ef0068614505263b0" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "27e0e916cbfdb3d5ff6639b686cc04f78a0b0386" + "sha": "7c5370937dd9ba9dcf9cd7d2af880a58b389b4f1" } } ], @@ -23,6 +23,7 @@ ".github/PULL_REQUEST_TEMPLATE.md", ".github/readme/synth.py", ".github/trusted-contribution.yml", + ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", ".github/workflows/ci.yaml", ".github/workflows/formatting.yaml", From 93ffe50b719266c9168088fde2c054821afc9472 Mon Sep 17 00:00:00 2001 From: Les Vogel Date: Tue, 20 Oct 2020 10:39:04 -0700 Subject: [PATCH 152/794] docs: Latest for Cloud-RAD (#199) * Latest for Cloud-RAD * Initial try at DocFX (still in progress) * send correct paths to Javadoc / docLava * Simplify AntRun processing * chore(docs): Fix code review problems * Make sure google-java-format version is 1.7 * Add comment to use of SNAPSHOT --- java-shared-config/pom.xml | 90 ++++++++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 19 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 3051242ad9cd..d81f8fd9e30f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 com.google.cloud google-cloud-shared-config @@ -26,7 +28,8 @@ scm:git:git@github.com:googleapis/java-shared-config.git - scm:git:git@github.com:googleapis/java-shared-config.git + scm:git:git@github.com:googleapis/java-shared-config.git + https://github.com/googleapis/java-shared-config HEAD @@ -195,7 +198,8 @@ 3.1.2 - javax.annotation:javax.annotation-api + javax.annotation:javax.annotation-api + @@ -640,12 +644,59 @@ + enable-integration-tests false + + + + docFX + + + docFX + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 + + + site + + aggregate + + + + + com.microsoft.doclet.DocFxDoclet + + com.microsoft + docfx-doclet + 1.0-SNAPSHOT + + + + com.google.j2objc + j2objc-annotations + 1.3 + + + false + -outputpath ${project.build.directory}/docfx/ + + + + + + + devsite-apidocs @@ -656,6 +707,8 @@ + maven-javadoc-plugin @@ -693,13 +746,13 @@ /java/_project.yaml -hdf devsite.path - ${docRoot} + ${docRoot}${env.NAME}/latest/ -d ${project.build.directory}/devsite -templatedir ${devsite.template} -toroot - ${docRoot} + ${docRoot}${env.NAME}/latest/ -yaml _toc.yaml -warning @@ -711,7 +764,7 @@ maven-antrun-plugin - 1.8 + 3.0.0 site @@ -720,19 +773,18 @@ - - - - - - - - - - - - - + + + + + + + + + + From f39400aa79b5401d44c326518f82b058cfdd70c6 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 20 Oct 2020 15:39:41 -0700 Subject: [PATCH 153/794] build(java): enable snippet-bot (#200) Source-Author: Jeff Ching Source-Date: Mon Oct 19 16:13:57 2020 -0700 Source-Repo: googleapis/synthtool Source-Sha: 5a506ec8765cc04f7e29f888b8e9b257d9a7ae11 Source-Link: https://github.com/googleapis/synthtool/commit/5a506ec8765cc04f7e29f888b8e9b257d9a7ae11 --- java-shared-config/.github/snippet-bot.yml | 0 java-shared-config/synth.metadata | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 java-shared-config/.github/snippet-bot.yml diff --git a/java-shared-config/.github/snippet-bot.yml b/java-shared-config/.github/snippet-bot.yml new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 3650df6e1c6e..b9663d210d84 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "ca37617b2c3d580f30d67c6ef0068614505263b0" + "sha": "0cf9c257dbae231b5ee5df3727262f3915159945" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "7c5370937dd9ba9dcf9cd7d2af880a58b389b4f1" + "sha": "5a506ec8765cc04f7e29f888b8e9b257d9a7ae11" } } ], @@ -22,6 +22,7 @@ ".github/ISSUE_TEMPLATE/support_request.md", ".github/PULL_REQUEST_TEMPLATE.md", ".github/readme/synth.py", + ".github/snippet-bot.yml", ".github/trusted-contribution.yml", ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", From 21675650abc26e073bf05f3be673ebc31c038d0c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 21 Oct 2020 11:16:30 -0700 Subject: [PATCH 154/794] chore: clean up and update renovate.json (#202) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/fc1413bf-7539-42ca-a3cb-6a8d29e26892/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/6abb59097be84599a1d6091fe534a49e5c5cf948 --- java-shared-config/renovate.json | 30 +++++++++++------------------- java-shared-config/synth.metadata | 4 ++-- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index cff15d8bf50a..ece688b009ba 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -17,24 +17,6 @@ ], "versionScheme": "docker" }, - { - "packagePatterns": [ - "^com.google.api:gax", - "^com.google.auth:", - "^com.google.cloud:google-cloud-core", - "^io.grpc:", - "^com.google.guava:" - ], - "groupName": "core dependencies" - }, - { - "packagePatterns": [ - "^com.google.http-client:", - "^com.google.oauth-client:", - "^com.google.api-client:" - ], - "groupName": "core transport dependencies" - }, { "packagePatterns": [ "*" @@ -63,6 +45,16 @@ "semanticCommitType": "chore", "semanticCommitScope": "deps" }, + { + "packagePatterns": [ + "^junit:junit", + "^com.google.truth:truth", + "^org.mockito:mockito-core", + "^org.objenesis:objenesis" + ], + "semanticCommitType": "test", + "semanticCommitScope": "deps" + }, { "packagePatterns": [ "^com.google.cloud:google-cloud-" @@ -78,4 +70,4 @@ ], "semanticCommits": true, "masterIssue": true -} \ No newline at end of file +} diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index b9663d210d84..276a3e41b4c4 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "0cf9c257dbae231b5ee5df3727262f3915159945" + "sha": "9cd7230e544cb5010bedb74e678e7793daa2b852" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "5a506ec8765cc04f7e29f888b8e9b257d9a7ae11" + "sha": "6abb59097be84599a1d6091fe534a49e5c5cf948" } } ], From 8c1a52f5d9558089bbcd46e54ffd9cb0c1aec1a3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 27 Oct 2020 18:46:57 +0100 Subject: [PATCH 155/794] deps: update dependency com.puppycrawl.tools:checkstyle to v8.36.2 (#142) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d81f8fd9e30f..8dd82e11e406 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -612,7 +612,7 @@ com.puppycrawl.tools checkstyle - 8.29 + 8.36.2 From 8bcbb8eee9a9c1fce8ec546385558e3f129d2a33 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 27 Oct 2020 18:47:32 +0100 Subject: [PATCH 156/794] build(deps): update dependency org.codehaus.mojo:exec-maven-plugin to v3 (#144) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 8dd82e11e406..3446dc41f6db 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -117,7 +117,7 @@ org.codehaus.mojo exec-maven-plugin - 1.6.0 + 3.0.0 # Code of Conduct ## Our Pledge @@ -69,12 +70,12 @@ dispute. If you are unable to resolve the matter for any reason, or if the behavior is threatening or harassing, report it. We are dedicated to providing an environment where participants feel welcome and safe. -Reports should be directed to *[PROJECT STEWARD NAME(s) AND EMAIL(s)]*, the -Project Steward(s) for *[PROJECT NAME]*. It is the Project Steward’s duty to +Reports should be directed to *googleapis-stewards@google.com*, the +Project Steward(s) for *Google Cloud Client Libraries*. It is the Project Steward’s duty to receive and address reported violations of the code of conduct. They will then work with a committee consisting of representatives from the Open Source Programs Office and the Google Open Source Strategy team. If for any reason you -are uncomfortable reaching out the Project Steward, please email +are uncomfortable reaching out to the Project Steward, please email opensource@google.com. We will investigate every complaint, but you may not receive a direct response. diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 276a3e41b4c4..6b9452acdfdd 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "9cd7230e544cb5010bedb74e678e7793daa2b852" + "sha": "4734e89f2b30951a6a0ce9b384c223087737607b" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6abb59097be84599a1d6091fe534a49e5c5cf948" + "sha": "5f6ef0ec5501d33c4667885b37a7685a30d41a76" } } ], From e7f78e4da7017010092297e8d1b944a5a317bec7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 27 Oct 2020 10:48:48 -0700 Subject: [PATCH 158/794] chore: release 0.9.4 (#201) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index a0020996d36c..c3bb5ec46f7b 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.9.4](https://www.github.com/googleapis/java-shared-config/compare/v0.9.3...v0.9.4) (2020-10-21) + + +### Documentation + +* Latest for Cloud-RAD ([#199](https://www.github.com/googleapis/java-shared-config/issues/199)) ([34712af](https://www.github.com/googleapis/java-shared-config/commit/34712afac58aa0d148f0843026b3ff770ee030c2)) + ### [0.9.3](https://www.github.com/googleapis/java-shared-config/compare/v0.9.2...v0.9.3) (2020-10-15) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 58ee58131666..c071c82ba904 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.9.3 + 0.9.4 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 3446dc41f6db..40098efbbcaf 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.9.4-SNAPSHOT + 0.9.4 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index decaebba2b94..3fb548bf46d9 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.9.3:0.9.4-SNAPSHOT +google-cloud-shared-config:0.9.4:0.9.4 From 78abbc2914678531e1ac022935056520c87f9d3b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 28 Oct 2020 08:10:03 +0000 Subject: [PATCH 159/794] chore: release 0.9.5-SNAPSHOT (#205) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 40098efbbcaf..fdcc82a5b105 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.9.4 + 0.9.5-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 3fb548bf46d9..beb7ef637c45 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.9.4:0.9.4 +google-cloud-shared-config:0.9.4:0.9.5-SNAPSHOT From 0bb0a8cb25924fff738c097e1b017205543b9506 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 8 Dec 2020 14:18:09 -0800 Subject: [PATCH 160/794] chore(ci): fix typo in restrict presubmit samples ITs to only snapshot (#204) Fixes below error in Java repos when https://github.com/googleapis/synthtool/pull/804 was merged: ``` github/java-bigquerystorage/.kokoro/build.sh: line 81: pushd: {SAMPLES_DIR}: No such file or directory ``` Thanks @kolea2 for spotting this in Fusion build logs. cc @chingor13 Source-Author: Stephanie Wang Source-Date: Mon Oct 26 13:44:04 2020 -0400 Source-Repo: googleapis/synthtool Source-Sha: f68649c5f26bcff6817c6d21e90dac0fc71fef8e Source-Link: https://github.com/googleapis/synthtool/commit/f68649c5f26bcff6817c6d21e90dac0fc71fef8e --- java-shared-config/.kokoro/build.sh | 2 +- java-shared-config/synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index ed44f5e37b41..30f16951cbdf 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -78,7 +78,7 @@ samples) if [[ -f ${SAMPLES_DIR}/pom.xml ]] then - pushd {SAMPLES_DIR} + pushd ${SAMPLES_DIR} mvn -B \ -Penable-samples \ -DtrimStackTrace=false \ diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 6b9452acdfdd..c80f05055952 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "4734e89f2b30951a6a0ce9b384c223087737607b" + "sha": "be64fe9d3edc4de27d486c7a97a3dd03cfcab6e6" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "5f6ef0ec5501d33c4667885b37a7685a30d41a76" + "sha": "f68649c5f26bcff6817c6d21e90dac0fc71fef8e" } } ], From 86cc26f94dbc967ebdd38c2fa782aa229f6897bf Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 29 Dec 2020 16:21:33 -0800 Subject: [PATCH 161/794] chore: regenerate common templates (#210) * chore(java): enable generated-files-bot This bot will comment on pull requests that modify templated files. For java, we configure to read from our 2 synth.metadata files: (primary templates and README) Source-Author: Jeff Ching Source-Date: Fri Oct 30 14:22:02 2020 -0700 Source-Repo: googleapis/synthtool Source-Sha: b19b401571e77192f8dd38eab5fb2300a0de9324 Source-Link: https://github.com/googleapis/synthtool/commit/b19b401571e77192f8dd38eab5fb2300a0de9324 * chore(java): use production staging bucket Source-Author: Les Vogel Source-Date: Wed Nov 4 10:18:01 2020 -0800 Source-Repo: googleapis/synthtool Source-Sha: c7824ea48ff6d4d42dfae0849aec8a85acd90bd9 Source-Link: https://github.com/googleapis/synthtool/commit/c7824ea48ff6d4d42dfae0849aec8a85acd90bd9 * chore(java): ignore return code 28 in README autosynth job Exit code 28 is returned if no changes are required and should not be considered a failure. Source-Author: Jeff Ching Source-Date: Mon Nov 9 14:51:28 2020 -0800 Source-Repo: googleapis/synthtool Source-Sha: 7db8a6c5ffb12a6e4c2f799c18f00f7f3d60e279 Source-Link: https://github.com/googleapis/synthtool/commit/7db8a6c5ffb12a6e4c2f799c18f00f7f3d60e279 * build(java): use code-suggester v1 tag rather than full semver Source-Author: Jeff Ching Source-Date: Thu Nov 12 10:07:08 2020 -0800 Source-Repo: googleapis/synthtool Source-Sha: 7d652819519dfa24da9e14548232e4aaba71a11c Source-Link: https://github.com/googleapis/synthtool/commit/7d652819519dfa24da9e14548232e4aaba71a11c * build(java): use actions/github-script v3 tag rather than full semver So that renovate-bot stops proposing PRs like [this](https://github.com/googleapis/java-bigquerydatatransfer/pull/515/files)! Source-Author: Stephanie Wang Source-Date: Tue Nov 17 13:02:02 2020 -0500 Source-Repo: googleapis/synthtool Source-Sha: 7fcc405a579d5d53a726ff3da1b7c8c08f0f2d58 Source-Link: https://github.com/googleapis/synthtool/commit/7fcc405a579d5d53a726ff3da1b7c8c08f0f2d58 * chore(java): retry staging portion of the release with backoff * chore(java): retry staging portion of the release with backoff * build: skip logging the retried command - it may contain secrets Source-Author: Jeff Ching Source-Date: Thu Nov 19 12:24:02 2020 -0800 Source-Repo: googleapis/synthtool Source-Sha: 68742c6016bf0d16948a572633d17955a8737414 Source-Link: https://github.com/googleapis/synthtool/commit/68742c6016bf0d16948a572633d17955a8737414 * build(java): enable blunderbuss for samples Source-Author: Jeff Ching Source-Date: Mon Nov 23 10:23:01 2020 -0800 Source-Repo: googleapis/synthtool Source-Sha: 943bb78606d035001123030067dffcc34f4645f2 Source-Link: https://github.com/googleapis/synthtool/commit/943bb78606d035001123030067dffcc34f4645f2 * chore: Update publish_javadoc.sh * (chore) Update publish_javadoc.sh * add `export` to the envVar's to make sure maven knows about them. * report the Java version * chore: update script * remove `java -version` Co-authored-by: Jeffrey Rennie Source-Author: Les Vogel Source-Date: Mon Dec 7 09:37:58 2020 -0800 Source-Repo: googleapis/synthtool Source-Sha: 5d11bd2888c38ce1fb6fa6bf25494a4219a73928 Source-Link: https://github.com/googleapis/synthtool/commit/5d11bd2888c38ce1fb6fa6bf25494a4219a73928 --- java-shared-config/.github/blunderbuss.yml | 7 +++++++ .../.github/generated-files-bot.yml | 7 +++++++ .../.github/workflows/approve-readme.yaml | 2 +- .../.github/workflows/auto-release.yaml | 2 +- .../.github/workflows/formatting.yaml | 2 +- java-shared-config/.kokoro/common.sh | 1 - java-shared-config/.kokoro/readme.sh | 11 ++++++++++- .../.kokoro/release/publish_javadoc.cfg | 2 +- .../.kokoro/release/publish_javadoc.sh | 7 ++++--- java-shared-config/.kokoro/release/stage.sh | 17 ++++++++++------- java-shared-config/synth.metadata | 6 ++++-- 11 files changed, 46 insertions(+), 18 deletions(-) create mode 100644 java-shared-config/.github/blunderbuss.yml create mode 100644 java-shared-config/.github/generated-files-bot.yml diff --git a/java-shared-config/.github/blunderbuss.yml b/java-shared-config/.github/blunderbuss.yml new file mode 100644 index 000000000000..1a23ea42b141 --- /dev/null +++ b/java-shared-config/.github/blunderbuss.yml @@ -0,0 +1,7 @@ +# Configuration for the Blunderbuss GitHub app. For more info see +# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss +assign_prs_by: +- labels: + - samples + to: + - googleapis/java-samples-reviewers \ No newline at end of file diff --git a/java-shared-config/.github/generated-files-bot.yml b/java-shared-config/.github/generated-files-bot.yml new file mode 100644 index 000000000000..20f3acc28172 --- /dev/null +++ b/java-shared-config/.github/generated-files-bot.yml @@ -0,0 +1,7 @@ +externalManifests: +- type: json + file: 'synth.metadata' + jsonpath: '$.generatedFiles[*]' +- type: json + file: '.github/readme/synth.metadata/synth.metadata' + jsonpath: '$.generatedFiles[*]' diff --git a/java-shared-config/.github/workflows/approve-readme.yaml b/java-shared-config/.github/workflows/approve-readme.yaml index e2d841d6c5a0..7513acaebcc2 100644 --- a/java-shared-config/.github/workflows/approve-readme.yaml +++ b/java-shared-config/.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.0.0 + - uses: actions/github-script@v3 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/java-shared-config/.github/workflows/auto-release.yaml b/java-shared-config/.github/workflows/auto-release.yaml index bc1554aecba2..2b6cdbc976c4 100644 --- a/java-shared-config/.github/workflows/auto-release.yaml +++ b/java-shared-config/.github/workflows/auto-release.yaml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.head_ref, 'release-v') steps: - - uses: actions/github-script@v3.0.0 + - uses: actions/github-script@v3 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true diff --git a/java-shared-config/.github/workflows/formatting.yaml b/java-shared-config/.github/workflows/formatting.yaml index d4d367cfce03..6844407b4d97 100644 --- a/java-shared-config/.github/workflows/formatting.yaml +++ b/java-shared-config/.github/workflows/formatting.yaml @@ -18,7 +18,7 @@ jobs: with: java-version: 11 - run: "mvn com.coveo:fmt-maven-plugin:format" - - uses: googleapis/code-suggester@v1.8.0 + - uses: googleapis/code-suggester@v1 with: command: review pull_number: ${{ github.event.pull_request.number }} diff --git a/java-shared-config/.kokoro/common.sh b/java-shared-config/.kokoro/common.sh index a8d0ea04d37d..ace89f45a9de 100644 --- a/java-shared-config/.kokoro/common.sh +++ b/java-shared-config/.kokoro/common.sh @@ -25,7 +25,6 @@ function retry_with_backoff { # allow a failures to continue set +e - echo "${command}" ${command} exit_code=$? diff --git a/java-shared-config/.kokoro/readme.sh b/java-shared-config/.kokoro/readme.sh index 2c5f134370a6..cf2b833393b2 100755 --- a/java-shared-config/.kokoro/readme.sh +++ b/java-shared-config/.kokoro/readme.sh @@ -28,9 +28,18 @@ echo "https://${GITHUB_TOKEN}:@github.com" >> ~/.git-credentials git config --global credential.helper 'store --file ~/.git-credentials' python3.6 -m pip install git+https://github.com/googleapis/synthtool.git#egg=gcp-synthtool + +set +e python3.6 -m autosynth.synth \ --repository=googleapis/java-shared-config \ --synth-file-name=.github/readme/synth.py \ --metadata-path=.github/readme/synth.metadata \ --pr-title="chore: regenerate README" \ - --branch-suffix="readme" \ No newline at end of file + --branch-suffix="readme" + +# autosynth returns 28 to signal there are no changes +RETURN_CODE=$? +if [[ ${RETURN_CODE} -ne 0 && ${RETURN_CODE} -ne 28 ]] +then + exit ${RETURN_CODE} +fi diff --git a/java-shared-config/.kokoro/release/publish_javadoc.cfg b/java-shared-config/.kokoro/release/publish_javadoc.cfg index 807e69a05181..beaa3a2f707a 100644 --- a/java-shared-config/.kokoro/release/publish_javadoc.cfg +++ b/java-shared-config/.kokoro/release/publish_javadoc.cfg @@ -9,7 +9,7 @@ env_vars: { env_vars: { key: "STAGING_BUCKET_V2" - value: "docs-staging-v2-staging" + value: "docs-staging-v2" # Production will be at: docs-staging-v2 } diff --git a/java-shared-config/.kokoro/release/publish_javadoc.sh b/java-shared-config/.kokoro/release/publish_javadoc.sh index ba6925b19725..fcbefb717faf 100755 --- a/java-shared-config/.kokoro/release/publish_javadoc.sh +++ b/java-shared-config/.kokoro/release/publish_javadoc.sh @@ -38,8 +38,8 @@ python3 -m pip install gcp-docuploader # compile all packages mvn clean install -B -q -DskipTests=true -NAME=google-cloud-shared-config -VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) +export NAME=google-cloud-shared-config +export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # build the docs mvn site -B -q @@ -59,7 +59,8 @@ python3 -m docuploader upload . \ popd -# V2 +# V2 due to problems w/ the released javadoc plugin doclava, Java 8 is required. Beware of accidental updates. + mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/" pushd target/devsite/reference diff --git a/java-shared-config/.kokoro/release/stage.sh b/java-shared-config/.kokoro/release/stage.sh index 3c482cbc55f1..16126d2eb53f 100755 --- a/java-shared-config/.kokoro/release/stage.sh +++ b/java-shared-config/.kokoro/release/stage.sh @@ -20,19 +20,22 @@ python3 -m pip install gcp-releasetool python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script source $(dirname "$0")/common.sh +source $(dirname "$0")/../common.sh MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml pushd $(dirname "$0")/../../ setup_environment_secrets create_settings_xml_file "settings.xml" -mvn clean install deploy -B \ - --settings ${MAVEN_SETTINGS_FILE} \ - -DskipTests=true \ - -DperformRelease=true \ - -Dgpg.executable=gpg \ - -Dgpg.passphrase=${GPG_PASSPHRASE} \ - -Dgpg.homedir=${GPG_HOMEDIR} +# attempt to stage 3 times with exponential backoff (starting with 10 seconds) +retry_with_backoff 3 10 \ + mvn clean install deploy -B \ + --settings ${MAVEN_SETTINGS_FILE} \ + -DskipTests=true \ + -DperformRelease=true \ + -Dgpg.executable=gpg \ + -Dgpg.passphrase=${GPG_PASSPHRASE} \ + -Dgpg.homedir=${GPG_HOMEDIR} if [[ -n "${AUTORELEASE_PR}" ]] then diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index c80f05055952..c46900ed4160 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "be64fe9d3edc4de27d486c7a97a3dd03cfcab6e6" + "sha": "329f41993a16830b2a1a4a7080aa15d4d842ba18" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "f68649c5f26bcff6817c6d21e90dac0fc71fef8e" + "sha": "5d11bd2888c38ce1fb6fa6bf25494a4219a73928" } } ], @@ -21,6 +21,8 @@ ".github/ISSUE_TEMPLATE/feature_request.md", ".github/ISSUE_TEMPLATE/support_request.md", ".github/PULL_REQUEST_TEMPLATE.md", + ".github/blunderbuss.yml", + ".github/generated-files-bot.yml", ".github/readme/synth.py", ".github/snippet-bot.yml", ".github/trusted-contribution.yml", From 6abb6cc44a987c517f8701ea744157d8282e1a93 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 30 Dec 2020 10:27:23 -0800 Subject: [PATCH 162/794] chore: regenerate common templates (#211) * ci(java): ignore bot users for generate-files-bot Depends on https://github.com/googleapis/repo-automation-bots/pull/1254 Fixes https://github.com/googleapis/repo-automation-bots/issues/1096 Source-Author: Jeff Ching Source-Date: Tue Dec 15 16:16:07 2020 -0800 Source-Repo: googleapis/synthtool Source-Sha: 3f67ceece7e797a5736a25488aae35405649b90b Source-Link: https://github.com/googleapis/synthtool/commit/3f67ceece7e797a5736a25488aae35405649b90b * chore(java): remove formatter action Source-Author: Jeff Ching Source-Date: Tue Dec 29 10:50:17 2020 -0800 Source-Repo: googleapis/synthtool Source-Sha: 6133907dbb3ddab204a17a15d5c53ec0aae9b033 Source-Link: https://github.com/googleapis/synthtool/commit/6133907dbb3ddab204a17a15d5c53ec0aae9b033 --- .../.github/generated-files-bot.yml | 4 +++ .../.github/workflows/formatting.yaml | 25 ------------------- java-shared-config/synth.metadata | 5 ++-- 3 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 java-shared-config/.github/workflows/formatting.yaml diff --git a/java-shared-config/.github/generated-files-bot.yml b/java-shared-config/.github/generated-files-bot.yml index 20f3acc28172..47c2ba132e01 100644 --- a/java-shared-config/.github/generated-files-bot.yml +++ b/java-shared-config/.github/generated-files-bot.yml @@ -5,3 +5,7 @@ externalManifests: - type: json file: '.github/readme/synth.metadata/synth.metadata' jsonpath: '$.generatedFiles[*]' +ignoreAuthors: +- 'renovate-bot' +- 'yoshi-automation' +- 'release-please[bot]' diff --git a/java-shared-config/.github/workflows/formatting.yaml b/java-shared-config/.github/workflows/formatting.yaml deleted file mode 100644 index 6844407b4d97..000000000000 --- a/java-shared-config/.github/workflows/formatting.yaml +++ /dev/null @@ -1,25 +0,0 @@ -on: - pull_request_target: - types: [opened, synchronize] - branches: - - master -name: format -jobs: - format-code: - runs-on: ubuntu-latest - env: - ACCESS_TOKEN: ${{ secrets.YOSHI_CODE_BOT_TOKEN }} - steps: - - uses: actions/checkout@v2 - with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} - - uses: actions/setup-java@v1 - with: - java-version: 11 - - run: "mvn com.coveo:fmt-maven-plugin:format" - - uses: googleapis/code-suggester@v1 - with: - command: review - pull_number: ${{ github.event.pull_request.number }} - git_dir: '.' diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index c46900ed4160..690161e482f5 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "329f41993a16830b2a1a4a7080aa15d4d842ba18" + "sha": "82b74087e195cab55dbdbfc1728dbd4ca7871f04" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "5d11bd2888c38ce1fb6fa6bf25494a4219a73928" + "sha": "6133907dbb3ddab204a17a15d5c53ec0aae9b033" } } ], @@ -29,7 +29,6 @@ ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", ".github/workflows/ci.yaml", - ".github/workflows/formatting.yaml", ".github/workflows/samples.yaml", ".kokoro/build.bat", ".kokoro/build.sh", From 00e5c90415f979f74412ea8904327f37735fd1e8 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Thu, 21 Jan 2021 13:04:46 -0800 Subject: [PATCH 163/794] feat: adding pom profile to generate docfx yml from javadoc (#213) * feat: adding pom profile to generate docfx yml from javadoc * fix: update pom path * fix: update path to be less explicit --- java-shared-config/.kokoro/release/common.cfg | 3 + java-shared-config/pom.xml | 63 +++++++++++-------- 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/java-shared-config/.kokoro/release/common.cfg b/java-shared-config/.kokoro/release/common.cfg index 5cf31b784945..df39efef29f4 100644 --- a/java-shared-config/.kokoro/release/common.cfg +++ b/java-shared-config/.kokoro/release/common.cfg @@ -47,3 +47,6 @@ before_action { } } } + +# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/ +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx" \ No newline at end of file diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index fdcc82a5b105..948c97d28dd5 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -653,48 +653,61 @@ - docFX + docFX - + org.apache.maven.plugins maven-javadoc-plugin 3.2.0 - - - site - - aggregate - - - + + + docFX + + javadoc + aggregate + aggregate-jar + + + com.microsoft.doclet.DocFxDoclet - - com.microsoft - docfx-doclet - 1.0-SNAPSHOT - - - - com.google.j2objc - j2objc-annotations - 1.3 - - false - -outputpath ${project.build.directory}/docfx/ - + ${env.KOKORO_GFILE_DIR}/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies-143274.jar + -outputpath ${project.build.directory}/docfx-yml + none + protected + true + + + Test helpers packages + com.google.cloud.testing + + + SPI packages + com.google.cloud.spi* + + + + https://googleapis.dev/java/api-common/ + https://googleapis.dev/java/gax/ + https://googleapis.dev/java/google-auth-library/ + + https://developers.google.com/protocol-buffers/docs/reference/java/ + https://googleapis.github.io/common-protos-java/apidocs/ + https://grpc.io/grpc-java/javadoc/ + + - + From c0ba7f8fd1640bdfb242e77fafeb127278a79443 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 21 Jan 2021 23:21:31 +0100 Subject: [PATCH 164/794] deps: update dependency com.puppycrawl.tools:checkstyle to v8.39 (#209) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 948c97d28dd5..44b0ed5a88b5 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -612,7 +612,7 @@ com.puppycrawl.tools checkstyle - 8.36.2 + 8.39 From 5fc073b6ddbde45666b2686f2c50e5f71529b58a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 21 Jan 2021 14:46:34 -0800 Subject: [PATCH 165/794] changes without context (#215) autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. --- java-shared-config/.kokoro/release/common.cfg | 3 --- java-shared-config/synth.metadata | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/java-shared-config/.kokoro/release/common.cfg b/java-shared-config/.kokoro/release/common.cfg index df39efef29f4..5cf31b784945 100644 --- a/java-shared-config/.kokoro/release/common.cfg +++ b/java-shared-config/.kokoro/release/common.cfg @@ -47,6 +47,3 @@ before_action { } } } - -# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/ -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx" \ No newline at end of file diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 690161e482f5..7a14db9cce18 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "82b74087e195cab55dbdbfc1728dbd4ca7871f04" + "sha": "3527c47ff413d415f87fccca84358da2c837841d" } }, { From f392c35599580ea1b81588e9d265df01bee4d3f7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 25 Jan 2021 13:25:50 -0800 Subject: [PATCH 166/794] chore: release 0.10.0 (#214) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 12 ++++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index c3bb5ec46f7b..5db76edb6528 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.10.0](https://www.github.com/googleapis/java-shared-config/compare/v0.9.4...v0.10.0) (2021-01-21) + + +### Features + +* adding pom profile to generate docfx yml from javadoc ([#213](https://www.github.com/googleapis/java-shared-config/issues/213)) ([3527c47](https://www.github.com/googleapis/java-shared-config/commit/3527c47ff413d415f87fccca84358da2c837841d)) + + +### Dependencies + +* update dependency com.puppycrawl.tools:checkstyle to v8.39 ([#209](https://www.github.com/googleapis/java-shared-config/issues/209)) ([fb53922](https://www.github.com/googleapis/java-shared-config/commit/fb539226d407001822a56c7fff792922cd85d1fe)) + ### [0.9.4](https://www.github.com/googleapis/java-shared-config/compare/v0.9.3...v0.9.4) (2020-10-21) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index c071c82ba904..d2372f1669e6 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.9.4 + 0.10.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 44b0ed5a88b5..b12ffb1e72f9 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.9.5-SNAPSHOT + 0.10.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index beb7ef637c45..66566d8021ab 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.9.4:0.9.5-SNAPSHOT +google-cloud-shared-config:0.10.0:0.10.0 From cfd97d41735342c0b398defb8d9e7af26595f458 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 26 Jan 2021 09:10:04 +0000 Subject: [PATCH 167/794] chore: release 0.10.1-SNAPSHOT (#217) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b12ffb1e72f9..08a66268aa15 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.10.0 + 0.10.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 66566d8021ab..2fce2ac7eb8d 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.10.0:0.10.0 +google-cloud-shared-config:0.10.0:0.10.1-SNAPSHOT From 58894ca9b7e5a00be2c7788a0d6348501427e93c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 3 Feb 2021 09:44:52 -0800 Subject: [PATCH 168/794] chore: adding docfx doclet resource (#216) * chore: updating publish_javadoc to support docfx yml generation * fix: reducing commit Source-Author: Emily Ball Source-Date: Mon Jan 25 13:29:09 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: 3816b080296d4d52975079fd26c110dd26ba25af Source-Link: https://github.com/googleapis/synthtool/commit/3816b080296d4d52975079fd26c110dd26ba25af --- java-shared-config/.kokoro/release/publish_javadoc.cfg | 3 +++ java-shared-config/synth.metadata | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.kokoro/release/publish_javadoc.cfg b/java-shared-config/.kokoro/release/publish_javadoc.cfg index beaa3a2f707a..a96d3f58ac12 100644 --- a/java-shared-config/.kokoro/release/publish_javadoc.cfg +++ b/java-shared-config/.kokoro/release/publish_javadoc.cfg @@ -27,3 +27,6 @@ before_action { } } } + +# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/ +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx" \ No newline at end of file diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 7a14db9cce18..7fb248026563 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "3527c47ff413d415f87fccca84358da2c837841d" + "sha": "ca744598abbd729e8853d7eee98e58cdf9ee2a9f" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6133907dbb3ddab204a17a15d5c53ec0aae9b033" + "sha": "3816b080296d4d52975079fd26c110dd26ba25af" } } ], From bf1d72a967dda186b1c5cd6bfd67a394fef7a919 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 4 Feb 2021 16:44:37 -0800 Subject: [PATCH 169/794] chore: Re-generated to pick up changes from synthtool. (#222) * build: migrate to flakybot Source-Author: Justin Beckwith Source-Date: Thu Jan 28 22:22:38 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: d1bb9173100f62c0cfc8f3138b62241e7f47ca6a Source-Link: https://github.com/googleapis/synthtool/commit/d1bb9173100f62c0cfc8f3138b62241e7f47ca6a * build(java): generate docfx yml on release * feat: generate docfx yml on release * fix: updates name variable * fix: remove non needed resource * fix: update date Source-Author: Emily Ball Source-Date: Mon Feb 1 15:24:59 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: 5de29e9434b63ea6d7e46dc348521c62969af1a1 Source-Link: https://github.com/googleapis/synthtool/commit/5de29e9434b63ea6d7e46dc348521c62969af1a1 * build(java): run linkage monitor as GitHub action Source-Author: Tomo Suzuki Source-Date: Tue Feb 2 16:20:26 2021 -0500 Source-Repo: googleapis/synthtool Source-Sha: e935c9ecb47da0f2e054f5f1845f7cf7c95fa625 Source-Link: https://github.com/googleapis/synthtool/commit/e935c9ecb47da0f2e054f5f1845f7cf7c95fa625 * build(java): update autorelease branch name check In response to the new multi release branch changes. Source-Author: Stephanie Wang Source-Date: Wed Feb 3 15:06:07 2021 -0500 Source-Repo: googleapis/synthtool Source-Sha: 140ba24a136c63e7f10a998a63e7898aed63ea7d Source-Link: https://github.com/googleapis/synthtool/commit/140ba24a136c63e7f10a998a63e7898aed63ea7d --- .../.github/workflows/auto-release.yaml | 2 +- java-shared-config/.github/workflows/ci.yaml | 13 ++++- java-shared-config/.kokoro/build.sh | 4 +- java-shared-config/.kokoro/linkage-monitor.sh | 46 ---------------- .../.kokoro/release/publish_javadoc.cfg | 5 +- .../.kokoro/release/publish_javadoc11.cfg | 30 ++++++++++ .../.kokoro/release/publish_javadoc11.sh | 55 +++++++++++++++++++ java-shared-config/synth.metadata | 7 ++- 8 files changed, 105 insertions(+), 57 deletions(-) delete mode 100755 java-shared-config/.kokoro/linkage-monitor.sh create mode 100644 java-shared-config/.kokoro/release/publish_javadoc11.cfg create mode 100755 java-shared-config/.kokoro/release/publish_javadoc11.sh diff --git a/java-shared-config/.github/workflows/auto-release.yaml b/java-shared-config/.github/workflows/auto-release.yaml index 2b6cdbc976c4..76e6404b4e09 100644 --- a/java-shared-config/.github/workflows/auto-release.yaml +++ b/java-shared-config/.github/workflows/auto-release.yaml @@ -17,7 +17,7 @@ jobs: } // only approve PRs like "chore: release " - if ( !context.payload.pull_request.title.startsWith("chore: release") ) { + if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) { return; } diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index 683022075665..98a472e132d6 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -54,7 +54,18 @@ jobs: with: java-version: 8 - run: java -version - - run: .kokoro/linkage-monitor.sh + - name: Install artifacts to local Maven repository + run: | + source .kokoro/common.sh + retry_with_backoff 3 10 \ + mvn install -B -V \ + -Dmaven.test.skip -DskipTests=true \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.javadoc.skip=true \ + -Dgcloud.download.skip=true + shell: bash + - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor lint: runs-on: ubuntu-latest steps: diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index 30f16951cbdf..97ab43baaaff 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -110,8 +110,8 @@ bash .kokoro/coerce_logs.sh if [[ "${ENABLE_BUILD_COP}" == "true" ]] then - chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop - ${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/java-shared-config + chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot + ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/java-shared-config fi echo "exiting with ${RETURN_CODE}" diff --git a/java-shared-config/.kokoro/linkage-monitor.sh b/java-shared-config/.kokoro/linkage-monitor.sh deleted file mode 100755 index 759ab4e2c220..000000000000 --- a/java-shared-config/.kokoro/linkage-monitor.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# 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. -# 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. - -set -eo pipefail -# Display commands being run. -set -x - -## Get the directory of the build script -scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) -## cd to the parent directory, i.e. the root of the git repo -cd ${scriptDir}/.. - -# include common functions -source ${scriptDir}/common.sh - -# Print out Java version -java -version -echo ${JOB_TYPE} - -# attempt to install 3 times with exponential backoff (starting with 10 seconds) -retry_with_backoff 3 10 \ - mvn install -B -V \ - -DskipTests=true \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dmaven.javadoc.skip=true \ - -Dgcloud.download.skip=true - -# Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR -JAR=linkage-monitor-latest-all-deps.jar -curl -v -O "https://storage.googleapis.com/cloud-opensource-java-linkage-monitor/${JAR}" - -# Fails if there's new linkage errors compared with baseline -java -jar ${JAR} com.google.cloud:libraries-bom diff --git a/java-shared-config/.kokoro/release/publish_javadoc.cfg b/java-shared-config/.kokoro/release/publish_javadoc.cfg index a96d3f58ac12..f21f268cec3c 100644 --- a/java-shared-config/.kokoro/release/publish_javadoc.cfg +++ b/java-shared-config/.kokoro/release/publish_javadoc.cfg @@ -26,7 +26,4 @@ before_action { keyname: "docuploader_service_account" } } -} - -# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/ -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx" \ No newline at end of file +} \ No newline at end of file diff --git a/java-shared-config/.kokoro/release/publish_javadoc11.cfg b/java-shared-config/.kokoro/release/publish_javadoc11.cfg new file mode 100644 index 000000000000..2ddd71ce63ec --- /dev/null +++ b/java-shared-config/.kokoro/release/publish_javadoc11.cfg @@ -0,0 +1,30 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "STAGING_BUCKET_V2" + value: "docs-staging-v2" + # Production will be at: docs-staging-v2 +} + +# Configure the docker image for kokoro-trampoline +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java11" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-memcache/.kokoro/release/publish_javadoc11.sh" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "docuploader_service_account" + } + } +} + +# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/ +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx" \ No newline at end of file diff --git a/java-shared-config/.kokoro/release/publish_javadoc11.sh b/java-shared-config/.kokoro/release/publish_javadoc11.sh new file mode 100755 index 000000000000..a03e5eaf6082 --- /dev/null +++ b/java-shared-config/.kokoro/release/publish_javadoc11.sh @@ -0,0 +1,55 @@ +#!/bin/bash +# Copyright 2021 Google Inc. +# +# 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. + +set -eo pipefail + +if [[ -z "${CREDENTIALS}" ]]; then + CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account +fi + +if [[ -z "${STAGING_BUCKET_V2}" ]]; then + echo "Need to set STAGING_BUCKET_V2 environment variable" + exit 1 +fi + +# work from the git root directory +pushd $(dirname "$0")/../../ + +# install docuploader package +python3 -m pip install gcp-docuploader + +# compile all packages +mvn clean install -B -q -DskipTests=true + +export NAME=google-cloud-shared-config +export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) + +# V3 generates docfx yml from javadoc +# generate yml +mvn clean site -B -q -P docFX + +pushd target/docfx-yml + +# create metadata +python3 -m docuploader create-metadata \ + --name ${NAME} \ + --version ${VERSION} \ + --language java + +# upload yml +python3 -m docuploader upload . \ + --credentials ${CREDENTIALS} \ + --staging-bucket ${STAGING_BUCKET_V2} \ + --destination-prefix docfx- diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 7fb248026563..67629c802a5e 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "ca744598abbd729e8853d7eee98e58cdf9ee2a9f" + "sha": "60a3539726e080121ed41ed0c9d8c50e58a68f4c" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "3816b080296d4d52975079fd26c110dd26ba25af" + "sha": "140ba24a136c63e7f10a998a63e7898aed63ea7d" } } ], @@ -39,7 +39,6 @@ ".kokoro/continuous/java8.cfg", ".kokoro/continuous/readme.cfg", ".kokoro/dependencies.sh", - ".kokoro/linkage-monitor.sh", ".kokoro/nightly/common.cfg", ".kokoro/nightly/integration.cfg", ".kokoro/nightly/java11.cfg", @@ -71,6 +70,8 @@ ".kokoro/release/promote.sh", ".kokoro/release/publish_javadoc.cfg", ".kokoro/release/publish_javadoc.sh", + ".kokoro/release/publish_javadoc11.cfg", + ".kokoro/release/publish_javadoc11.sh", ".kokoro/release/snapshot.cfg", ".kokoro/release/snapshot.sh", ".kokoro/release/stage.cfg", From e988db0036263808f75a113aa925eeba67b1526d Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 5 Feb 2021 08:11:49 -0800 Subject: [PATCH 170/794] chore: Re-generated to pick up changes from synthtool. (#223) * chore: remove leading newline from LICENSE Co-authored-by: Christopher Wilcox Source-Author: Justin Beckwith Source-Date: Wed Feb 3 15:37:31 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: 27b2d4f4674840628d0b75c5941e89c12af4764f Source-Link: https://github.com/googleapis/synthtool/commit/27b2d4f4674840628d0b75c5941e89c12af4764f * fix: update repo name java-memcache set for all accidentally Source-Author: Emily Ball Source-Date: Thu Feb 4 10:39:41 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: 692715c0f23a7bb3bfbbaa300f7620ddfa8c47e5 Source-Link: https://github.com/googleapis/synthtool/commit/692715c0f23a7bb3bfbbaa300f7620ddfa8c47e5 --- java-shared-config/.kokoro/release/publish_javadoc11.cfg | 4 ++-- java-shared-config/LICENSE | 1 - java-shared-config/synth.metadata | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/java-shared-config/.kokoro/release/publish_javadoc11.cfg b/java-shared-config/.kokoro/release/publish_javadoc11.cfg index 2ddd71ce63ec..4864edf00378 100644 --- a/java-shared-config/.kokoro/release/publish_javadoc11.cfg +++ b/java-shared-config/.kokoro/release/publish_javadoc11.cfg @@ -14,7 +14,7 @@ env_vars: { env_vars: { key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-memcache/.kokoro/release/publish_javadoc11.sh" + value: "github/java-shared-config/.kokoro/release/publish_javadoc11.sh" } before_action { @@ -27,4 +27,4 @@ before_action { } # Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/ -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx" \ No newline at end of file +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx" diff --git a/java-shared-config/LICENSE b/java-shared-config/LICENSE index d64569567334..261eeb9e9f8b 100644 --- a/java-shared-config/LICENSE +++ b/java-shared-config/LICENSE @@ -1,4 +1,3 @@ - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 67629c802a5e..0fb251dac8f8 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "60a3539726e080121ed41ed0c9d8c50e58a68f4c" + "sha": "8148f6bca1c067c3edb1ba6a6d61bc7ef9b44265" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "140ba24a136c63e7f10a998a63e7898aed63ea7d" + "sha": "692715c0f23a7bb3bfbbaa300f7620ddfa8c47e5" } } ], From 7eeab6f33aaaad8b819ab1c3c8abf2931a713aa5 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Tue, 16 Feb 2021 16:55:42 -0800 Subject: [PATCH 171/794] chore: update docfx config links (#226) --- java-shared-config/pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 08a66268aa15..bb55648c366f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -695,13 +695,14 @@ - https://googleapis.dev/java/api-common/ - https://googleapis.dev/java/gax/ - https://googleapis.dev/java/google-auth-library/ - + https://googleapis.dev/java/api-common/latest/ + https://googleapis.dev/java/gax/latest/ + https://googleapis.dev/java/google-auth-library/latest/ https://developers.google.com/protocol-buffers/docs/reference/java/ https://googleapis.github.io/common-protos-java/apidocs/ + https://googleapis.github.io/api-common-java/apidocs/ https://grpc.io/grpc-java/javadoc/ + https://docs.oracle.com/javase/8/docs/api/ From e42f88d5cf050740677370bd4bb9e268e7e23b25 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 19 Feb 2021 11:36:49 -0800 Subject: [PATCH 172/794] build(java): update autorelease script (#225) Noticed the workflow was getting skipped on all the release PRs. Updating due to recent update in release-please branch name. Source-Author: Stephanie Wang Source-Date: Tue Feb 9 19:10:03 2021 -0500 Source-Repo: googleapis/synthtool Source-Sha: 2414b817065726eae0bc525346c7e874f969369d Source-Link: https://github.com/googleapis/synthtool/commit/2414b817065726eae0bc525346c7e874f969369d --- java-shared-config/.github/workflows/auto-release.yaml | 4 ++-- java-shared-config/synth.metadata | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-shared-config/.github/workflows/auto-release.yaml b/java-shared-config/.github/workflows/auto-release.yaml index 76e6404b4e09..7c8816a7d7b1 100644 --- a/java-shared-config/.github/workflows/auto-release.yaml +++ b/java-shared-config/.github/workflows/auto-release.yaml @@ -4,7 +4,7 @@ name: auto-release jobs: approve: runs-on: ubuntu-latest - if: contains(github.head_ref, 'release-v') + if: contains(github.head_ref, 'release-please') steps: - uses: actions/github-script@v3 with: @@ -16,7 +16,7 @@ jobs: return; } - // only approve PRs like "chore: release " + // only approve PRs like "chore(master): release " if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) { return; } diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 0fb251dac8f8..a6fcd3272ec3 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "8148f6bca1c067c3edb1ba6a6d61bc7ef9b44265" + "sha": "048eafee55117aa91ec1c7d039948cd240821588" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "692715c0f23a7bb3bfbbaa300f7620ddfa8c47e5" + "sha": "2414b817065726eae0bc525346c7e874f969369d" } } ], From 8cfb02ae10455548a5fdabc32f5c8b424318b0a3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 19 Feb 2021 20:38:11 +0100 Subject: [PATCH 173/794] deps: update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.1.2 (#219) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index bb55648c366f..79cb46e41176 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -607,7 +607,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + 3.1.2 com.puppycrawl.tools From 2d93e51993d68f08b25b664ee02414246cc49d6e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 19 Feb 2021 20:39:13 +0100 Subject: [PATCH 174/794] deps: update dependency com.puppycrawl.tools:checkstyle to v8.40 (#221) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 79cb46e41176..572eaf7443ba 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -612,7 +612,7 @@ com.puppycrawl.tools checkstyle - 8.39 + 8.40 From b16d3722f830e1b834f8e79cf91ec7261a14e539 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 22 Feb 2021 09:47:05 -0800 Subject: [PATCH 175/794] chore: regenerate common templates (#229) * ci: linkage monitor CI job to use build.sh This PR updates the GitHub Actions configuration for Linkage Monitor. Before this change, the CI configuration has "mvn install" command with 6 options. It turned out that a slight difference in the command line option from "build.sh" fails the build in google-auth-library-java repository (https://github.com/GoogleCloudPlatform/cloud-opensource-java/issues/1941). (@Neenu1995 found the build failure. Thanks!) Therefore, this change updates the configuration so that Linkage Monitor job just uses "build.sh" to install the artifacts into local Maven repository. # How did I test? I tested this change in java-spanner repository with this draft PR: https://github.com/googleapis/java-spanner/pull/868 Screen Shot 2021-02-12 at 16 54 18 It succeeded. Source-Author: Tomo Suzuki Source-Date: Tue Feb 16 15:56:09 2021 -0500 Source-Repo: googleapis/synthtool Source-Sha: f327d3b657a63ae4a8efd7f011a15eacae36b59c Source-Link: https://github.com/googleapis/synthtool/commit/f327d3b657a63ae4a8efd7f011a15eacae36b59c * chore: update cloud-rad buckets doclava v2 => staging docFX v3 => prod Source-Author: Emily Ball Source-Date: Tue Feb 16 17:02:08 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: b416a7befcdbc42de41cf387dcf428f894fb812b Source-Link: https://github.com/googleapis/synthtool/commit/b416a7befcdbc42de41cf387dcf428f894fb812b * fix: don't log downloads @chingor13 This change keeps Maven 3.6.1 and later from spamming our CI logs with page after page of lists of artifacts it's downloading that makes it much harder to find the actual test output. Source-Author: Elliotte Rusty Harold Source-Date: Thu Feb 18 19:58:59 2021 +0000 Source-Repo: googleapis/synthtool Source-Sha: 1aeca92e4a38f47134cb955f52ea76f84f09ff88 Source-Link: https://github.com/googleapis/synthtool/commit/1aeca92e4a38f47134cb955f52ea76f84f09ff88 * build: reduce download junk in log files * fix: less download junk log files * Update build.sh Source-Author: Elliotte Rusty Harold Source-Date: Fri Feb 19 01:42:29 2021 +0000 Source-Repo: googleapis/synthtool Source-Sha: 6946fd71ae9215b0e7ae188f5057df765ee6d7d2 Source-Link: https://github.com/googleapis/synthtool/commit/6946fd71ae9215b0e7ae188f5057df765ee6d7d2 --- java-shared-config/.github/workflows/ci.yaml | 13 +++---------- java-shared-config/.kokoro/build.sh | 4 +++- java-shared-config/.kokoro/dependencies.sh | 4 ++-- .../.kokoro/release/publish_javadoc.cfg | 4 ++-- .../.kokoro/release/publish_javadoc.sh | 2 +- .../.kokoro/release/publish_javadoc11.cfg | 2 +- .../.kokoro/release/publish_javadoc11.sh | 2 +- java-shared-config/synth.metadata | 4 ++-- 8 files changed, 15 insertions(+), 20 deletions(-) diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index 98a472e132d6..def8b3a2c84d 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -55,17 +55,10 @@ jobs: java-version: 8 - run: java -version - name: Install artifacts to local Maven repository - run: | - source .kokoro/common.sh - retry_with_backoff 3 10 \ - mvn install -B -V \ - -Dmaven.test.skip -DskipTests=true \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dmaven.javadoc.skip=true \ - -Dgcloud.download.skip=true + run: .kokoro/build.sh shell: bash - - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor + - name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release) + uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor lint: runs-on: ubuntu-latest steps: diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index 97ab43baaaff..34079b25d974 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -29,7 +29,7 @@ echo ${JOB_TYPE} # attempt to install 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ - mvn install -B -V \ + mvn install -B -V -ntp \ -DskipTests=true \ -Dclirr.skip=true \ -Denforcer.skip=true \ @@ -60,6 +60,7 @@ javadoc) ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ + -ntp \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -81,6 +82,7 @@ samples) pushd ${SAMPLES_DIR} mvn -B \ -Penable-samples \ + -ntp \ -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ diff --git a/java-shared-config/.kokoro/dependencies.sh b/java-shared-config/.kokoro/dependencies.sh index c91e5a56937a..0fb8c8436ccc 100755 --- a/java-shared-config/.kokoro/dependencies.sh +++ b/java-shared-config/.kokoro/dependencies.sh @@ -31,7 +31,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" # this should run maven enforcer retry_with_backoff 3 10 \ - mvn install -B -V \ + mvn install -B -V -ntp \ -DskipTests=true \ -Dclirr.skip=true @@ -86,4 +86,4 @@ then else msg "Errors found. See log statements above." exit 1 -fi \ No newline at end of file +fi diff --git a/java-shared-config/.kokoro/release/publish_javadoc.cfg b/java-shared-config/.kokoro/release/publish_javadoc.cfg index f21f268cec3c..0e363fd8afae 100644 --- a/java-shared-config/.kokoro/release/publish_javadoc.cfg +++ b/java-shared-config/.kokoro/release/publish_javadoc.cfg @@ -7,10 +7,10 @@ env_vars: { value: "docs-staging" } +# cloud-rad staging env_vars: { key: "STAGING_BUCKET_V2" - value: "docs-staging-v2" - # Production will be at: docs-staging-v2 + value: "docs-staging-v2-staging" } env_vars: { diff --git a/java-shared-config/.kokoro/release/publish_javadoc.sh b/java-shared-config/.kokoro/release/publish_javadoc.sh index fcbefb717faf..d2fc3e908525 100755 --- a/java-shared-config/.kokoro/release/publish_javadoc.sh +++ b/java-shared-config/.kokoro/release/publish_javadoc.sh @@ -71,7 +71,7 @@ python3 -m docuploader create-metadata \ --version ${VERSION} \ --language java -# upload docs +# upload docs to staging bucket python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET_V2} diff --git a/java-shared-config/.kokoro/release/publish_javadoc11.cfg b/java-shared-config/.kokoro/release/publish_javadoc11.cfg index 4864edf00378..a0609ba19642 100644 --- a/java-shared-config/.kokoro/release/publish_javadoc11.cfg +++ b/java-shared-config/.kokoro/release/publish_javadoc11.cfg @@ -1,9 +1,9 @@ # Format: //devtools/kokoro/config/proto/build.proto +# cloud-rad production env_vars: { key: "STAGING_BUCKET_V2" value: "docs-staging-v2" - # Production will be at: docs-staging-v2 } # Configure the docker image for kokoro-trampoline diff --git a/java-shared-config/.kokoro/release/publish_javadoc11.sh b/java-shared-config/.kokoro/release/publish_javadoc11.sh index a03e5eaf6082..f5e1d63a01e7 100755 --- a/java-shared-config/.kokoro/release/publish_javadoc11.sh +++ b/java-shared-config/.kokoro/release/publish_javadoc11.sh @@ -48,7 +48,7 @@ python3 -m docuploader create-metadata \ --version ${VERSION} \ --language java -# upload yml +# upload yml to production bucket python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET_V2} \ diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index a6fcd3272ec3..504d6c2a2dee 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "048eafee55117aa91ec1c7d039948cd240821588" + "sha": "d9b2d4aab9a9bba1c2df6fcb52ac96ee8b001ad6" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "2414b817065726eae0bc525346c7e874f969369d" + "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2" } } ], From 102512f9b3a9827e09b886f7829eefd1735741f6 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Mon, 22 Feb 2021 11:22:03 -0800 Subject: [PATCH 176/794] chore: updating docfx doclet version (#227) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/java-shared-config/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [x] Ensure the tests and linter pass - [x] Code coverage does not decrease (if any source code was changed) - [x] Appropriate docs were updated (if necessary) Fixes # ☕️ --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 572eaf7443ba..014b1a59b49a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -679,7 +679,7 @@ com.microsoft.doclet.DocFxDoclet false - ${env.KOKORO_GFILE_DIR}/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies-143274.jar + ${env.KOKORO_GFILE_DIR}/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies-172556.jar -outputpath ${project.build.directory}/docfx-yml none protected From 7c93a4b620a686fc52fee2fbfda013bf6075ce4b Mon Sep 17 00:00:00 2001 From: Stephanie Wang Date: Thu, 25 Feb 2021 11:04:35 -0500 Subject: [PATCH 177/794] ci: remove autorelease from this repo (#231) --- .../.github/workflows/auto-release.yaml | 88 ------------------- java-shared-config/synth.py | 1 + 2 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 java-shared-config/.github/workflows/auto-release.yaml diff --git a/java-shared-config/.github/workflows/auto-release.yaml b/java-shared-config/.github/workflows/auto-release.yaml deleted file mode 100644 index 7c8816a7d7b1..000000000000 --- a/java-shared-config/.github/workflows/auto-release.yaml +++ /dev/null @@ -1,88 +0,0 @@ -on: - pull_request: -name: auto-release -jobs: - approve: - runs-on: ubuntu-latest - if: contains(github.head_ref, 'release-please') - steps: - - uses: actions/github-script@v3 - with: - github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} - debug: true - script: | - // only approve PRs from release-please[bot] - if (context.payload.pull_request.user.login !== "release-please[bot]") { - return; - } - - // only approve PRs like "chore(master): release " - if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) { - return; - } - - // only approve PRs with pom.xml and versions.txt changes - const filesPromise = github.pulls.listFiles.endpoint({ - owner: context.repo.owner, - repo: context.repo.repo, - pull_number: context.payload.pull_request.number, - }); - const changed_files = await github.paginate(filesPromise) - - if ( changed_files.length < 1 ) { - console.log( "Not proceeding since PR is empty!" ) - return; - } - - if ( !changed_files.some(v => v.filename.includes("pom")) || !changed_files.some(v => v.filename.includes("versions.txt")) ) { - console.log( "PR file changes do not have pom.xml or versions.txt -- something is wrong. PTAL!" ) - return; - } - - // trigger auto-release when - // 1) it is a SNAPSHOT release (auto-generated post regular release) - // 2) there are dependency updates only - // 3) there are no open dependency update PRs in this repo (to avoid multiple releases) - if ( - context.payload.pull_request.body.includes("Fix") || - context.payload.pull_request.body.includes("Build") || - context.payload.pull_request.body.includes("Documentation") || - context.payload.pull_request.body.includes("BREAKING CHANGES") || - context.payload.pull_request.body.includes("Features") - ) { - console.log( "Not auto-releasing since it is not a dependency-update-only release." ); - return; - } - - const promise = github.pulls.list.endpoint({ - owner: context.repo.owner, - repo: context.repo.repo, - state: 'open' - }); - const open_pulls = await github.paginate(promise) - - if ( open_pulls.length > 1 && !context.payload.pull_request.title.includes("SNAPSHOT") ) { - for ( const pull of open_pulls ) { - if ( pull.title.startsWith("deps: update dependency") ) { - console.log( "Not auto-releasing yet since there are dependency update PRs open in this repo." ); - return; - } - } - } - - // approve release PR - await github.pulls.createReview({ - owner: context.repo.owner, - repo: context.repo.repo, - body: 'Rubber stamped release!', - pull_number: context.payload.pull_request.number, - event: 'APPROVE' - }); - - // attach kokoro:force-run and automerge labels - await github.issues.addLabels({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: context.payload.pull_request.number, - labels: ['kokoro:force-run', 'automerge'] - }); diff --git a/java-shared-config/synth.py b/java-shared-config/synth.py index d5717dc9fb86..3ba1bed332e7 100644 --- a/java-shared-config/synth.py +++ b/java-shared-config/synth.py @@ -21,6 +21,7 @@ java.common_templates(excludes=[ "README.md", ".github/release-please.yml", + '.github/workflows/auto-release.yaml', "samples/*" ]) From dac48112c9486bd6f289a0244067d0dd759d427f Mon Sep 17 00:00:00 2001 From: Stephanie Wang Date: Thu, 25 Feb 2021 11:04:59 -0500 Subject: [PATCH 178/794] feat: migrate releases to the new Google Sonatype endpoint to address Sonatype errors. (#230) --- java-shared-config/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 014b1a59b49a..884d8003436a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -42,11 +42,11 @@ sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots + https://google.oss.sonatype.org/content/repositories/snapshots sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://google.oss.sonatype.org/service/local/staging/deploy/maven2/ @@ -77,7 +77,7 @@ true ossrh - https://oss.sonatype.org/ + https://google.oss.sonatype.org/ false 15 @@ -586,7 +586,7 @@ sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots + https://google.oss.sonatype.org/content/repositories/snapshots false From d0d80bbb16d2104e49fc9cb18978c219cb5db416 Mon Sep 17 00:00:00 2001 From: Stephanie Wang Date: Thu, 25 Feb 2021 11:14:06 -0500 Subject: [PATCH 179/794] ci: clean up samples.yaml from this repo (#232) No samples in this repo. --- java-shared-config/.github/workflows/samples.yaml | 14 -------------- java-shared-config/synth.py | 1 + 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 java-shared-config/.github/workflows/samples.yaml diff --git a/java-shared-config/.github/workflows/samples.yaml b/java-shared-config/.github/workflows/samples.yaml deleted file mode 100644 index c46230a78c38..000000000000 --- a/java-shared-config/.github/workflows/samples.yaml +++ /dev/null @@ -1,14 +0,0 @@ -on: - pull_request: -name: samples -jobs: - checkstyle: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - name: Run checkstyle - run: mvn -P lint --quiet --batch-mode checkstyle:check - working-directory: samples/snippets diff --git a/java-shared-config/synth.py b/java-shared-config/synth.py index 3ba1bed332e7..88e27983c7bf 100644 --- a/java-shared-config/synth.py +++ b/java-shared-config/synth.py @@ -22,6 +22,7 @@ "README.md", ".github/release-please.yml", '.github/workflows/auto-release.yaml', + '.github/workflows/samples.yaml', "samples/*" ]) From 34ed8de134a19729977ce2bf3ea6376cd695a734 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 25 Feb 2021 11:47:59 -0500 Subject: [PATCH 180/794] chore(master): release 0.11.0 (#228) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 13 +++++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 5db76edb6528..d3909e636d9a 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [0.11.0](https://www.github.com/googleapis/java-shared-config/compare/v0.10.0...v0.11.0) (2021-02-25) + + +### Features + +* migrate releases to the new Google Sonatype endpoint to address Sonatype errors. ([#230](https://www.github.com/googleapis/java-shared-config/issues/230)) ([ff6a95f](https://www.github.com/googleapis/java-shared-config/commit/ff6a95f7b0d24a1c37c38ba8ac6c6624ee97cc15)) + + +### Dependencies + +* update dependency com.puppycrawl.tools:checkstyle to v8.40 ([#221](https://www.github.com/googleapis/java-shared-config/issues/221)) ([d9b2d4a](https://www.github.com/googleapis/java-shared-config/commit/d9b2d4aab9a9bba1c2df6fcb52ac96ee8b001ad6)) +* update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.1.2 ([#219](https://www.github.com/googleapis/java-shared-config/issues/219)) ([f7c3f79](https://www.github.com/googleapis/java-shared-config/commit/f7c3f798ef8ad1bc59ae673c84fbdd9f93ee2413)) + ## [0.10.0](https://www.github.com/googleapis/java-shared-config/compare/v0.9.4...v0.10.0) (2021-01-21) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index d2372f1669e6..44364d04deb6 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.10.0 + 0.11.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 884d8003436a..d5332af4cdda 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.10.1-SNAPSHOT + 0.11.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 2fce2ac7eb8d..50e712008e73 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.10.0:0.10.1-SNAPSHOT +google-cloud-shared-config:0.11.0:0.11.0 From 4ea4ec91ee0db84bc6bc50ecf7ee158d28b693c2 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:37:53 -0500 Subject: [PATCH 181/794] chore(master): release 0.11.1-SNAPSHOT (#233) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d5332af4cdda..1b4045bf8126 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.11.0 + 0.11.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 50e712008e73..b3626bd6cd3b 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.11.0:0.11.0 +google-cloud-shared-config:0.11.0:0.11.1-SNAPSHOT From 20bce1aadada9d16e36fabb39feaa0ceaabf753c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 3 Mar 2021 10:09:07 -0800 Subject: [PATCH 182/794] chore: remove docLava v2 doc generation (#235) * chore: remove docLava v2 doc generation Not using this anymore and it is causing some issues in pubsublite * chore: removing v2 doclava bucket config Source-Author: Emily Ball Source-Date: Tue Mar 2 10:13:11 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: 21da7d9fa02f6916d9f87cf4072b3547b5c72eb5 Source-Link: https://github.com/googleapis/synthtool/commit/21da7d9fa02f6916d9f87cf4072b3547b5c72eb5 --- .../.kokoro/release/publish_javadoc.cfg | 8 +------- .../.kokoro/release/publish_javadoc.sh | 19 ------------------- java-shared-config/synth.metadata | 6 ++---- 3 files changed, 3 insertions(+), 30 deletions(-) diff --git a/java-shared-config/.kokoro/release/publish_javadoc.cfg b/java-shared-config/.kokoro/release/publish_javadoc.cfg index 0e363fd8afae..75a531756acf 100644 --- a/java-shared-config/.kokoro/release/publish_javadoc.cfg +++ b/java-shared-config/.kokoro/release/publish_javadoc.cfg @@ -7,12 +7,6 @@ env_vars: { value: "docs-staging" } -# cloud-rad staging -env_vars: { - key: "STAGING_BUCKET_V2" - value: "docs-staging-v2-staging" -} - env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-shared-config/.kokoro/release/publish_javadoc.sh" @@ -26,4 +20,4 @@ before_action { keyname: "docuploader_service_account" } } -} \ No newline at end of file +} diff --git a/java-shared-config/.kokoro/release/publish_javadoc.sh b/java-shared-config/.kokoro/release/publish_javadoc.sh index d2fc3e908525..d9b71925b623 100755 --- a/java-shared-config/.kokoro/release/publish_javadoc.sh +++ b/java-shared-config/.kokoro/release/publish_javadoc.sh @@ -56,22 +56,3 @@ python3 -m docuploader create-metadata \ python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET} - -popd - -# V2 due to problems w/ the released javadoc plugin doclava, Java 8 is required. Beware of accidental updates. - -mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/" - -pushd target/devsite/reference - -# create metadata -python3 -m docuploader create-metadata \ - --name ${NAME} \ - --version ${VERSION} \ - --language java - -# upload docs to staging bucket -python3 -m docuploader upload . \ - --credentials ${CREDENTIALS} \ - --staging-bucket ${STAGING_BUCKET_V2} diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 504d6c2a2dee..df1cf8158889 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "d9b2d4aab9a9bba1c2df6fcb52ac96ee8b001ad6" + "sha": "2d049136a749643ac49fdef5298879201de7cb02" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2" + "sha": "21da7d9fa02f6916d9f87cf4072b3547b5c72eb5" } } ], @@ -27,9 +27,7 @@ ".github/snippet-bot.yml", ".github/trusted-contribution.yml", ".github/workflows/approve-readme.yaml", - ".github/workflows/auto-release.yaml", ".github/workflows/ci.yaml", - ".github/workflows/samples.yaml", ".kokoro/build.bat", ".kokoro/build.sh", ".kokoro/coerce_logs.sh", From 6a825b5b7493511f6eafba01a27ec00c1a2bd421 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Wed, 3 Mar 2021 12:37:56 -0800 Subject: [PATCH 183/794] chore: remove v2 doc generation (#236) --- java-shared-config/pom.xml | 98 +------------------------------------- 1 file changed, 1 insertion(+), 97 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 1b4045bf8126..0fd25d817ff4 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -710,103 +710,7 @@ - - - devsite-apidocs - - - - devsite.template - - - - - - - - maven-javadoc-plugin - - 3.2.0 - - - site - - aggregate - - - - - - com.google.doclava - doclava - 1.0.6 - - com.google.doclava.Doclava - ${sun.boot.class.path} - - - com.google.j2objc - j2objc-annotations - 1.3 - - - - -hdf - book.path - /java/_book.yaml - -hdf - project.path - /java/_project.yaml - -hdf - devsite.path - ${docRoot}${env.NAME}/latest/ - -d - ${project.build.directory}/devsite - -templatedir - ${devsite.template} - -toroot - ${docRoot}${env.NAME}/latest/ - -yaml - _toc.yaml - -warning - 101 - - false - - - - - maven-antrun-plugin - 3.0.0 - - - site - - run - - - - - - - - - - - - - - - - - - - - - + autovalue-java7 From 79efc9e75fcd93de131b2e21b4e145afcfed48d5 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 4 Mar 2021 14:28:05 -0800 Subject: [PATCH 184/794] chore: copy README to docfx-yml dir (#237) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/55f460c4-bcb1-4d76-b766-e2a8c306b9e5/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/d0bdade9a962042dc0f770cf631086f3db59b5b0 --- java-shared-config/.kokoro/release/publish_javadoc11.sh | 5 ++++- java-shared-config/synth.metadata | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.kokoro/release/publish_javadoc11.sh b/java-shared-config/.kokoro/release/publish_javadoc11.sh index f5e1d63a01e7..e843904c44bf 100755 --- a/java-shared-config/.kokoro/release/publish_javadoc11.sh +++ b/java-shared-config/.kokoro/release/publish_javadoc11.sh @@ -40,6 +40,9 @@ export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # generate yml mvn clean site -B -q -P docFX +# copy README to docfx-yml dir and rename index.md +cp README.md target/docfx-yml/index.md + pushd target/docfx-yml # create metadata @@ -52,4 +55,4 @@ python3 -m docuploader create-metadata \ python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET_V2} \ - --destination-prefix docfx- + --destination-prefix docfx diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index df1cf8158889..ee6fc2652e61 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "2d049136a749643ac49fdef5298879201de7cb02" + "sha": "b7447a09e2b07bff027ecfa3533fad3c39cbc677" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "21da7d9fa02f6916d9f87cf4072b3547b5c72eb5" + "sha": "d0bdade9a962042dc0f770cf631086f3db59b5b0" } } ], From affa95967e24cb4912ebe2ccf08b1c4cffb25dcb Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 8 Apr 2021 15:59:46 +0200 Subject: [PATCH 185/794] deps: update dependency com.google.auto.service:auto-service-annotations to v1.0 (#246) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 0fd25d817ff4..592fdc7e7974 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -788,7 +788,7 @@ com.google.auto.service auto-service-annotations - 1.0-rc7 + 1.0 From 8f1401de076c276626aa39ad7c543cc1430503bf Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 8 Apr 2021 16:00:19 +0200 Subject: [PATCH 186/794] deps: update auto-value-annotation.version to v1.8 (#239) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 592fdc7e7974..44e8cd43afef 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -63,7 +63,7 @@ ${project.artifactId} false true - 1.7.4 + 1.8 /java/docs/reference/ From bcf2f807d4cbc0b1017578e63b5a130d04b2e783 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 14 Apr 2021 02:57:03 +0200 Subject: [PATCH 187/794] build(deps): update dependency org.codehaus.mojo:flatten-maven-plugin to v1.2.7 (#244) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 44e8cd43afef..edd17db8c6c1 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -232,7 +232,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.2.5 + 1.2.7 From 82cbe01d6c175a6f81a9234191e6c85c71115fb0 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 14 Apr 2021 17:48:02 +0000 Subject: [PATCH 188/794] chore: release 0.11.1 (#247) :robot: I have created a release \*beep\* \*boop\* --- ### [0.11.1](https://www.github.com/googleapis/java-shared-config/compare/v0.11.0...v0.11.1) (2021-04-14) ### Dependencies * update auto-value-annotation.version to v1.8 ([#239](https://www.github.com/googleapis/java-shared-config/issues/239)) ([8f1401d](https://www.github.com/googleapis/java-shared-config/commit/8f1401de076c276626aa39ad7c543cc1430503bf)) * update dependency com.google.auto.service:auto-service-annotations to v1.0 ([#246](https://www.github.com/googleapis/java-shared-config/issues/246)) ([affa959](https://www.github.com/googleapis/java-shared-config/commit/affa95967e24cb4912ebe2ccf08b1c4cffb25dcb)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 8 ++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index d3909e636d9a..5fd81207b349 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [0.11.1](https://www.github.com/googleapis/java-shared-config/compare/v0.11.0...v0.11.1) (2021-04-14) + + +### Dependencies + +* update auto-value-annotation.version to v1.8 ([#239](https://www.github.com/googleapis/java-shared-config/issues/239)) ([7fa8a9c](https://www.github.com/googleapis/java-shared-config/commit/7fa8a9c7d0020dd99fbccc3a9e7d24cbcf27a0f3)) +* update dependency com.google.auto.service:auto-service-annotations to v1.0 ([#246](https://www.github.com/googleapis/java-shared-config/issues/246)) ([a11638b](https://www.github.com/googleapis/java-shared-config/commit/a11638bf44d1d450aff8de494902bdd407988772)) + ## [0.11.0](https://www.github.com/googleapis/java-shared-config/compare/v0.10.0...v0.11.0) (2021-02-25) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 44364d04deb6..65b04abff8b4 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.11.0 + 0.11.1 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index edd17db8c6c1..b5c58fec43f8 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.11.1-SNAPSHOT + 0.11.1 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index b3626bd6cd3b..99a1b878f0fb 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.11.0:0.11.1-SNAPSHOT +google-cloud-shared-config:0.11.1:0.11.1 From 9f505cbb1bb67d91943e198d0eacf705454ff600 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 22 Apr 2021 22:36:06 +0200 Subject: [PATCH 189/794] deps: update auto-value-annotation.version to v1.8.1 (#250) [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.auto.value:auto-value](https://togithub.com/google/auto) | `1.8` -> `1.8.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.8.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.8.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.8.1/compatibility-slim/1.8)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.8.1/confidence-slim/1.8)](https://docs.renovatebot.com/merge-confidence/) | | [com.google.auto.value:auto-value-annotations](https://togithub.com/google/auto) | `1.8` -> `1.8.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value-annotations/1.8.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value-annotations/1.8.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value-annotations/1.8.1/compatibility-slim/1.8)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value-annotations/1.8.1/confidence-slim/1.8)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b5c58fec43f8..2095db40d52d 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -63,7 +63,7 @@ ${project.artifactId} false true - 1.8 + 1.8.1 /java/docs/reference/ From bc3d12e48b6f471174780a2f8e5dd0dfa1d7408c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 22 Apr 2021 20:44:05 +0000 Subject: [PATCH 190/794] chore: release 0.11.2-SNAPSHOT (#248) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2095db40d52d..5712f7735ed5 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.11.1 + 0.11.2-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 99a1b878f0fb..1962e8e9f851 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.11.1:0.11.1 +google-cloud-shared-config:0.11.1:0.11.2-SNAPSHOT From 0fbf4ead2263d5a5527daf53a5a5236c59cd3406 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 22 Apr 2021 22:48:02 +0200 Subject: [PATCH 191/794] build(deps): update dependency org.apache.maven.plugins:maven-jxr-plugin to v3.1.1 (#252) [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | org.apache.maven.plugins:maven-jxr-plugin | `3.0.0` -> `3.1.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-jxr-plugin/3.1.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-jxr-plugin/3.1.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-jxr-plugin/3.1.1/compatibility-slim/3.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-jxr-plugin/3.1.1/confidence-slim/3.0.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 5712f7735ed5..8ed811e730c3 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -486,7 +486,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.0.0 + 3.1.1 true From c50a7616c6859e57949dc023ce27beb0ec9ead24 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 22 Apr 2021 20:54:02 +0000 Subject: [PATCH 192/794] chore: release 0.11.2 (#253) :robot: I have created a release \*beep\* \*boop\* --- ### [0.11.2](https://www.github.com/googleapis/java-shared-config/compare/v0.11.1...v0.11.2) (2021-04-22) ### Dependencies * update auto-value-annotation.version to v1.8.1 ([#250](https://www.github.com/googleapis/java-shared-config/issues/250)) ([9f505cb](https://www.github.com/googleapis/java-shared-config/commit/9f505cbb1bb67d91943e198d0eacf705454ff600)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 5fd81207b349..e4f7b19526f4 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.11.2](https://www.github.com/googleapis/java-shared-config/compare/v0.11.1...v0.11.2) (2021-04-22) + + +### Dependencies + +* update auto-value-annotation.version to v1.8.1 ([#250](https://www.github.com/googleapis/java-shared-config/issues/250)) ([bc01005](https://www.github.com/googleapis/java-shared-config/commit/bc01005be3baeb7b11cbb2a402d5b421113234a7)) + ### [0.11.1](https://www.github.com/googleapis/java-shared-config/compare/v0.11.0...v0.11.1) (2021-04-14) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 65b04abff8b4..aff8f081cca8 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.11.1 + 0.11.2 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 8ed811e730c3..9b6ebfdff321 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.11.2-SNAPSHOT + 0.11.2 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 1962e8e9f851..4e1baff903c3 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.11.1:0.11.2-SNAPSHOT +google-cloud-shared-config:0.11.2:0.11.2 From f2a1198534f43b8db563b576af5b1e297694a5a5 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Mon, 17 May 2021 10:08:04 -0700 Subject: [PATCH 193/794] chore: change cloud rad doclet (#259) --- java-shared-config/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9b6ebfdff321..6dfe85d01859 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -679,8 +679,8 @@ com.microsoft.doclet.DocFxDoclet false - ${env.KOKORO_GFILE_DIR}/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies-172556.jar - -outputpath ${project.build.directory}/docfx-yml + ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.0.jar + -outputpath ${project.build.directory}/docfx-yml -projectname ${artifactId} none protected true From 74acb42843c09044b59921b9ca703fd0edb9d6cb Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 18 May 2021 19:45:00 +0200 Subject: [PATCH 194/794] build(deps): update dependency org.apache.maven.plugins:maven-gpg-plugin to v3 (#258) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 6dfe85d01859..47f4de5869d2 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -561,7 +561,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts From dc4a555aa34e634601da0dc33546a68b6ad5333e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 18 May 2021 19:45:22 +0200 Subject: [PATCH 195/794] build(deps): update dependency org.jacoco:jacoco-maven-plugin to v0.8.7 (#257) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 47f4de5869d2..d4bc1f26cffb 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -190,7 +190,7 @@ org.jacoco jacoco-maven-plugin - 0.8.6 + 0.8.7 org.apache.maven.plugins From 7997cd69fb543a1af2bae2ed747a507808f31b61 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 18 May 2021 19:45:41 +0200 Subject: [PATCH 196/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.1.2 (#256) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d4bc1f26cffb..472fbed944b9 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -418,7 +418,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.1 + 3.1.2 From 832e5852bbdc747ab612d227179c22c2bbd13d3d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 18 May 2021 10:46:32 -0700 Subject: [PATCH 197/794] chore: release 0.11.3-SNAPSHOT (#254) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 472fbed944b9..3e4d4c20ce39 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.11.2 + 0.11.3-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 4e1baff903c3..42b1a38f651a 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.11.2:0.11.2 +google-cloud-shared-config:0.11.2:0.11.3-SNAPSHOT From 7d11bfbacc2073a1266531c21cad4f050fb316a1 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 18 May 2021 10:48:01 -0700 Subject: [PATCH 198/794] chore: Re-generated to pick up changes from synthtool (#249) * chore(java): detect sample-secrets in build.sh Fixes #904 Source-Author: Neenu Shaji Source-Date: Wed Mar 24 15:50:02 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: bb854b6c048619e3be4e8b8ce8ed10aa74ea78ef Source-Link: https://github.com/googleapis/synthtool/commit/bb854b6c048619e3be4e8b8ce8ed10aa74ea78ef * chore: remove staging bucket v2 not needed since we removed v2 solution - https://github.com/googleapis/synthtool/pull/964 Source-Author: Emily Ball Source-Date: Mon Mar 29 14:47:37 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: 572ef8f70edd9041f5bcfa71511aed6aecfc2098 Source-Link: https://github.com/googleapis/synthtool/commit/572ef8f70edd9041f5bcfa71511aed6aecfc2098 * build(java): skip javadoc tests during dependencies test Source-Author: Jeff Ching Source-Date: Fri Apr 9 09:18:54 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: 5b0e1592dd7d70b485e157ea4b3eb1704ecbd015 Source-Link: https://github.com/googleapis/synthtool/commit/5b0e1592dd7d70b485e157ea4b3eb1704ecbd015 * fix: typo @Neenu1995 Source-Author: Elliotte Rusty Harold Source-Date: Tue Apr 13 00:00:05 2021 +0000 Source-Repo: googleapis/synthtool Source-Sha: 082e1ca0863b13ada8594fe91845380765da5b70 Source-Link: https://github.com/googleapis/synthtool/commit/082e1ca0863b13ada8594fe91845380765da5b70 * fix: release scripts from issuing overlapping phases `mvn deploy` will run `mvn install` so specifying `mvn install deploy` is redundant at best. At worst, it will cause plugins like maven-shade-plugin to be executed twice re-shading itself Source-Author: Igor Bernstein Source-Date: Wed Apr 14 13:16:03 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d Source-Link: https://github.com/googleapis/synthtool/commit/8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d --- java-shared-config/.kokoro/build.sh | 7 ++++++- java-shared-config/.kokoro/dependencies.sh | 1 + java-shared-config/.kokoro/release/publish_javadoc.sh | 5 ----- java-shared-config/.kokoro/release/snapshot.sh | 2 +- java-shared-config/.kokoro/release/stage.sh | 2 +- java-shared-config/synth.metadata | 5 +++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index 34079b25d974..131a1e027184 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -37,7 +37,7 @@ retry_with_backoff 3 10 \ -Dgcloud.download.skip=true \ -T 1C -# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it +# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) fi @@ -79,6 +79,11 @@ samples) if [[ -f ${SAMPLES_DIR}/pom.xml ]] then + for FILE in ${KOKORO_GFILE_DIR}/secret_manager/*-samples-secrets; do + [[ -f "$FILE" ]] || continue + source "$FILE" + done + pushd ${SAMPLES_DIR} mvn -B \ -Penable-samples \ diff --git a/java-shared-config/.kokoro/dependencies.sh b/java-shared-config/.kokoro/dependencies.sh index 0fb8c8436ccc..59d2aafc790f 100755 --- a/java-shared-config/.kokoro/dependencies.sh +++ b/java-shared-config/.kokoro/dependencies.sh @@ -33,6 +33,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" retry_with_backoff 3 10 \ mvn install -B -V -ntp \ -DskipTests=true \ + -Dmaven.javadoc.skip=true \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true diff --git a/java-shared-config/.kokoro/release/publish_javadoc.sh b/java-shared-config/.kokoro/release/publish_javadoc.sh index d9b71925b623..c9b3f5490d8f 100755 --- a/java-shared-config/.kokoro/release/publish_javadoc.sh +++ b/java-shared-config/.kokoro/release/publish_javadoc.sh @@ -24,11 +24,6 @@ if [[ -z "${STAGING_BUCKET}" ]]; then exit 1 fi -if [[ -z "${STAGING_BUCKET_V2}" ]]; then - echo "Need to set STAGING_BUCKET_V2 environment variable" - exit 1 -fi - # work from the git root directory pushd $(dirname "$0")/../../ diff --git a/java-shared-config/.kokoro/release/snapshot.sh b/java-shared-config/.kokoro/release/snapshot.sh index 098168a7373c..1f55b77024d8 100755 --- a/java-shared-config/.kokoro/release/snapshot.sh +++ b/java-shared-config/.kokoro/release/snapshot.sh @@ -25,7 +25,7 @@ grep SNAPSHOT versions.txt setup_environment_secrets create_settings_xml_file "settings.xml" -mvn clean install deploy -B \ +mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DperformRelease=true \ -Dgpg.executable=gpg \ diff --git a/java-shared-config/.kokoro/release/stage.sh b/java-shared-config/.kokoro/release/stage.sh index 16126d2eb53f..8a1033843cb1 100755 --- a/java-shared-config/.kokoro/release/stage.sh +++ b/java-shared-config/.kokoro/release/stage.sh @@ -29,7 +29,7 @@ create_settings_xml_file "settings.xml" # attempt to stage 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ - mvn clean install deploy -B \ + mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DskipTests=true \ -DperformRelease=true \ diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index ee6fc2652e61..38d1f9cb7015 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "b7447a09e2b07bff027ecfa3533fad3c39cbc677" + "sha": "51c9f68ff1736761b21c921f078ab2c8675ff268" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "d0bdade9a962042dc0f770cf631086f3db59b5b0" + "sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d" } } ], @@ -25,6 +25,7 @@ ".github/generated-files-bot.yml", ".github/readme/synth.py", ".github/snippet-bot.yml", + ".github/sync-repo-settings.yaml", ".github/trusted-contribution.yml", ".github/workflows/approve-readme.yaml", ".github/workflows/ci.yaml", From 67b79e8b82b9e2ed10a082a264bc5827c13cb1fd Mon Sep 17 00:00:00 2001 From: "google-cloud-policy-bot[bot]" <80869356+google-cloud-policy-bot[bot]@users.noreply.github.com> Date: Tue, 18 May 2021 17:50:06 +0000 Subject: [PATCH 199/794] chore: add SECURITY.md (#255) chore: add SECURITY.md --- java-shared-config/SECURITY.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 java-shared-config/SECURITY.md diff --git a/java-shared-config/SECURITY.md b/java-shared-config/SECURITY.md new file mode 100644 index 000000000000..8b58ae9c01ae --- /dev/null +++ b/java-shared-config/SECURITY.md @@ -0,0 +1,7 @@ +# Security Policy + +To report a security issue, please use [g.co/vulnz](https://g.co/vulnz). + +The Google Security Team will respond within 5 working days of your report on g.co/vulnz. + +We use g.co/vulnz for our intake, and do coordination and disclosure here using GitHub Security Advisory to privately discuss and fix the issue. From e2e872220d7ac2daf3abc67720a24428135d3bb5 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 18 May 2021 22:54:04 +0200 Subject: [PATCH 200/794] deps: update dependency com.puppycrawl.tools:checkstyle to v8.42 (#234) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `8.40` -> `8.42` | [![age](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/8.42/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/8.42/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/8.42/compatibility-slim/8.40)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/8.42/confidence-slim/8.40)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻️ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 3e4d4c20ce39..f1963cbef97d 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -612,7 +612,7 @@ com.puppycrawl.tools checkstyle - 8.40 + 8.42 From e7eb2f3e46b2682fabc0494e5c3d70a288f14c11 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Tue, 18 May 2021 14:05:18 -0700 Subject: [PATCH 201/794] feat: update cloud-rad doclet (#260) * chore: change cloud rad doclet * feat: library should released as 0.11.4 Release-As: 0.11.4 From 3f3add5f772ebd4e02ccb49c1c0ba67744261e82 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 19 May 2021 09:18:55 -0700 Subject: [PATCH 202/794] [CHANGE ME] Re-generated to pick up changes from synthtool. (#262) * chore: adding cloud-rad java xrefs Source-Author: Emily Ball Source-Date: Thu May 6 11:48:47 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: 046994f491c02806aea60118e214a9edd67f5ab7 Source-Link: https://github.com/googleapis/synthtool/commit/046994f491c02806aea60118e214a9edd67f5ab7 * build(java): remove codecov action Source-Author: Jeff Ching Source-Date: Thu May 13 11:05:41 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: 4f4b1b9b8d8b52f1e9e4a76165896debce5ab7f1 Source-Link: https://github.com/googleapis/synthtool/commit/4f4b1b9b8d8b52f1e9e4a76165896debce5ab7f1 * chore: add changelog to cloud-rad Source-Author: Emily Ball Source-Date: Mon May 17 09:54:56 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: c86c7a60985644eab557949363a38301d40d78d2 Source-Link: https://github.com/googleapis/synthtool/commit/c86c7a60985644eab557949363a38301d40d78d2 --- java-shared-config/.github/workflows/ci.yaml | 6 +----- java-shared-config/.kokoro/release/publish_javadoc11.sh | 9 +++++++++ java-shared-config/synth.metadata | 4 ++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index def8b3a2c84d..0195b32f00b4 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -19,10 +19,6 @@ jobs: - run: .kokoro/build.sh env: JOB_TYPE: test - - name: coverage - uses: codecov/codecov-action@v1 - with: - name: actions ${{matrix.java}} windows: runs-on: windows-latest steps: @@ -80,4 +76,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/java-shared-config/.kokoro/release/publish_javadoc11.sh b/java-shared-config/.kokoro/release/publish_javadoc11.sh index e843904c44bf..0a329f70affa 100755 --- a/java-shared-config/.kokoro/release/publish_javadoc11.sh +++ b/java-shared-config/.kokoro/release/publish_javadoc11.sh @@ -42,6 +42,8 @@ mvn clean site -B -q -P docFX # copy README to docfx-yml dir and rename index.md cp README.md target/docfx-yml/index.md +# copy CHANGELOG to docfx-yml dir and rename history.md +cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml @@ -49,6 +51,13 @@ pushd target/docfx-yml python3 -m docuploader create-metadata \ --name ${NAME} \ --version ${VERSION} \ + --xrefs devsite://java/gax \ + --xrefs devsite://java/google-cloud-core \ + --xrefs devsite://java/api-common \ + --xrefs devsite://java/proto-google-common-protos \ + --xrefs devsite://java/google-api-client \ + --xrefs devsite://java/google-http-client \ + --xrefs devsite://java/protobuf \ --language java # upload yml to production bucket diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 38d1f9cb7015..bbcb30b24e88 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "51c9f68ff1736761b21c921f078ab2c8675ff268" + "sha": "9f73e89660956b90c235e99cfbdf440996a844e5" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d" + "sha": "c86c7a60985644eab557949363a38301d40d78d2" } } ], From 6ed3f6919f6fd9cf02297d60e9b8229d43fbd724 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 19 May 2021 16:34:08 +0000 Subject: [PATCH 203/794] chore: release 0.11.4 (#261) :robot: I have created a release \*beep\* \*boop\* --- ### [0.11.4](https://www.github.com/googleapis/java-shared-config/compare/v0.11.2...v0.11.4) (2021-05-19) ### Features * update cloud-rad doclet ([#260](https://www.github.com/googleapis/java-shared-config/issues/260)) ([e7eb2f3](https://www.github.com/googleapis/java-shared-config/commit/e7eb2f3e46b2682fabc0494e5c3d70a288f14c11)) ### Dependencies * update dependency com.puppycrawl.tools:checkstyle to v8.42 ([#234](https://www.github.com/googleapis/java-shared-config/issues/234)) ([e2e8722](https://www.github.com/googleapis/java-shared-config/commit/e2e872220d7ac2daf3abc67720a24428135d3bb5)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 12 ++++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index e4f7b19526f4..17bfd27d90b4 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +### [0.11.4](https://www.github.com/googleapis/java-shared-config/compare/v0.11.2...v0.11.4) (2021-05-19) + + +### Features + +* update cloud-rad doclet ([#260](https://www.github.com/googleapis/java-shared-config/issues/260)) ([9f73e89](https://www.github.com/googleapis/java-shared-config/commit/9f73e89660956b90c235e99cfbdf440996a844e5)) + + +### Dependencies + +* update dependency com.puppycrawl.tools:checkstyle to v8.42 ([#234](https://www.github.com/googleapis/java-shared-config/issues/234)) ([3ff0730](https://www.github.com/googleapis/java-shared-config/commit/3ff073033378e8a3fde62c52dbf3ad9820cc4538)) + ### [0.11.2](https://www.github.com/googleapis/java-shared-config/compare/v0.11.1...v0.11.2) (2021-04-22) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index aff8f081cca8..5ca9b1afb88b 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.11.2 + 0.12.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index f1963cbef97d..63f9afd23538 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.11.3-SNAPSHOT + 0.12.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 42b1a38f651a..19d1ad677e21 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.11.2:0.11.3-SNAPSHOT +google-cloud-shared-config:0.12.0:0.12.0 From 3992bfccdb7a80fce3fa50a6af118d6677e8244d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 31 May 2021 14:23:14 -0400 Subject: [PATCH 204/794] chore: release 0.11.5-SNAPSHOT (#263) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 63f9afd23538..067217b705c4 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.12.0 + 0.12.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 19d1ad677e21..bb83d52be192 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.12.0:0.12.0 +google-cloud-shared-config:0.12.0:0.12.1-SNAPSHOT From 1c87c35a372de00542f6d67894aa53e277246d8a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 31 May 2021 20:24:05 +0200 Subject: [PATCH 205/794] deps: update dependency com.puppycrawl.tools:checkstyle to v8.43 (#266) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 067217b705c4..39e2c3afe969 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -612,7 +612,7 @@ com.puppycrawl.tools checkstyle - 8.42 + 8.43 From fa779ad6d77ea95f39d4237f29092ed7f11cf694 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 2 Jun 2021 13:02:05 -0700 Subject: [PATCH 206/794] feat: add `gcf-owl-bot[bot]` to `ignoreAuthors` (#264) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/c4b20afb-c7d6-4b15-beb0-dc65c9ec4130/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/7332178a11ddddc91188dc0f25bca1ccadcaa6c6 --- java-shared-config/.github/generated-files-bot.yml | 1 + java-shared-config/synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.github/generated-files-bot.yml b/java-shared-config/.github/generated-files-bot.yml index 47c2ba132e01..c644a24e1129 100644 --- a/java-shared-config/.github/generated-files-bot.yml +++ b/java-shared-config/.github/generated-files-bot.yml @@ -9,3 +9,4 @@ ignoreAuthors: - 'renovate-bot' - 'yoshi-automation' - 'release-please[bot]' +- 'gcf-owl-bot[bot]' diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index bbcb30b24e88..239c81e7972a 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "9f73e89660956b90c235e99cfbdf440996a844e5" + "sha": "6d3bd0d00c33b4d0d65f63a9306e882edbeb46c1" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "c86c7a60985644eab557949363a38301d40d78d2" + "sha": "7332178a11ddddc91188dc0f25bca1ccadcaa6c6" } } ], From bb980c277e4426199e8984ca147412f48b406361 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 3 Jun 2021 14:32:04 -0700 Subject: [PATCH 207/794] chore: dump maven version along with java (#268) Source-Author: Igor Bernstein Source-Date: Thu May 20 10:56:02 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 8eae0234a16b26c2ff616d305dbd9786c8b10a47 Source-Link: https://github.com/googleapis/synthtool/commit/8eae0234a16b26c2ff616d305dbd9786c8b10a47 --- java-shared-config/.kokoro/build.sh | 4 ++-- java-shared-config/synth.metadata | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index 131a1e027184..01e03c23f733 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -23,8 +23,8 @@ cd ${scriptDir}/.. # include common functions source ${scriptDir}/common.sh -# Print out Java version -java -version +# Print out Maven & Java version +mvn -version echo ${JOB_TYPE} # attempt to install 3 times with exponential backoff (starting with 10 seconds) diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 239c81e7972a..f8fe9e0da33d 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "6d3bd0d00c33b4d0d65f63a9306e882edbeb46c1" + "sha": "d274af836ac9b3e98be84e551b7e9e552397ecc1" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "7332178a11ddddc91188dc0f25bca1ccadcaa6c6" + "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" } } ], From 0ad6ca905cac2c485cf08cad0d507fc704bab765 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 3 Jun 2021 23:32:21 +0200 Subject: [PATCH 208/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.0 (#265) --- java-shared-config/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 39e2c3afe969..99475507449a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -445,7 +445,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 html @@ -545,7 +545,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 attach-javadocs @@ -665,7 +665,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 docFX From cbaa9118fa5c78303ba6d1879e1915d059e898a6 Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Mon, 14 Jun 2021 15:35:14 -0400 Subject: [PATCH 209/794] chore: fix maven warning (#269) This should fix the warnings " The expression ${artifactId} is deprecated. Please use ${project.artifactId} instead." --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 99475507449a..770163772871 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -680,7 +680,7 @@ com.microsoft.doclet.DocFxDoclet false ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.0.jar - -outputpath ${project.build.directory}/docfx-yml -projectname ${artifactId} + -outputpath ${project.build.directory}/docfx-yml -projectname ${project.artifactId} none protected true From 5be12395f0ef5cbbd5c1219edd603ea9697c23fa Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 14 Jun 2021 21:36:11 +0200 Subject: [PATCH 210/794] build(deps): update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.2.0 (#272) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 770163772871..aa9189c0e91d 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -195,7 +195,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.2 + 3.2.0 javax.annotation:javax.annotation-api From 36b2acb7e9581d77868e81884b3e7c9b101e8837 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 7 Jul 2021 19:14:57 +0200 Subject: [PATCH 211/794] deps: update dependency com.puppycrawl.tools:checkstyle to v8.44 (#274) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index aa9189c0e91d..0f1bed46a4f4 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -612,7 +612,7 @@ com.puppycrawl.tools checkstyle - 8.43 + 8.44 From 68445ee29ea97cf6d02f991369233a50455bf855 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 22 Jul 2021 19:25:37 +0200 Subject: [PATCH 212/794] deps: update auto-value-annotation.version to v1.8.2 (#275) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 0f1bed46a4f4..aa54b450c58b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -63,7 +63,7 @@ ${project.artifactId} false true - 1.8.1 + 1.8.2 /java/docs/reference/ From 72199fa2570e01a09f392bc4e04e87bf8d2d5c34 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 26 Jul 2021 09:30:45 -0700 Subject: [PATCH 213/794] fix: Update dependencies.sh to not break on mac (#276) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/f06ae3bf-97bf-4723-a9d0-14c59e742708/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/5d3c52f5db664eee9026db76b5bcb466f3a09ca9 Source-Link: https://github.com/googleapis/synthtool/commit/09c59c20a4bf0daed1665af59035ff240fe356df Source-Link: https://github.com/googleapis/synthtool/commit/87254ac89a9559864c0a245d6b150406439ce3d8 Source-Link: https://github.com/googleapis/synthtool/commit/1c0c698705e668ccb3d68556ae7260f16ce63a6e Source-Link: https://github.com/googleapis/synthtool/commit/8f76a885deaaf2fe234daeba4a8cc4d1b3de8086 fix: Add shopt -s nullglob to dependencies script --- java-shared-config/.kokoro/coerce_logs.sh | 1 - java-shared-config/.kokoro/dependencies.sh | 5 +++-- java-shared-config/java.header | 2 +- java-shared-config/renovate.json | 5 ++++- java-shared-config/synth.metadata | 5 +++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.kokoro/coerce_logs.sh b/java-shared-config/.kokoro/coerce_logs.sh index 5cf7ba49e6bb..46edbf7f2fcd 100755 --- a/java-shared-config/.kokoro/coerce_logs.sh +++ b/java-shared-config/.kokoro/coerce_logs.sh @@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME}) echo "coercing sponge logs..." for xml in `find . -name *-sponge_log.xml` do - echo "processing ${xml}" class=$(basename ${xml} | cut -d- -f2) dir=$(dirname ${xml})/${job}/${class} text=$(dirname ${xml})/${class}-sponge_log.txt diff --git a/java-shared-config/.kokoro/dependencies.sh b/java-shared-config/.kokoro/dependencies.sh index 59d2aafc790f..9030ba8f99ff 100755 --- a/java-shared-config/.kokoro/dependencies.sh +++ b/java-shared-config/.kokoro/dependencies.sh @@ -14,6 +14,7 @@ # limitations under the License. set -eo pipefail +shopt -s nullglob ## Get the directory of the build script scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) @@ -46,7 +47,7 @@ function completenessCheck() { # This is stripped from the output as it is not present in the flattened pom. # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list. msg "Generating dependency list using original pom..." - mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt + mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) msg "Generating dependency list using flattened pom..." @@ -70,7 +71,7 @@ function completenessCheck() { set +e error_count=0 -for path in $(find -name ".flattened-pom.xml") +for path in **/.flattened-pom.xml do # Check flattened pom in each dir that contains it for completeness dir=$(dirname "$path") diff --git a/java-shared-config/java.header b/java-shared-config/java.header index 3a9b503aa24f..d0970ba7d375 100644 --- a/java-shared-config/java.header +++ b/java-shared-config/java.header @@ -1,5 +1,5 @@ ^/\*$ -^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)( All [rR]ights [rR]eserved\.)?$ +^ \* Copyright \d\d\d\d,? Google (Inc\.|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/java-shared-config/renovate.json b/java-shared-config/renovate.json index ece688b009ba..59333bfbe304 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -69,5 +69,8 @@ } ], "semanticCommits": true, - "masterIssue": true + "dependencyDashboard": true, + "dependencyDashboardLabels": [ + "type: process" + ] } diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index f8fe9e0da33d..9143a0ced971 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "d274af836ac9b3e98be84e551b7e9e552397ecc1" + "sha": "4d152461a5592940a8be762c7a8698a02dbe26cf" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" + "sha": "5d3c52f5db664eee9026db76b5bcb466f3a09ca9" } } ], @@ -79,6 +79,7 @@ "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", "LICENSE", + "SECURITY.md", "codecov.yaml", "java.header", "license-checks.xml", From 2cce14c665cd7da3b78308ef5cfe2bde241926ad Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 26 Jul 2021 19:50:38 +0000 Subject: [PATCH 214/794] chore: release 0.13.0 (#267) :robot: I have created a release \*beep\* \*boop\* --- ## [0.12.0](https://www.github.com/googleapis/java-shared-config/compare/v0.11.4...v0.12.0) (2021-07-26) ### Features * add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#264](https://www.github.com/googleapis/java-shared-config/issues/264)) ([fa779ad](https://www.github.com/googleapis/java-shared-config/commit/fa779ad6d77ea95f39d4237f29092ed7f11cf694)) ### Bug Fixes * Add shopt -s nullglob to dependencies script ([72199fa](https://www.github.com/googleapis/java-shared-config/commit/72199fa2570e01a09f392bc4e04e87bf8d2d5c34)) * Update dependencies.sh to not break on mac ([#276](https://www.github.com/googleapis/java-shared-config/issues/276)) ([72199fa](https://www.github.com/googleapis/java-shared-config/commit/72199fa2570e01a09f392bc4e04e87bf8d2d5c34)) ### Dependencies * update auto-value-annotation.version to v1.8.2 ([#275](https://www.github.com/googleapis/java-shared-config/issues/275)) ([68445ee](https://www.github.com/googleapis/java-shared-config/commit/68445ee29ea97cf6d02f991369233a50455bf855)) * update dependency com.puppycrawl.tools:checkstyle to v8.43 ([#266](https://www.github.com/googleapis/java-shared-config/issues/266)) ([1c87c35](https://www.github.com/googleapis/java-shared-config/commit/1c87c35a372de00542f6d67894aa53e277246d8a)) * update dependency com.puppycrawl.tools:checkstyle to v8.44 ([#274](https://www.github.com/googleapis/java-shared-config/issues/274)) ([36b2acb](https://www.github.com/googleapis/java-shared-config/commit/36b2acb7e9581d77868e81884b3e7c9b101e8837)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 20 ++++++++++++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 17bfd27d90b4..67ad201b42fb 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## [0.12.0](https://www.github.com/googleapis/java-shared-config/compare/v0.11.4...v0.12.0) (2021-07-26) + + +### Features + +* add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#264](https://www.github.com/googleapis/java-shared-config/issues/264)) ([d274af8](https://www.github.com/googleapis/java-shared-config/commit/d274af836ac9b3e98be84e551b7e9e552397ecc1)) + + +### Bug Fixes + +* Add shopt -s nullglob to dependencies script ([865ca3c](https://www.github.com/googleapis/java-shared-config/commit/865ca3cbf106a7aaae1a989320a1ad5a47b6ffaf)) +* Update dependencies.sh to not break on mac ([#276](https://www.github.com/googleapis/java-shared-config/issues/276)) ([865ca3c](https://www.github.com/googleapis/java-shared-config/commit/865ca3cbf106a7aaae1a989320a1ad5a47b6ffaf)) + + +### Dependencies + +* update auto-value-annotation.version to v1.8.2 ([#275](https://www.github.com/googleapis/java-shared-config/issues/275)) ([4d15246](https://www.github.com/googleapis/java-shared-config/commit/4d152461a5592940a8be762c7a8698a02dbe26cf)) +* update dependency com.puppycrawl.tools:checkstyle to v8.43 ([#266](https://www.github.com/googleapis/java-shared-config/issues/266)) ([fae7961](https://www.github.com/googleapis/java-shared-config/commit/fae7961412b33e34e8fcfec78d1451894d4e61d9)) +* update dependency com.puppycrawl.tools:checkstyle to v8.44 ([#274](https://www.github.com/googleapis/java-shared-config/issues/274)) ([d53d0e0](https://www.github.com/googleapis/java-shared-config/commit/d53d0e0935e908d16f4e7cf763577cf3fd8128d3)) + ### [0.11.4](https://www.github.com/googleapis/java-shared-config/compare/v0.11.2...v0.11.4) (2021-05-19) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 5ca9b1afb88b..e2cbeb7cf338 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.12.0 + 0.13.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index aa54b450c58b..0090710f5760 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.12.1-SNAPSHOT + 0.13.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index bb83d52be192..efae780609ad 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.12.0:0.12.1-SNAPSHOT +google-cloud-shared-config:0.13.0:0.13.0 From 98fcf66e658d4fd97b6358012266209ebc69e444 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Mon, 26 Jul 2021 17:26:36 -0400 Subject: [PATCH 215/794] chore: make java 7 unit check not required (#279) --- java-shared-config/.github/sync-repo-settings.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index 6bddd18eac90..a0c0cd493824 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -34,7 +34,6 @@ branchProtectionRules: - "linkage-monitor" - "lint" - "clirr" - - "units (7)" - "units (8)" - "units (11)" - "Kokoro - Test: Integration" From 8f1477675989d939b15951b87bfd7a932de21833 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 26 Jul 2021 21:54:37 +0000 Subject: [PATCH 216/794] chore: release 0.13.1-SNAPSHOT (#278) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 0090710f5760..4ef08f072b3c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.13.0 + 0.13.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index efae780609ad..49e2f0d5e0c9 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.13.0:0.13.0 +google-cloud-shared-config:0.13.0:0.13.1-SNAPSHOT From 7ddb4bf463f04f988fa61b9e1939d83ebc7e9132 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 27 Jul 2021 12:00:12 -0400 Subject: [PATCH 217/794] fix: revert update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.2.0 (#280) Reverts googleapis/java-shared-config#272 --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 4ef08f072b3c..d71bc7a30b66 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -195,7 +195,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + 3.1.2 javax.annotation:javax.annotation-api From 7d91234b7a40697e93b922ec340356451ec5e3d4 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 27 Jul 2021 16:08:24 +0000 Subject: [PATCH 218/794] chore: release 0.13.1 (#281) :robot: I have created a release \*beep\* \*boop\* --- ### [0.13.1](https://www.github.com/googleapis/java-shared-config/compare/v0.13.0...v0.13.1) (2021-07-27) ### Bug Fixes * revert update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.2.0 ([#280](https://www.github.com/googleapis/java-shared-config/issues/280)) ([7ddb4bf](https://www.github.com/googleapis/java-shared-config/commit/7ddb4bf463f04f988fa61b9e1939d83ebc7e9132)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 67ad201b42fb..9738f8d92c5a 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.13.1](https://www.github.com/googleapis/java-shared-config/compare/v0.13.0...v0.13.1) (2021-07-27) + + +### Bug Fixes + +* revert update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.2.0 ([#280](https://www.github.com/googleapis/java-shared-config/issues/280)) ([bdbbb9c](https://www.github.com/googleapis/java-shared-config/commit/bdbbb9c13571d0ef06009ebf03bc25c6e6fcbc17)) + ## [0.12.0](https://www.github.com/googleapis/java-shared-config/compare/v0.11.4...v0.12.0) (2021-07-26) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index e2cbeb7cf338..1112cb9cd1e8 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.13.0 + 0.13.1 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d71bc7a30b66..c0295115c2b5 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.13.1-SNAPSHOT + 0.13.1 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 49e2f0d5e0c9..2a442d513ab2 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.13.0:0.13.1-SNAPSHOT +google-cloud-shared-config:0.13.1:0.13.1 From f8dbbe7ab689d48f0e1c39adaacb4cc4662420a1 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 27 Jul 2021 13:06:25 -0400 Subject: [PATCH 219/794] build: add downstream checks (#283) --- .../.github/sync-repo-settings.yaml | 10 +++ .../.github/workflows/downstream.yaml | 27 ++++++++ .../.kokoro/client-library-check.sh | 65 +++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 java-shared-config/.github/workflows/downstream.yaml create mode 100755 java-shared-config/.kokoro/client-library-check.sh diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index a0c0cd493824..fca7c29911b4 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -37,6 +37,16 @@ branchProtectionRules: - "units (8)" - "units (11)" - "Kokoro - Test: Integration" + - "dependencies (8, java-bigquery)" + - "dependencies (8, java-bigqueryconnection)" + - "dependencies (8, java-spanner)" + - "dependencies (8, java-storage)" + - "dependencies (8, java-pubsub)" + - "dependencies (11, java-bigquery)" + - "dependencies (11, java-bigqueryconnection)" + - "dependencies (11, java-spanner)" + - "dependencies (11, java-storage)" + - "dependencies (11, java-pubsub)" - "cla/google" # List of explicit permissions to add (additive only) permissionRules: diff --git a/java-shared-config/.github/workflows/downstream.yaml b/java-shared-config/.github/workflows/downstream.yaml new file mode 100644 index 000000000000..d049858d8890 --- /dev/null +++ b/java-shared-config/.github/workflows/downstream.yaml @@ -0,0 +1,27 @@ +on: + push: + branches: + - master + pull_request: +name: downstream +jobs: + dependencies: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + java: [8, 11] + repo: + - java-bigquery + - java-bigqueryconnection + - java-spanner + - java-storage + - java-pubsub + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: ${{matrix.java}} + - run: java -version + - run: sudo apt-get install libxml2-utils + - run: .kokoro/client-library-check.sh ${{matrix.repo}} diff --git a/java-shared-config/.kokoro/client-library-check.sh b/java-shared-config/.kokoro/client-library-check.sh new file mode 100755 index 000000000000..03cee53b0dff --- /dev/null +++ b/java-shared-config/.kokoro/client-library-check.sh @@ -0,0 +1,65 @@ +#!/bin/bash +# 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. +# 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. + +# Presubmit to ensure the dependencies of the Google Libraries BOM, with the modification of change +# in the PR, pick up the highest versions among transitive dependencies. +# https://maven.apache.org/enforcer/enforcer-rules/requireUpperBoundDeps.html + +set -eo pipefail +# Display commands being run. +set -x + +if [[ $# -lt 1 ]]; +then + echo "Usage: $0 " + exit 1 +fi +REPO=$1 + +## Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +# Make artifacts available for 'mvn validate' at the bottom +mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q + +# Read the current version of this BOM in the POM. Example version: '0.116.1-alpha-SNAPSHOT' +VERSION_POM=pom.xml +# Namespace (xmlns) prevents xmllint from specifying tag names in XPath +VERSION=`sed -e 's/xmlns=".*"//' ${VERSION_POM} | xmllint --xpath '/project/version/text()' -` + +if [ -z "${VERSION}" ]; then + echo "Version is not found in ${VERSION_POM}" + exit 1 +fi +echo "Version: ${VERSION}" + +# Check this BOM against a few java client libraries +# java-bigquery +git clone "https://github.com/googleapis/${REPO}.git" --depth=1 +pushd ${REPO} + +# replace version +xmllint --shell <(cat pom.xml) << EOF +setns x=http://maven.apache.org/POM/4.0.0 +cd .//x:artifactId[text()="google-cloud-shared-config"] +cd ../x:version +set ${VERSION} +save pom.xml +EOF + +# run dependencies script +.kokoro/dependencies.sh From 96ee31e050233d149adb024cea15b95269ed3132 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 27 Jul 2021 23:08:26 +0000 Subject: [PATCH 220/794] chore: release 0.13.2-SNAPSHOT (#282) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index c0295115c2b5..b9dda59c8851 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.13.1 + 0.13.2-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 2a442d513ab2..ae77c047b93b 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.13.1:0.13.1 +google-cloud-shared-config:0.13.1:0.13.2-SNAPSHOT From efcc4bbef8a4105499653422f1ee4b4065a5ed94 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Thu, 29 Jul 2021 12:32:34 -0400 Subject: [PATCH 221/794] chore: remove bigquery from downstream check (#285) --- java-shared-config/.github/workflows/downstream.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/java-shared-config/.github/workflows/downstream.yaml b/java-shared-config/.github/workflows/downstream.yaml index d049858d8890..f28021e43661 100644 --- a/java-shared-config/.github/workflows/downstream.yaml +++ b/java-shared-config/.github/workflows/downstream.yaml @@ -12,7 +12,6 @@ jobs: matrix: java: [8, 11] repo: - - java-bigquery - java-bigqueryconnection - java-spanner - java-storage From 785511e27dec88d7fbef8bbc263608a76d8137f8 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Thu, 29 Jul 2021 13:04:10 -0400 Subject: [PATCH 222/794] feat!: update shared-config to java 1.8 (#277) --- java-shared-config/pom.xml | 62 +++++++++++++------------------------- 1 file changed, 21 insertions(+), 41 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b9dda59c8851..dc6c86972923 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -171,8 +171,8 @@ maven-compiler-plugin 3.8.1 - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 -Xlint:unchecked -Xlint:deprecation @@ -410,6 +410,25 @@ + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + java8 + + check + + + + org.codehaus.mojo.signature + java18 + 1.0 + + + + + @@ -711,45 +730,6 @@ - - autovalue-java7 - - 1.7 - - ${basedir}/EnableAutoValue.txt - - - - - 1.4 - - - - - maven-compiler-plugin - - - - com.google.auto.value - auto-value - ${auto-value.version} - - - - - - - - autovalue-java8 From 333c52f1af22bc86e0b9e88e592d42febe41fe39 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 29 Jul 2021 10:12:09 -0700 Subject: [PATCH 223/794] chore: remove java 7 units check (#284) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/572b58d2-6894-4238-ae4c-630cb7c937dc/targets - [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.) Source-Link: https://github.com/googleapis/synthtool/commit/1a2878d6909dd10ca4e3c1b5943d6622e996054e --- java-shared-config/.github/workflows/ci.yaml | 2 +- java-shared-config/synth.metadata | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index 0195b32f00b4..65ae6ecdda77 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [7, 8, 11] + java: [8, 11] steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 9143a0ced971..3511987bd5eb 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "4d152461a5592940a8be762c7a8698a02dbe26cf" + "sha": "7a5f7dba61f247f34ce66d1d116796bbfa87133b" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "5d3c52f5db664eee9026db76b5bcb466f3a09ca9" + "sha": "1a2878d6909dd10ca4e3c1b5943d6622e996054e" } } ], From 5e438ce59aadf135884dd602ad470387d033e18f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 29 Jul 2021 17:14:23 +0000 Subject: [PATCH 224/794] chore: release 1.0.0 (#286) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :robot: I have created a release \*beep\* \*boop\* --- ## [1.0.0](https://www.github.com/googleapis/java-shared-config/compare/v0.13.1...v1.0.0) (2021-07-29) ### ⚠ BREAKING CHANGES * update shared-config to java 1.8 (#277) ### Features * update shared-config to java 1.8 ([#277](https://www.github.com/googleapis/java-shared-config/issues/277)) ([785511e](https://www.github.com/googleapis/java-shared-config/commit/785511e27dec88d7fbef8bbc263608a76d8137f8)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 11 +++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 9738f8d92c5a..9b116a35b14e 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [1.0.0](https://www.github.com/googleapis/java-shared-config/compare/v0.13.1...v1.0.0) (2021-07-29) + + +### ⚠ BREAKING CHANGES + +* update shared-config to java 1.8 (#277) + +### Features + +* update shared-config to java 1.8 ([#277](https://www.github.com/googleapis/java-shared-config/issues/277)) ([9c297a2](https://www.github.com/googleapis/java-shared-config/commit/9c297a27bc236092aab3ae292c7bed206293bc51)) + ### [0.13.1](https://www.github.com/googleapis/java-shared-config/compare/v0.13.0...v0.13.1) (2021-07-27) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 1112cb9cd1e8..c5483137bd02 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 0.13.1 + 1.0.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index dc6c86972923..2800a63a73f7 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 0.13.2-SNAPSHOT + 1.0.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index ae77c047b93b..d2ec61810aa3 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:0.13.1:0.13.2-SNAPSHOT +google-cloud-shared-config:1.0.0:1.0.0 From 9dc0395349b053ad31e6544ed5b7216e80ae5dd3 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Thu, 29 Jul 2021 14:02:10 -0400 Subject: [PATCH 225/794] build: configure java7 as a release branch (#288) --- java-shared-config/.github/release-please.yml | 5 ++++ .../.github/sync-repo-settings.yaml | 23 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/java-shared-config/.github/release-please.yml b/java-shared-config/.github/release-please.yml index 827446828034..5b1fe57a75fc 100644 --- a/java-shared-config/.github/release-please.yml +++ b/java-shared-config/.github/release-please.yml @@ -1 +1,6 @@ releaseType: java-yoshi +branches: +- bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-yoshi + branch: java7 \ No newline at end of file diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index fca7c29911b4..5eac3ab62a9a 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -48,6 +48,29 @@ branchProtectionRules: - "dependencies (11, java-storage)" - "dependencies (11, java-pubsub)" - "cla/google" +- pattern: java7 + # Can admins overwrite branch protection. + # Defaults to `true` + isAdminEnforced: true + # Number of approving reviews required to update matching branches. + # Defaults to `1` + requiredApprovingReviewCount: 1 + # Are reviews from code owners required to update matching branches. + # Defaults to `false` + requiresCodeOwnerReviews: true + # Require up to date branches + requiresStrictStatusChecks: false + # List of required status check contexts that must pass for commits to be accepted to matching branches. + requiredStatusCheckContexts: + - "dependencies (8)" + - "dependencies (11)" + - "linkage-monitor" + - "lint" + - "clirr" + - "units (8)" + - "units (11)" + - "Kokoro - Test: Integration" + - "cla/google" # List of explicit permissions to add (additive only) permissionRules: - team: yoshi-admins From 1e39c1aa93020b3124b375d22bd500fda0d18615 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 10 Aug 2021 21:40:52 -0400 Subject: [PATCH 226/794] Revert "chore: remove bigquery from downstream check (#285)" (#294) This reverts commit efcc4bbef8a4105499653422f1ee4b4065a5ed94. --- java-shared-config/.github/workflows/downstream.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/java-shared-config/.github/workflows/downstream.yaml b/java-shared-config/.github/workflows/downstream.yaml index f28021e43661..d049858d8890 100644 --- a/java-shared-config/.github/workflows/downstream.yaml +++ b/java-shared-config/.github/workflows/downstream.yaml @@ -12,6 +12,7 @@ jobs: matrix: java: [8, 11] repo: + - java-bigquery - java-bigqueryconnection - java-spanner - java-storage From bfbf18df8773f3d051a1d96bc71628347c60dcc4 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Wed, 18 Aug 2021 13:57:32 -0700 Subject: [PATCH 227/794] chore: update doclet version (#296) * chore: update doclet version * chore: bug fix --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2800a63a73f7..e0361e218516 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -698,7 +698,7 @@ com.microsoft.doclet.DocFxDoclet false - ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.0.jar + ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.1.1.jar -outputpath ${project.build.directory}/docfx-yml -projectname ${project.artifactId} none protected From 9b2688e800105ac857de8e5315e5ae7b5af7b512 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 18 Aug 2021 14:11:00 -0700 Subject: [PATCH 228/794] build(java): use ENABLE_FLAKYBOT env variable (#295) Kokoro job config now supports both environment variables during this migration period. Source-Author: Jeff Ching Source-Date: Thu Aug 12 10:10:27 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: ff01716e16d2c6e87eaf87197b753ac9fcbbed5d Source-Link: https://github.com/googleapis/synthtool/commit/ff01716e16d2c6e87eaf87197b753ac9fcbbed5d --- java-shared-config/.kokoro/build.sh | 2 +- java-shared-config/.kokoro/nightly/integration.cfg | 2 +- java-shared-config/.kokoro/nightly/samples.cfg | 2 +- java-shared-config/synth.metadata | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index 01e03c23f733..63c21c03095c 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -115,7 +115,7 @@ fi # fix output location of logs bash .kokoro/coerce_logs.sh -if [[ "${ENABLE_BUILD_COP}" == "true" ]] +if [[ "${ENABLE_FLAKYBOT}" == "true" ]] then chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/java-shared-config diff --git a/java-shared-config/.kokoro/nightly/integration.cfg b/java-shared-config/.kokoro/nightly/integration.cfg index 0048c8ece7e5..e51c7b4c6c11 100644 --- a/java-shared-config/.kokoro/nightly/integration.cfg +++ b/java-shared-config/.kokoro/nightly/integration.cfg @@ -22,7 +22,7 @@ env_vars: { } env_vars: { - key: "ENABLE_BUILD_COP" + key: "ENABLE_FLAKYBOT" value: "true" } diff --git a/java-shared-config/.kokoro/nightly/samples.cfg b/java-shared-config/.kokoro/nightly/samples.cfg index f25429314f4d..9761fd8648cb 100644 --- a/java-shared-config/.kokoro/nightly/samples.cfg +++ b/java-shared-config/.kokoro/nightly/samples.cfg @@ -33,6 +33,6 @@ env_vars: { } env_vars: { - key: "ENABLE_BUILD_COP" + key: "ENABLE_FLAKYBOT" value: "true" } diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 3511987bd5eb..9cc4d39f6a42 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "7a5f7dba61f247f34ce66d1d116796bbfa87133b" + "sha": "a721f40ada9a6198b9b0da1cfcf1b5b367132ec4" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "1a2878d6909dd10ca4e3c1b5943d6622e996054e" + "sha": "ff01716e16d2c6e87eaf87197b753ac9fcbbed5d" } } ], From 416d2f5f5f339004f4eb0d80f96f441c7e182a8a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 22:04:29 +0000 Subject: [PATCH 229/794] chore: release 1.0.1-SNAPSHOT (#287) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e0361e218516..334afb09b979 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.0.0 + 1.0.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index d2ec61810aa3..726d80876c9c 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.0.0:1.0.0 +google-cloud-shared-config:1.0.0:1.0.1-SNAPSHOT From 4487b745f89af0effd72f1b3517c2047d8175952 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 19 Aug 2021 00:23:23 +0200 Subject: [PATCH 230/794] deps: update dependency com.puppycrawl.tools:checkstyle to v8.45.1 (#292) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 334afb09b979..3626bbf970a9 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -631,7 +631,7 @@ com.puppycrawl.tools checkstyle - 8.44 + 8.45.1 From 582286d30a0c2277179caeb6ebc9fe26f533d50b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 15:36:31 -0700 Subject: [PATCH 231/794] chore: release 1.0.1 (#298) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 9b116a35b14e..740166134050 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.0.1](https://www.github.com/googleapis/java-shared-config/compare/v1.0.0...v1.0.1) (2021-08-18) + + +### Dependencies + +* update dependency com.puppycrawl.tools:checkstyle to v8.45.1 ([#292](https://www.github.com/googleapis/java-shared-config/issues/292)) ([66bf6e6](https://www.github.com/googleapis/java-shared-config/commit/66bf6e6fb95997b9eb4b34268b8d20c2fbe9ed5a)) + ## [1.0.0](https://www.github.com/googleapis/java-shared-config/compare/v0.13.1...v1.0.0) (2021-07-29) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index c5483137bd02..03abec17aabc 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 1.0.0 + 1.0.1 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 3626bbf970a9..f39d39adb333 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.0.1-SNAPSHOT + 1.0.1 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 726d80876c9c..2c3840fd3f5d 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.0.0:1.0.1-SNAPSHOT +google-cloud-shared-config:1.0.1:1.0.1 From 01f2808890a736875f31bca82c832c2b7f00acd7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 15:16:25 +0000 Subject: [PATCH 232/794] chore: release 1.0.2-SNAPSHOT (#299) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index f39d39adb333..d33bdf0d5a14 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.0.1 + 1.0.2-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 2c3840fd3f5d..926957453b1f 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.0.1:1.0.1 +google-cloud-shared-config:1.0.1:1.0.2-SNAPSHOT From f0702c707c727f4aff605eabfca6c25b6cc857d6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 23 Aug 2021 18:50:23 +0200 Subject: [PATCH 233/794] build(deps): update dependency com.coveo:fmt-maven-plugin to v2.12 (#300) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d33bdf0d5a14..d7efebf3d181 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -216,7 +216,7 @@ com.coveo fmt-maven-plugin - 2.9 + 2.12 true From fca0869ef4f71e45b54e6a9226485b3a300e1b81 Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Wed, 25 Aug 2021 16:20:20 -0400 Subject: [PATCH 234/794] Revert "build(deps): update dependency com.coveo:fmt-maven-plugin to v2.12 (#300)" (#302) This reverts commit f0702c707c727f4aff605eabfca6c25b6cc857d6. --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d7efebf3d181..d33bdf0d5a14 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -216,7 +216,7 @@ com.coveo fmt-maven-plugin - 2.12 + 2.9 true From 2056afbfb50a31ce2fcb8b8476405fff9943523a Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 31 Aug 2021 08:01:30 -0700 Subject: [PATCH 235/794] chore: enable release-trigger bot (#301) Source-Author: Jeff Ching Source-Date: Tue Aug 24 15:30:40 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: 63cff634aabb85854caa511c5837ea6b45f42b4b Source-Link: https://github.com/googleapis/synthtool/commit/63cff634aabb85854caa511c5837ea6b45f42b4b --- java-shared-config/.github/release-trigger.yml | 1 + java-shared-config/synth.metadata | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 java-shared-config/.github/release-trigger.yml diff --git a/java-shared-config/.github/release-trigger.yml b/java-shared-config/.github/release-trigger.yml new file mode 100644 index 000000000000..d4ca94189e16 --- /dev/null +++ b/java-shared-config/.github/release-trigger.yml @@ -0,0 +1 @@ +enabled: true diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 9cc4d39f6a42..c74b4db76b5e 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "a721f40ada9a6198b9b0da1cfcf1b5b367132ec4" + "sha": "e51718ca365208c7502709f7c46a52a2a859d042" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ff01716e16d2c6e87eaf87197b753ac9fcbbed5d" + "sha": "63cff634aabb85854caa511c5837ea6b45f42b4b" } } ], @@ -24,6 +24,7 @@ ".github/blunderbuss.yml", ".github/generated-files-bot.yml", ".github/readme/synth.py", + ".github/release-trigger.yml", ".github/snippet-bot.yml", ".github/sync-repo-settings.yaml", ".github/trusted-contribution.yml", From 959a93ee4ef060e41f798a2752c90d457fcba9ee Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 7 Sep 2021 14:42:34 -0700 Subject: [PATCH 236/794] chore: use maven 3.8.1 (#307) --- java-shared-config/.github/workflows/downstream.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java-shared-config/.github/workflows/downstream.yaml b/java-shared-config/.github/workflows/downstream.yaml index d049858d8890..d0963125f51b 100644 --- a/java-shared-config/.github/workflows/downstream.yaml +++ b/java-shared-config/.github/workflows/downstream.yaml @@ -19,6 +19,9 @@ jobs: - java-pubsub steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} From a03f67af6ebfe10a1b7c5e5cb5ab6743deec59db Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 7 Sep 2021 14:48:12 -0700 Subject: [PATCH 237/794] chore: use release-please to tag releases (#306) Towards https://github.com/googleapis/releasetool/issues/361 --- java-shared-config/.github/release-please.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-shared-config/.github/release-please.yml b/java-shared-config/.github/release-please.yml index 5b1fe57a75fc..7190cc4c4872 100644 --- a/java-shared-config/.github/release-please.yml +++ b/java-shared-config/.github/release-please.yml @@ -1,6 +1,7 @@ releaseType: java-yoshi +handleGHRelease: true branches: - bumpMinorPreMajor: true handleGHRelease: true releaseType: java-yoshi - branch: java7 \ No newline at end of file + branch: java7 From ca3f616bd2bb37229077e3c5b6825310cb896d01 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 9 Sep 2021 16:08:49 -0700 Subject: [PATCH 238/794] chore: regenerate common templates (#304) * ci: removing linkage-monitor from the required checks Source-Author: Tomo Suzuki Source-Date: Wed Aug 25 13:18:10 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: e2aa5bcc3356d9e3b8b53de3b5c86226447d3a22 Source-Link: https://github.com/googleapis/synthtool/commit/e2aa5bcc3356d9e3b8b53de3b5c86226447d3a22 * build(java): update renovate config to mark conformance tests as a test commit type Source-Author: kolea2 <45548808+kolea2@users.noreply.github.com> Source-Date: Tue Aug 31 14:35:19 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 9a238a0623879c3de129a376c6085d4a862f6eb9 Source-Link: https://github.com/googleapis/synthtool/commit/9a238a0623879c3de129a376c6085d4a862f6eb9 --- java-shared-config/.github/workflows/ci.yaml | 13 ------------- java-shared-config/renovate.json | 3 ++- java-shared-config/synth.metadata | 4 ++-- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index 65ae6ecdda77..d510359d97df 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -42,19 +42,6 @@ jobs: java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh - linkage-monitor: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - run: java -version - - name: Install artifacts to local Maven repository - run: .kokoro/build.sh - shell: bash - - name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release) - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor lint: runs-on: ubuntu-latest steps: diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index 59333bfbe304..c46915be6794 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -50,7 +50,8 @@ "^junit:junit", "^com.google.truth:truth", "^org.mockito:mockito-core", - "^org.objenesis:objenesis" + "^org.objenesis:objenesis", + "^com.google.cloud:google-cloud-conformance-tests" ], "semanticCommitType": "test", "semanticCommitScope": "deps" diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index c74b4db76b5e..855ef8adf870 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "e51718ca365208c7502709f7c46a52a2a859d042" + "sha": "94648655063597210d58bc64f641daafc75cbe2f" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "63cff634aabb85854caa511c5837ea6b45f42b4b" + "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9" } } ], From 6866b4b6dbd8f1ea363d370327e24faf5e853a52 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 13 Sep 2021 21:32:05 +0200 Subject: [PATCH 239/794] deps: update dependency com.puppycrawl.tools:checkstyle to v9 (#303) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d33bdf0d5a14..2781342a6350 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -631,7 +631,7 @@ com.puppycrawl.tools checkstyle - 8.45.1 + 9.0 From 8c34dffe144f60c8899fcf9e477d84d3dc013d66 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Mon, 13 Sep 2021 15:54:54 -0700 Subject: [PATCH 240/794] fix: update java docfx doclet version (#312) - https://github.com/googleapis/java-docfx-doclet/releases/tag/1.2.0 - Adds status field and package-summary --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2781342a6350..72e3670ec91e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -698,7 +698,7 @@ com.microsoft.doclet.DocFxDoclet false - ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.1.1.jar + ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.2.0.jar -outputpath ${project.build.directory}/docfx-yml -projectname ${project.artifactId} none protected From 575473ad4e66dbc1988815b3a9f7c55b2bb52bf4 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Sep 2021 00:55:34 +0200 Subject: [PATCH 241/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.1 (#305) --- java-shared-config/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 72e3670ec91e..3dd1988e6a58 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -464,7 +464,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.0 + 3.3.1 html @@ -564,7 +564,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.0 + 3.3.1 attach-javadocs @@ -684,7 +684,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.0 + 3.3.1 docFX From 417e40f91d8833d5de442dfa0e5e5b6c8f1888f4 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 13 Sep 2021 15:56:03 -0700 Subject: [PATCH 242/794] chore: remove linkage monitor required check (#309) --- java-shared-config/.github/sync-repo-settings.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index 5eac3ab62a9a..5ea1b2d5ea3a 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -31,7 +31,6 @@ branchProtectionRules: requiredStatusCheckContexts: - "dependencies (8)" - "dependencies (11)" - - "linkage-monitor" - "lint" - "clirr" - "units (8)" @@ -64,7 +63,6 @@ branchProtectionRules: requiredStatusCheckContexts: - "dependencies (8)" - "dependencies (11)" - - "linkage-monitor" - "lint" - "clirr" - "units (8)" @@ -78,4 +76,4 @@ permissionRules: - team: yoshi-java-admins permission: admin - team: yoshi-java - permission: push \ No newline at end of file + permission: push From db220abcc6e47b6031d815525501aa4633df902e Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 13 Sep 2021 15:56:27 -0700 Subject: [PATCH 243/794] chore: re-generated to pick up changes from synthtool (#310) * chore(java): install maven 3.8.1 at runtime * chore: pin github action runner at ubuntu-16.04 * chore: install maven 3.8.1 at runtime * chore: fix typo Source-Author: Neenu Shaji Source-Date: Thu Sep 2 15:46:06 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: ad7fd76e17bf9494a3e47ff9cf445f61564432e0 Source-Link: https://github.com/googleapis/synthtool/commit/ad7fd76e17bf9494a3e47ff9cf445f61564432e0 * chore(java): update windows build to install maven 3.8.1 at runtime too (related to #1202) Tested in [java-bigquerystorage](https://github.com/googleapis/java-bigquerystorage/pull/1291/commits/7834f4ff86858f6ed0b8068ea66dadf6365e399a) Source-Author: Stephanie Wang Source-Date: Tue Sep 7 13:04:27 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 17ee6e5c08f2eb47029beee4776ce990e56b3925 Source-Link: https://github.com/googleapis/synthtool/commit/17ee6e5c08f2eb47029beee4776ce990e56b3925 * chore(java): remove readme autosynth job config README generation is now handled by owlbot Source-Author: Jeff Ching Source-Date: Wed Sep 8 12:11:28 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: df5093b950d4aafd49a4c7758d74c44485263ada Source-Link: https://github.com/googleapis/synthtool/commit/df5093b950d4aafd49a4c7758d74c44485263ada * chore: remove readme synth.py config Source-Author: Jeff Ching Source-Date: Wed Sep 8 13:23:41 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: 2d31a9243781b282202b4f76dc7bbc8b45803196 Source-Link: https://github.com/googleapis/synthtool/commit/2d31a9243781b282202b4f76dc7bbc8b45803196 * chore: add gcf-owl-bot to list of trusted contributors Source-Author: Jeff Ching Source-Date: Wed Sep 8 13:42:12 2021 -0700 Source-Repo: googleapis/synthtool Source-Sha: a6b97202771f89a4b76873d43ea9a07d7fc95f91 Source-Link: https://github.com/googleapis/synthtool/commit/a6b97202771f89a4b76873d43ea9a07d7fc95f91 * chore(java): update shared-config and shared-dependencies version in pom template Source-Author: Neenu Shaji Source-Date: Wed Sep 8 17:28:48 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: 396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e Source-Link: https://github.com/googleapis/synthtool/commit/396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e --- java-shared-config/.github/readme/synth.py | 19 ------- .../.github/trusted-contribution.yml | 3 +- java-shared-config/.github/workflows/ci.yaml | 15 +++++ .../.kokoro/continuous/readme.cfg | 55 ------------------- java-shared-config/.kokoro/release/common.sh | 2 +- java-shared-config/.kokoro/release/drop.sh | 2 +- java-shared-config/.kokoro/release/promote.sh | 2 +- .../.kokoro/release/publish_javadoc.sh | 2 +- .../.kokoro/release/publish_javadoc11.sh | 2 +- java-shared-config/.kokoro/release/stage.sh | 2 +- java-shared-config/.kokoro/trampoline.sh | 2 +- java-shared-config/synth.metadata | 6 +- 12 files changed, 26 insertions(+), 86 deletions(-) delete mode 100644 java-shared-config/.github/readme/synth.py delete mode 100644 java-shared-config/.kokoro/continuous/readme.cfg diff --git a/java-shared-config/.github/readme/synth.py b/java-shared-config/.github/readme/synth.py deleted file mode 100644 index 7b48cc28d361..000000000000 --- a/java-shared-config/.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/java-shared-config/.github/trusted-contribution.yml b/java-shared-config/.github/trusted-contribution.yml index f247d5c78934..a0ba1f7d9078 100644 --- a/java-shared-config/.github/trusted-contribution.yml +++ b/java-shared-config/.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/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index d510359d97df..3becb5c022a3 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -12,6 +12,9 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} @@ -23,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 @@ -37,6 +43,9 @@ jobs: java: [8, 11] steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} @@ -46,6 +55,9 @@ jobs: runs-on: ubuntu-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 @@ -57,6 +69,9 @@ jobs: runs-on: ubuntu-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 diff --git a/java-shared-config/.kokoro/continuous/readme.cfg b/java-shared-config/.kokoro/continuous/readme.cfg deleted file mode 100644 index c41a0ae88777..000000000000 --- a/java-shared-config/.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-shared-config/.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/java-shared-config/.kokoro/release/common.sh b/java-shared-config/.kokoro/release/common.sh index 6e3f65999b3d..7f78ee414faf 100755 --- a/java-shared-config/.kokoro/release/common.sh +++ b/java-shared-config/.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/java-shared-config/.kokoro/release/drop.sh b/java-shared-config/.kokoro/release/drop.sh index 5c4551efa2c0..742ec1a88600 100755 --- a/java-shared-config/.kokoro/release/drop.sh +++ b/java-shared-config/.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/java-shared-config/.kokoro/release/promote.sh b/java-shared-config/.kokoro/release/promote.sh index 1fa95fa537a3..3cac3d8a97d7 100755 --- a/java-shared-config/.kokoro/release/promote.sh +++ b/java-shared-config/.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/java-shared-config/.kokoro/release/publish_javadoc.sh b/java-shared-config/.kokoro/release/publish_javadoc.sh index c9b3f5490d8f..a05ceb717470 100755 --- a/java-shared-config/.kokoro/release/publish_javadoc.sh +++ b/java-shared-config/.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/java-shared-config/.kokoro/release/publish_javadoc11.sh b/java-shared-config/.kokoro/release/publish_javadoc11.sh index 0a329f70affa..e12f72f55794 100755 --- a/java-shared-config/.kokoro/release/publish_javadoc11.sh +++ b/java-shared-config/.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/java-shared-config/.kokoro/release/stage.sh b/java-shared-config/.kokoro/release/stage.sh index 8a1033843cb1..77dc4e8f0f3a 100755 --- a/java-shared-config/.kokoro/release/stage.sh +++ b/java-shared-config/.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/java-shared-config/.kokoro/trampoline.sh b/java-shared-config/.kokoro/trampoline.sh index 9da0f8398773..8b69b793c9ec 100644 --- a/java-shared-config/.kokoro/trampoline.sh +++ b/java-shared-config/.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/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 855ef8adf870..8c24a9be852c 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "94648655063597210d58bc64f641daafc75cbe2f" + "sha": "6504eada4851f554d25a8fa3479904e8b44e738d" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9" + "sha": "396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e" } } ], @@ -23,7 +23,6 @@ ".github/PULL_REQUEST_TEMPLATE.md", ".github/blunderbuss.yml", ".github/generated-files-bot.yml", - ".github/readme/synth.py", ".github/release-trigger.yml", ".github/snippet-bot.yml", ".github/sync-repo-settings.yaml", @@ -37,7 +36,6 @@ ".kokoro/common.sh", ".kokoro/continuous/common.cfg", ".kokoro/continuous/java8.cfg", - ".kokoro/continuous/readme.cfg", ".kokoro/dependencies.sh", ".kokoro/nightly/common.cfg", ".kokoro/nightly/integration.cfg", From fa628f53301281284af9d2c0756b657be630668d Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 13 Sep 2021 15:57:12 -0700 Subject: [PATCH 244/794] fix: specify animal-sniffer-maven-plugin version (#308) --- java-shared-config/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 3dd1988e6a58..dfa91fb148f1 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -413,6 +413,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin + 1.20 java8 From 6f3deafd53cc967e53efe82e167a377e923686a0 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 13 Sep 2021 16:03:55 -0700 Subject: [PATCH 245/794] chore: release 1.0.2 (#311) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 13 +++++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 740166134050..8f1d57975977 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +### [1.0.2](https://www.github.com/googleapis/java-shared-config/compare/v1.0.1...v1.0.2) (2021-09-13) + + +### Bug Fixes + +* specify animal-sniffer-maven-plugin version ([#308](https://www.github.com/googleapis/java-shared-config/issues/308)) ([378bf43](https://www.github.com/googleapis/java-shared-config/commit/378bf431383306c1cdd0a4f922956c87edf321b5)) +* update java docfx doclet version ([#312](https://www.github.com/googleapis/java-shared-config/issues/312)) ([dd7f6e0](https://www.github.com/googleapis/java-shared-config/commit/dd7f6e0c1a7cc73831b74b4475457611a8c097d3)) + + +### Dependencies + +* update dependency com.puppycrawl.tools:checkstyle to v9 ([#303](https://www.github.com/googleapis/java-shared-config/issues/303)) ([71faea3](https://www.github.com/googleapis/java-shared-config/commit/71faea38d4132407598550e2bb4c77f9d4a4d83d)) + ### [1.0.1](https://www.github.com/googleapis/java-shared-config/compare/v1.0.0...v1.0.1) (2021-08-18) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 03abec17aabc..5866b881d942 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 1.0.1 + 1.0.2 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index dfa91fb148f1..50517c440ae9 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.0.2-SNAPSHOT + 1.0.2 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 926957453b1f..350e5a4d85a8 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.0.1:1.0.2-SNAPSHOT +google-cloud-shared-config:1.0.2:1.0.2 From 7a3e0cc0514214450a733243ce4662d2236a347a Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Tue, 21 Sep 2021 14:02:13 -0700 Subject: [PATCH 246/794] fix: update java-docfx-doclet version (#315) Fixes b/200689560 --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 50517c440ae9..19791f17eb99 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -699,7 +699,7 @@ com.microsoft.doclet.DocFxDoclet false - ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.2.0.jar + ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.2.1.jar -outputpath ${project.build.directory}/docfx-yml -projectname ${project.artifactId} none protected From 1f05ad822b6afc2526b8f0e6afefc4a449b01f8a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 21 Sep 2021 21:10:11 +0000 Subject: [PATCH 247/794] chore: release 1.0.3-SNAPSHOT (#313) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 19791f17eb99..9483db460d5e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.0.2 + 1.0.3-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 350e5a4d85a8..853cc4669174 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.0.2:1.0.2 +google-cloud-shared-config:1.0.2:1.0.3-SNAPSHOT From cee82e45e5433472158563c988ed2d33865133df Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 21 Sep 2021 21:16:30 +0000 Subject: [PATCH 248/794] chore: release 1.0.3 (#316) :robot: I have created a release \*beep\* \*boop\* --- ### [1.0.3](https://www.github.com/googleapis/java-shared-config/compare/v1.0.2...v1.0.3) (2021-09-21) ### Bug Fixes * update java-docfx-doclet version ([#315](https://www.github.com/googleapis/java-shared-config/issues/315)) ([7a3e0cc](https://www.github.com/googleapis/java-shared-config/commit/7a3e0cc0514214450a733243ce4662d2236a347a)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 8f1d57975977..4ff5a272cf86 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.0.3](https://www.github.com/googleapis/java-shared-config/compare/v1.0.2...v1.0.3) (2021-09-21) + + +### Bug Fixes + +* update java-docfx-doclet version ([#315](https://www.github.com/googleapis/java-shared-config/issues/315)) ([07af07c](https://www.github.com/googleapis/java-shared-config/commit/07af07c188447ea5728ecd2700121ff477d1c58a)) + ### [1.0.2](https://www.github.com/googleapis/java-shared-config/compare/v1.0.1...v1.0.2) (2021-09-13) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 5866b881d942..056fa1e8cf9c 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 1.0.2 + 1.0.3 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9483db460d5e..cbc1c9ab1810 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.0.3-SNAPSHOT + 1.0.3 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 853cc4669174..ab3c9db40d33 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.0.2:1.0.3-SNAPSHOT +google-cloud-shared-config:1.0.3:1.0.3 From 088c41cd8252ac1abba3e49328027e19c616606d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 09:03:54 -0700 Subject: [PATCH 249/794] chore: release 1.0.4-SNAPSHOT (#317) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index cbc1c9ab1810..4551485ba45b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.0.3 + 1.0.4-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index ab3c9db40d33..9ee52ee3d6b1 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.0.3:1.0.3 +google-cloud-shared-config:1.0.3:1.0.4-SNAPSHOT From ee887bf74e7546cc41b5f6ffd482dc600a989169 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 23 Sep 2021 10:00:12 -0700 Subject: [PATCH 250/794] chore: convert to owlbot (#320) --- java-shared-config/.github/.OwlBot.lock.yaml | 3 ++ .../{synth.py => .github/.OwlBot.yaml} | 18 ++--------- java-shared-config/owlbot.py | 32 +++++++++++++++++++ 3 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 java-shared-config/.github/.OwlBot.lock.yaml rename java-shared-config/{synth.py => .github/.OwlBot.yaml} (60%) create mode 100644 java-shared-config/owlbot.py diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml new file mode 100644 index 000000000000..ec24ba6822d9 --- /dev/null +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -0,0 +1,3 @@ +docker: + digest: sha256:db1616f2f70823d8381d859835229e04371d14f59ac78063c5af73c55c3fffbb + image: gcr.io/repo-automation-bots/owlbot-java:latest diff --git a/java-shared-config/synth.py b/java-shared-config/.github/.OwlBot.yaml similarity index 60% rename from java-shared-config/synth.py rename to java-shared-config/.github/.OwlBot.yaml index 88e27983c7bf..8c5f03b4de89 100644 --- a/java-shared-config/synth.py +++ b/java-shared-config/.github/.OwlBot.yaml @@ -1,4 +1,4 @@ -# Copyright 2019 Google LLC +# 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. @@ -12,17 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""This script is used to synthesize generated parts of this library.""" - -import synthtool.languages.java as java - -AUTOSYNTH_MULTIPLE_COMMITS = True - -java.common_templates(excludes=[ - "README.md", - ".github/release-please.yml", - '.github/workflows/auto-release.yaml', - '.github/workflows/samples.yaml', - "samples/*" -]) - +docker: + image: "gcr.io/repo-automation-bots/owlbot-java:latest" diff --git a/java-shared-config/owlbot.py b/java-shared-config/owlbot.py new file mode 100644 index 000000000000..095f961b2413 --- /dev/null +++ b/java-shared-config/owlbot.py @@ -0,0 +1,32 @@ +# 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. +# You may obtain a copy of the License at +# +# https://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. + +import synthtool as s +from synthtool.languages import java + + +for library in s.get_staging_dirs(): + # put any special-case replacements here + s.move(library) + +s.remove_staging_dirs() +java.common_templates( + excludes=[ + "README.md", + ".github/release-please.yml", + ".github/workflows/auto-release.yaml", + ".github/workflows/samples.yaml", + "samples/*", + ] +) From 42182e58a0655332290f7e79ed2a7a89ea7660b8 Mon Sep 17 00:00:00 2001 From: Daniel Zou Date: Thu, 7 Oct 2021 17:10:06 -0400 Subject: [PATCH 251/794] feat: introduce Maven configuration for GraalVM testing (#314) This PR introduces a Maven project profile for GraalVM native image testing. --- java-shared-config/pom.xml | 64 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 4551485ba45b..1bcc1bbd7f9d 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -778,5 +778,69 @@ + + + native + + + + com.google.cloud + native-image-support + 0.8.0 + test + + + + org.junit.vintage + junit-vintage-engine + 5.7.2 + test + + + + org.graalvm.buildtools + junit-platform-native + 0.9.5 + test + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + 2.22.2 + + + + + + + + org.graalvm.buildtools + native-maven-plugin + 0.9.5 + + + test-native + + test + + test + + + + + --no-fallback + --no-server + + + + + + + From b75e6d8971252157e0ac6a094be5496b6f3f9138 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 8 Oct 2021 22:56:13 -0400 Subject: [PATCH 252/794] chore(java): rename master branch to main (#1221) (#322) Source-Link: https://github.com/googleapis/synthtool/commit/67ab4f9f4272ad13f4b809de47fd0dec05f425ad Post-Processor: gcr.io/repo-automation-bots/owlbot-java:latest@sha256:5ba0bc6649b2d147f7dea0836e5b484afba15e10db96e0e5bf01d4edf095041e Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.github/blunderbuss.yml | 2 +- java-shared-config/.github/workflows/ci.yaml | 2 +- java-shared-config/renovate.json | 5 +---- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index ec24ba6822d9..6e758e72dad0 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - digest: sha256:db1616f2f70823d8381d859835229e04371d14f59ac78063c5af73c55c3fffbb image: gcr.io/repo-automation-bots/owlbot-java:latest + digest: sha256:5ba0bc6649b2d147f7dea0836e5b484afba15e10db96e0e5bf01d4edf095041e diff --git a/java-shared-config/.github/blunderbuss.yml b/java-shared-config/.github/blunderbuss.yml index 1a23ea42b141..2176b0543214 100644 --- a/java-shared-config/.github/blunderbuss.yml +++ b/java-shared-config/.github/blunderbuss.yml @@ -1,5 +1,5 @@ # Configuration for the Blunderbuss GitHub app. For more info see -# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss +# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss assign_prs_by: - labels: - samples diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index 3becb5c022a3..3932a70d4e14 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: ci jobs: diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index c46915be6794..a9ec0209afa5 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -70,8 +70,5 @@ } ], "semanticCommits": true, - "dependencyDashboard": true, - "dependencyDashboardLabels": [ - "type: process" - ] + "dependencyDashboard": true } From 0d04133182d2be0104c35fc1627edd2ab4f64a59 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 12 Oct 2021 22:47:44 +0200 Subject: [PATCH 253/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.6 (#331) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 1bcc1bbd7f9d..3a4f243bb014 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -821,7 +821,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.5 + 0.9.6 test-native From 066b9a986219f6fd1fa5ce5e1ab5ffe467fd26ba Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 12 Oct 2021 22:47:55 +0200 Subject: [PATCH 254/794] deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.6 (#330) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 3a4f243bb014..5ddf1a3a6aa6 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -800,7 +800,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.5 + 0.9.6 test From c1a26efe546c4a6f8a25a39dc88775ac8fa9cd56 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 12 Oct 2021 22:48:06 +0200 Subject: [PATCH 255/794] deps: update dependency org.junit.vintage:junit-vintage-engine to v5.8.1 (#329) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 5ddf1a3a6aa6..0e2c456c0d8f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -793,7 +793,7 @@ org.junit.vintage junit-vintage-engine - 5.7.2 + 5.8.1 test From eefc5e8851a16e357a1ac3f672dfa954cbcc5344 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 12 Oct 2021 16:48:40 -0400 Subject: [PATCH 256/794] chore: change branch master to main in github configurations (#325) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: change branch master to main in github configurations * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- java-shared-config/.github/sync-repo-settings.yaml | 6 +++--- java-shared-config/.github/workflows/downstream.yaml | 2 +- java-shared-config/README.md | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index 5ea1b2d5ea3a..c2d7ab054f3b 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -11,11 +11,11 @@ squashMergeAllowed: true # Defaults to `false` mergeCommitAllowed: false -# Rules for master branch protection +# Rules for main branch protection branchProtectionRules: # Identifies the protection rule pattern. Name of the branch to be protected. -# Defaults to `master` -- pattern: master +# Defaults to `main` +- pattern: main # Can admins overwrite branch protection. # Defaults to `true` isAdminEnforced: true diff --git a/java-shared-config/.github/workflows/downstream.yaml b/java-shared-config/.github/workflows/downstream.yaml index d0963125f51b..88de3ec21a33 100644 --- a/java-shared-config/.github/workflows/downstream.yaml +++ b/java-shared-config/.github/workflows/downstream.yaml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: downstream jobs: diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 056fa1e8cf9c..8ab65d0a214a 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -42,6 +42,6 @@ Apache 2.0 - See [LICENSE][license] for more information. [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-shared-config.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-shared-config&core=gav -[contributing]: https://github.com/googleapis/java-shared-config/blob/master/CONTRIBUTING.md -[code-of-conduct]: https://github.com/googleapis/java-shared-config/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[license]: https://github.com/googleapis/java-shared-config/blob/master/LICENSE \ No newline at end of file +[contributing]: https://github.com/googleapis/java-shared-config/blob/main/CONTRIBUTING.md +[code-of-conduct]: https://github.com/googleapis/java-shared-config/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct +[license]: https://github.com/googleapis/java-shared-config/blob/main/LICENSE \ No newline at end of file From f14de7b475291259837fd63f94fd006837389d40 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 12 Oct 2021 22:49:01 +0200 Subject: [PATCH 257/794] deps: update dependency com.puppycrawl.tools:checkstyle to v9.0.1 (#327) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 0e2c456c0d8f..5b99f03a31b5 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -632,7 +632,7 @@ com.puppycrawl.tools checkstyle - 9.0 + 9.0.1 From 79e09d329685da091b329e5a374c1109a752ccd7 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 12 Oct 2021 16:54:17 -0400 Subject: [PATCH 258/794] chore: change branch master to main in sync-repo-settings.yaml (#324) From 08a2405205e49e9c992c9c295d23ff7ae383c190 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 20:56:17 +0000 Subject: [PATCH 259/794] chore(java): remove dependencyDashboardLabel config from renovate.json (#1220) (#321) From 6eea9c794104a3162a5b3d574a0e0fe4e2bd165c Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Tue, 12 Oct 2021 15:40:45 -0700 Subject: [PATCH 260/794] fix: update doclet version (#332) bumps java-docfx-doclet version to incorporate new doclet [updates](https://github.com/googleapis/java-docfx-doclet/releases/tag/1.3.0) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 5b99f03a31b5..5ff0f4870e06 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -699,7 +699,7 @@ com.microsoft.doclet.DocFxDoclet false - ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.2.1.jar + ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.3.0.jar -outputpath ${project.build.directory}/docfx-yml -projectname ${project.artifactId} none protected From 8d2920e1b4b7f49deea56b42f31a21078661bc73 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 12 Oct 2021 16:18:51 -0700 Subject: [PATCH 261/794] chore: release 1.1.0 (#328) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 20 ++++++++++++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 4ff5a272cf86..4d7624ec6182 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## [1.1.0](https://www.github.com/googleapis/java-shared-config/compare/v1.0.3...v1.1.0) (2021-10-12) + + +### Features + +* introduce Maven configuration for GraalVM testing ([#314](https://www.github.com/googleapis/java-shared-config/issues/314)) ([28fbeb8](https://www.github.com/googleapis/java-shared-config/commit/28fbeb86c4466a58a05d6933584564dbf3352e79)) + + +### Bug Fixes + +* update doclet version ([#332](https://www.github.com/googleapis/java-shared-config/issues/332)) ([3fd0350](https://www.github.com/googleapis/java-shared-config/commit/3fd035030e4f0954dd1f62f7b8ea62583685880c)) + + +### Dependencies + +* update dependency com.puppycrawl.tools:checkstyle to v9.0.1 ([#327](https://www.github.com/googleapis/java-shared-config/issues/327)) ([b6c9b65](https://www.github.com/googleapis/java-shared-config/commit/b6c9b657550db2dee6b36edbb9a6084baee125e2)) +* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.6 ([#330](https://www.github.com/googleapis/java-shared-config/issues/330)) ([271ed7d](https://www.github.com/googleapis/java-shared-config/commit/271ed7dba35623e22fc8a7f7d477e6043e772014)) +* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.6 ([#331](https://www.github.com/googleapis/java-shared-config/issues/331)) ([4f9ba15](https://www.github.com/googleapis/java-shared-config/commit/4f9ba1551df0a2d4fc8c9acca8a951afbe8cb78a)) +* update dependency org.junit.vintage:junit-vintage-engine to v5.8.1 ([#329](https://www.github.com/googleapis/java-shared-config/issues/329)) ([4a8789e](https://www.github.com/googleapis/java-shared-config/commit/4a8789ee814ba8a3480beecc76c16fd1cb4e5f12)) + ### [1.0.3](https://www.github.com/googleapis/java-shared-config/compare/v1.0.2...v1.0.3) (2021-09-21) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 8ab65d0a214a..ce91bac1bf97 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 1.0.3 + 1.1.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 5ff0f4870e06..d632d10a1d4c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.0.4-SNAPSHOT + 1.1.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 9ee52ee3d6b1..d68b414fcd6f 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.0.3:1.0.4-SNAPSHOT +google-cloud-shared-config:1.1.0:1.1.0 From 452de93d4eb6803f6a2f30b9606c713a6bdf7350 Mon Sep 17 00:00:00 2001 From: Daniel Zou Date: Wed, 20 Oct 2021 17:29:01 -0400 Subject: [PATCH 262/794] fix(java): downgrade native maven plugin version (#335) Downgrades native maven plugin. See #336 for context. --- java-shared-config/pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d632d10a1d4c..c69118d996b5 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -800,7 +800,8 @@ org.graalvm.buildtools junit-platform-native - 0.9.6 + + 0.9.5 test @@ -821,7 +822,8 @@ org.graalvm.buildtools native-maven-plugin - 0.9.6 + + 0.9.5 test-native From f87342b76c4ec2b78d4929974448ce693ebf3268 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 16:06:23 -0400 Subject: [PATCH 263/794] feat: Introduce Native Image testing build script changes (#1240) (#334) Adds additional switch case to build.sh to accommodate native image testing. Source-Link: https://github.com/googleapis/synthtool/commit/d45942be8066ad57bd0509f4a16e1fac78ecc50f Post-Processor: gcr.io/repo-automation-bots/owlbot-java:latest@sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.github/workflows/ci.yaml | 19 +++++++---- java-shared-config/.kokoro/build.sh | 5 +++ java-shared-config/.kokoro/dependencies.sh | 23 ++++++++++++- .../.kokoro/presubmit/graalvm-native.cfg | 33 +++++++++++++++++++ 5 files changed, 73 insertions(+), 9 deletions(-) create mode 100644 java-shared-config/.kokoro/presubmit/graalvm-native.cfg diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 6e758e72dad0..a600ac2299e1 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:5ba0bc6649b2d147f7dea0836e5b484afba15e10db96e0e5bf01d4edf095041e + digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index 3932a70d4e14..2425d7234f42 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -9,14 +9,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11] + java: [8, 11, 17] steps: - uses: actions/checkout@v2 - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: ${{matrix.java}} - run: java -version - run: .kokoro/build.sh @@ -29,8 +30,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.bat @@ -40,14 +42,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11] + java: [8, 11, 17] steps: - uses: actions/checkout@v2 - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh @@ -58,8 +61,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.sh @@ -72,8 +76,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.sh diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index 63c21c03095c..53218e143fb3 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -69,6 +69,11 @@ integration) verify RETURN_CODE=$? ;; +graalvm) + # Run Unit and Integration Tests with Native Image + mvn test -Pnative -Penable-integration-tests + RETURN_CODE=$? + ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/java-shared-config/.kokoro/dependencies.sh b/java-shared-config/.kokoro/dependencies.sh index 9030ba8f99ff..9a5105d7ebf4 100755 --- a/java-shared-config/.kokoro/dependencies.sh +++ b/java-shared-config/.kokoro/dependencies.sh @@ -28,7 +28,28 @@ source ${scriptDir}/common.sh java -version echo $JOB_TYPE -export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" +function determineMavenOpts() { + local javaVersion=$( + # filter down to the version line, then pull out the version between quotes, + # then trim the version number down to its minimal number (removing any + # update or suffix number). + java -version 2>&1 | grep "version" \ + | sed -E 's/^.*"(.*?)".*$/\1/g' \ + | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' + ) + + case $javaVersion in + "17") + # MaxPermSize is no longer supported as of jdk 17 + echo -n "-Xmx1024m" + ;; + *) + echo -n "-Xmx1024m -XX:MaxPermSize=128m" + ;; + esac +} + +export MAVEN_OPTS=$(determineMavenOpts) # this should run maven enforcer retry_with_backoff 3 10 \ diff --git a/java-shared-config/.kokoro/presubmit/graalvm-native.cfg b/java-shared-config/.kokoro/presubmit/graalvm-native.cfg new file mode 100644 index 000000000000..4c7225ec924e --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/graalvm-native.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm" +} + +# 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: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} From 7c8022e3e61e6cda2a7596f9b3c5a57f468bf963 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 16:09:33 -0400 Subject: [PATCH 264/794] chore: release 1.1.1-SNAPSHOT (#333) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index c69118d996b5..ad0016087de4 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.1.0 + 1.1.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index d68b414fcd6f..e9b09045f950 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.1.0:1.1.0 +google-cloud-shared-config:1.1.0:1.1.1-SNAPSHOT From 29b517436a0c65178e5f357076ef351745adf29e Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Thu, 21 Oct 2021 16:43:14 -0400 Subject: [PATCH 265/794] chore: update owlbot project (#339) --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.github/.OwlBot.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index a600ac2299e1..dc53bbb57be5 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - image: gcr.io/repo-automation-bots/owlbot-java:latest + image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 diff --git a/java-shared-config/.github/.OwlBot.yaml b/java-shared-config/.github/.OwlBot.yaml index 8c5f03b4de89..5d9a9d8b5607 100644 --- a/java-shared-config/.github/.OwlBot.yaml +++ b/java-shared-config/.github/.OwlBot.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: - image: "gcr.io/repo-automation-bots/owlbot-java:latest" + image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest" From eb388c0505d175fe67f481e01d7ed1de05838606 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 20:48:22 +0000 Subject: [PATCH 266/794] chore: release 1.2.0 (#338) :robot: I have created a release \*beep\* \*boop\* --- ## [1.2.0](https://www.github.com/googleapis/java-shared-config/compare/v1.1.0...v1.2.0) (2021-10-21) ### Features * Introduce Native Image testing build script changes ([#1240](https://www.github.com/googleapis/java-shared-config/issues/1240)) ([#334](https://www.github.com/googleapis/java-shared-config/issues/334)) ([f87342b](https://www.github.com/googleapis/java-shared-config/commit/f87342b76c4ec2b78d4929974448ce693ebf3268)) ### Bug Fixes * **java:** downgrade native maven plugin version ([#335](https://www.github.com/googleapis/java-shared-config/issues/335)) ([452de93](https://www.github.com/googleapis/java-shared-config/commit/452de93d4eb6803f6a2f30b9606c713a6bdf7350)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 12 ++++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 4d7624ec6182..4406db569230 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.2.0](https://www.github.com/googleapis/java-shared-config/compare/v1.1.0...v1.2.0) (2021-10-21) + + +### Features + +* Introduce Native Image testing build script changes ([#1240](https://www.github.com/googleapis/java-shared-config/issues/1240)) ([#334](https://www.github.com/googleapis/java-shared-config/issues/334)) ([4643cf1](https://www.github.com/googleapis/java-shared-config/commit/4643cf15be0b37fa8fa905d544d438cda7ef2ecd)) + + +### Bug Fixes + +* **java:** downgrade native maven plugin version ([#335](https://www.github.com/googleapis/java-shared-config/issues/335)) ([5834284](https://www.github.com/googleapis/java-shared-config/commit/5834284176fb34713d10082ce04f3b6abba85ad8)) + ## [1.1.0](https://www.github.com/googleapis/java-shared-config/compare/v1.0.3...v1.1.0) (2021-10-12) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index ce91bac1bf97..9832a22a1e3d 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 1.1.0 + 1.2.0 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ad0016087de4..f77b1057496f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.1.1-SNAPSHOT + 1.2.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index e9b09045f950..247e7385ebcb 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.1.0:1.1.1-SNAPSHOT +google-cloud-shared-config:1.2.0:1.2.0 From 5d3c708bd01411a9590e483df48ef533c1c888a3 Mon Sep 17 00:00:00 2001 From: Daniel Zou Date: Fri, 5 Nov 2021 10:12:23 -0400 Subject: [PATCH 267/794] fix: Add native image feature to register protobuf reflection in tests (#347) --- java-shared-config/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index f77b1057496f..cb7d540bd0ae 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -837,6 +837,7 @@ --no-fallback --no-server + --features=com.google.cloud.nativeimage.features.ProtobufMessageFeature From 59702a5f215851608ef66afdea0f6d6ddf9efb1b Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 8 Nov 2021 21:29:27 +0100 Subject: [PATCH 268/794] deps: update dependency com.google.cloud:native-image-support to v0.9.0 (#350) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index cb7d540bd0ae..8725a3e0f176 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -786,7 +786,7 @@ com.google.cloud native-image-support - 0.8.0 + 0.9.0 test From af2c76aa9386a9b93fa29ec8228f5ccb5023c08a Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 15:33:02 -0500 Subject: [PATCH 269/794] Update ci.yaml (#1275) (#349) Let's let all the unit tests complete for now. Java 17 isn't quite ready. Source-Link: https://github.com/googleapis/synthtool/commit/717a6a1fe247df095092de1321eadc9da887a06c Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:fecf6bd85f19eb046d913982ea36f6d434f9a49ab0545d25e31186aa64367c0c Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.github/workflows/ci.yaml | 16 +--------------- java-shared-config/.kokoro/dependencies.sh | 10 ++++------ 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index dc53bbb57be5..994dd04bfe64 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 + digest: sha256:fecf6bd85f19eb046d913982ea36f6d434f9a49ab0545d25e31186aa64367c0c diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index 2425d7234f42..93b337c62839 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -8,13 +8,11 @@ jobs: units: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: java: [8, 11, 17] steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -27,9 +25,6 @@ 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@v2 with: distribution: zulu @@ -45,9 +40,6 @@ jobs: java: [8, 11, 17] steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -58,9 +50,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -73,9 +62,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu diff --git a/java-shared-config/.kokoro/dependencies.sh b/java-shared-config/.kokoro/dependencies.sh index 9a5105d7ebf4..d7476cfe9727 100755 --- a/java-shared-config/.kokoro/dependencies.sh +++ b/java-shared-config/.kokoro/dependencies.sh @@ -38,15 +38,13 @@ function determineMavenOpts() { | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' ) - case $javaVersion in - "17") + if [[ $javaVersion == 17* ]] + then # MaxPermSize is no longer supported as of jdk 17 echo -n "-Xmx1024m" - ;; - *) + else echo -n "-Xmx1024m -XX:MaxPermSize=128m" - ;; - esac + fi } export MAVEN_OPTS=$(determineMavenOpts) From 0336c5433233feec6498531ee1a4140558a00d56 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 20:38:12 +0000 Subject: [PATCH 270/794] chore: release 1.2.1-SNAPSHOT (#340) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 8725a3e0f176..e62bb81b9de4 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.0 + 1.2.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 247e7385ebcb..7e63c4d71750 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.0:1.2.0 +google-cloud-shared-config:1.2.0:1.2.1-SNAPSHOT From c545e0b6f0467f32ec97b1341a7bc07d779415aa Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 8 Nov 2021 21:39:27 +0100 Subject: [PATCH 271/794] deps: update dependency com.google.auto.service:auto-service-annotations to v1.0.1 (#346) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e62bb81b9de4..6b427d727162 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -769,7 +769,7 @@ com.google.auto.service auto-service-annotations - 1.0 + 1.0.1 From ebb3ab324a9f6be3e7ed885f2a0c45c6d9f51eee Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 8 Nov 2021 21:45:10 +0100 Subject: [PATCH 272/794] deps: update dependency com.puppycrawl.tools:checkstyle to v9.1 (#345) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 6b427d727162..221d076cca5e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -632,7 +632,7 @@ com.puppycrawl.tools checkstyle - 9.0.1 + 9.1 From 3eda436731654a1c628308604a2c8e7be97f2511 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Mon, 8 Nov 2021 13:23:54 -0800 Subject: [PATCH 273/794] chore: cleanup cloud RAD generation (#344) - moving from to - faster since we don't need the reports, but will now need to use command `mvn javadoc:aggregate -P docFX` instead of `mvn site -P docFX` to generate yaml - setting up config as properties - will default to values in section or can pass custom config via command with `-Dproperty=value` - removing and sections which aren't doing anything while using custom doclet --- java-shared-config/pom.xml | 62 ++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 36 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 221d076cca5e..9137e5ba7f44 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -673,62 +673,52 @@ + docFX - + docFX - + + + java-docfx-doclet-1.3.0 + ${project.build.directory}/docfx-yml + ${project.artifactId} + + + 8 + + + org.apache.maven.plugins maven-javadoc-plugin 3.3.1 - - - docFX - - javadoc - aggregate - aggregate-jar - - - com.microsoft.doclet.DocFxDoclet false - ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.3.0.jar - -outputpath ${project.build.directory}/docfx-yml -projectname ${project.artifactId} + + ${env.KOKORO_GFILE_DIR}/${docletName}.jar + + -outputpath ${outputpath} + -projectname ${projectname} + -excludeclasses ${excludeclasses}: + -excludepackages ${excludePackages}: + none protected true - - - Test helpers packages - com.google.cloud.testing - - - SPI packages - com.google.cloud.spi* - - - - https://googleapis.dev/java/api-common/latest/ - https://googleapis.dev/java/gax/latest/ - https://googleapis.dev/java/google-auth-library/latest/ - https://developers.google.com/protocol-buffers/docs/reference/java/ - https://googleapis.github.io/common-protos-java/apidocs/ - https://googleapis.github.io/api-common-java/apidocs/ - https://grpc.io/grpc-java/javadoc/ - https://docs.oracle.com/javase/8/docs/api/ - + ${source} + + ${sourceFileExclude} + - - + From 3c7d49904d9951c72169b405e95d8f3b7e270e3c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 13:24:19 -0800 Subject: [PATCH 274/794] chore: release 1.2.1 (#351) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 14 ++++++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 4406db569230..9333f71d6e77 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +### [1.2.1](https://www.github.com/googleapis/java-shared-config/compare/v1.2.0...v1.2.1) (2021-11-08) + + +### Bug Fixes + +* Add native image feature to register protobuf reflection in tests ([#347](https://www.github.com/googleapis/java-shared-config/issues/347)) ([88c3e3b](https://www.github.com/googleapis/java-shared-config/commit/88c3e3b0ad1e480e0fdbe9f6fe1f9df183066ee6)) + + +### Dependencies + +* update dependency com.google.auto.service:auto-service-annotations to v1.0.1 ([#346](https://www.github.com/googleapis/java-shared-config/issues/346)) ([9c1f943](https://www.github.com/googleapis/java-shared-config/commit/9c1f94345fb47346fe66f901976c2347b8102bc8)) +* update dependency com.google.cloud:native-image-support to v0.9.0 ([#350](https://www.github.com/googleapis/java-shared-config/issues/350)) ([3b496b0](https://www.github.com/googleapis/java-shared-config/commit/3b496b03bd95e59fcd1a3a1eb6cc0dfd330db769)) +* update dependency com.puppycrawl.tools:checkstyle to v9.1 ([#345](https://www.github.com/googleapis/java-shared-config/issues/345)) ([f5c03d3](https://www.github.com/googleapis/java-shared-config/commit/f5c03d35684ef4e0bb3178ab6056f231f3f4faf6)) + ## [1.2.0](https://www.github.com/googleapis/java-shared-config/compare/v1.1.0...v1.2.0) (2021-10-21) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 9832a22a1e3d..a5a200a58a1c 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 1.2.0 + 1.2.1 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9137e5ba7f44..b475c7be51e2 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.1-SNAPSHOT + 1.2.1 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 7e63c4d71750..ed79f3309628 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.0:1.2.1-SNAPSHOT +google-cloud-shared-config:1.2.1:1.2.1 From 4a00a1a1f3216755c4cb10e3ab8f16de8959554d Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 14:06:13 -0800 Subject: [PATCH 275/794] chore: cleanup cloud RAD generation (#1269) (#353) Updating cloud rad generation to support [java-shared-config/pull/344](https://github.com/googleapis/java-shared-config/pull/344) updates and removing inclusion of README as we're not currently supporting this feature yet Source-Link: https://github.com/googleapis/synthtool/commit/99ea92a109dbcd4e2b8c179e337848ba6a25fe16 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- .../.kokoro/release/publish_javadoc11.sh | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 994dd04bfe64..325daaa4b5a2 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:fecf6bd85f19eb046d913982ea36f6d434f9a49ab0545d25e31186aa64367c0c + digest: sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa diff --git a/java-shared-config/.kokoro/release/publish_javadoc11.sh b/java-shared-config/.kokoro/release/publish_javadoc11.sh index e12f72f55794..5166678dad8f 100755 --- a/java-shared-config/.kokoro/release/publish_javadoc11.sh +++ b/java-shared-config/.kokoro/release/publish_javadoc11.sh @@ -36,13 +36,9 @@ mvn clean install -B -q -DskipTests=true export NAME=google-cloud-shared-config export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) -# V3 generates docfx yml from javadoc -# generate yml -mvn clean site -B -q -P docFX - -# copy README to docfx-yml dir and rename index.md -cp README.md target/docfx-yml/index.md -# copy CHANGELOG to docfx-yml dir and rename history.md +# cloud RAD generation +mvn clean javadoc:aggregate -B -q -P docFX +# include CHANGELOG cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml From 3d9609e3975c488a28d76971d150c654c1f85d2b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 9 Nov 2021 15:12:17 +0000 Subject: [PATCH 276/794] chore: release 1.2.2-SNAPSHOT (#352) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b475c7be51e2..88e02342323a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.1 + 1.2.2-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index ed79f3309628..37ff238bc2b7 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.1:1.2.1 +google-cloud-shared-config:1.2.1:1.2.2-SNAPSHOT From e5e240f00eea6851d78bc3317704f20a641534c4 Mon Sep 17 00:00:00 2001 From: Daniel Zou Date: Tue, 16 Nov 2021 13:56:49 -0500 Subject: [PATCH 277/794] chore: update dependency com.google.cloud:native-image-support (#357) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 88e02342323a..df7ba35118cd 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -776,7 +776,7 @@ com.google.cloud native-image-support - 0.9.0 + 0.10.0 test From a862911a2cfc5a1c975f435f62930d11b3ce6b2e Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 09:17:24 -1000 Subject: [PATCH 278/794] chore: update jre to 11 for linter (#1278) (#354) java-format requires JRE v11+ to run linter. It still check older code, just jre has to be 11+: https://github.com/google/google-java-format/issues/529 Updating ci.yaml template since it is applicable for all the libraries. Source-Link: https://github.com/googleapis/synthtool/commit/42a3786737c17ece39924d7025f3be481812da53 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:14ecf64ec36f67c7bf04e3dc0f68eafcc01df3955121c38862b695e2ae7515d8 Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.github/workflows/ci.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 325daaa4b5a2..886d09496d14 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa + digest: sha256:14ecf64ec36f67c7bf04e3dc0f68eafcc01df3955121c38862b695e2ae7515d8 diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index 93b337c62839..05de1f60dcf0 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -53,7 +53,7 @@ jobs: - uses: actions/setup-java@v2 with: distribution: zulu - java-version: 8 + java-version: 11 - run: java -version - run: .kokoro/build.sh env: From ef99e60add96f8adf493672fc44dafbe66e49eae Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 16 Nov 2021 15:12:27 -0500 Subject: [PATCH 279/794] fix: update dependency com.google.cloud:native-image-support to v0.10.0 (#358) From 25bc8c98f2641971c8188e03cc84c906a0190319 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 20:40:20 +0000 Subject: [PATCH 280/794] chore: release 1.2.2 (#359) :robot: I have created a release \*beep\* \*boop\* --- ### [1.2.2](https://www.github.com/googleapis/java-shared-config/compare/v1.2.1...v1.2.2) (2021-11-16) ### Bug Fixes * update dependency com.google.cloud:native-image-support to v0.10.0 ([#358](https://www.github.com/googleapis/java-shared-config/issues/358)) ([ef99e60](https://www.github.com/googleapis/java-shared-config/commit/ef99e60add96f8adf493672fc44dafbe66e49eae)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 9333f71d6e77..14207c56f953 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.2.2](https://www.github.com/googleapis/java-shared-config/compare/v1.2.1...v1.2.2) (2021-11-16) + + +### Bug Fixes + +* update dependency com.google.cloud:native-image-support to v0.10.0 ([#358](https://www.github.com/googleapis/java-shared-config/issues/358)) ([0441958](https://www.github.com/googleapis/java-shared-config/commit/044195865a1122d419cadae90fddbf8dc5b4a32d)) + ### [1.2.1](https://www.github.com/googleapis/java-shared-config/compare/v1.2.0...v1.2.1) (2021-11-08) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index a5a200a58a1c..9515f0aaf387 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index df7ba35118cd..80e195b517a7 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.2-SNAPSHOT + 1.2.2 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 37ff238bc2b7..99b7d008a114 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.1:1.2.2-SNAPSHOT +google-cloud-shared-config:1.2.2:1.2.2 From 72926fbe2bcb201b76891dc77357e1b2badaddf1 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 16 Nov 2021 22:30:25 +0000 Subject: [PATCH 281/794] chore: release 1.2.3-SNAPSHOT (#360) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 80e195b517a7..b1a2e614f792 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.2 + 1.2.3-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 99b7d008a114..5abc33d2ff9a 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.2:1.2.2 +google-cloud-shared-config:1.2.2:1.2.3-SNAPSHOT From 66af719a0824e791cb10125e42e825e24ce1952c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 23 Nov 2021 20:23:09 +0100 Subject: [PATCH 282/794] deps: update dependency com.google.googlejavaformat:google-java-format to v1.13.0 (#361) * deps: update dependency com.google.googlejavaformat:google-java-format to v1.13.0 * deps: update dependency com.coveo:fmt-maven-plugin to v2.12 Co-authored-by: BenWhitehead --- java-shared-config/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b1a2e614f792..e2a5679e7621 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -216,7 +216,7 @@ com.coveo fmt-maven-plugin - 2.9 + 2.12 true @@ -225,7 +225,7 @@ com.google.googlejavaformat google-java-format - 1.7 + 1.13.0 From 9cc190a22d70c84467f470055a534f7e3ade09a0 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 2 Dec 2021 22:31:06 +0100 Subject: [PATCH 283/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.8 (#372) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e2a5679e7621..c65259cf1291 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -813,7 +813,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.5 + 0.9.8 test-native From 452ef053f9742f407f76b261f9a109e301a49c0d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 2 Dec 2021 22:31:35 +0100 Subject: [PATCH 284/794] deps: update dependency com.puppycrawl.tools:checkstyle to v9.2 (#366) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index c65259cf1291..449723ec9087 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -632,7 +632,7 @@ com.puppycrawl.tools checkstyle - 9.1 + 9.2 From 67a84c58a2af5c2aea095eb70c4f907fc4873714 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 2 Dec 2021 22:31:53 +0100 Subject: [PATCH 285/794] deps: update dependency org.junit.vintage:junit-vintage-engine to v5.8.2 (#365) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 449723ec9087..d3f634eb0304 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -783,7 +783,7 @@ org.junit.vintage junit-vintage-engine - 5.8.1 + 5.8.2 test From 472693852e91e1a0e57778ea220ac7c5f3eed779 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 2 Dec 2021 22:32:05 +0100 Subject: [PATCH 286/794] build(deps): update dependency com.coveo:fmt-maven-plugin to v2.13 (#364) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d3f634eb0304..0852eb319980 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -216,7 +216,7 @@ com.coveo fmt-maven-plugin - 2.12 + 2.13 true From 90c7e2e021b3ead987cc5e43240a73b68821177a Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 2 Dec 2021 13:32:27 -0800 Subject: [PATCH 287/794] chore: fix regex in formatter to match string (#1296) (#374) Source-Link: https://github.com/googleapis/synthtool/commit/a14177060a552462b9642baad132bd17f47ecd6f Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:0ab8611cd29e7aba8413c6f83ed1734b60fddf845b4a37808b742302d32dd043 Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.kokoro/build.sh | 1 - java-shared-config/CONTRIBUTING.md | 61 +++----------------- 3 files changed, 8 insertions(+), 56 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 886d09496d14..fd19c5541fa5 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:14ecf64ec36f67c7bf04e3dc0f68eafcc01df3955121c38862b695e2ae7515d8 + digest: sha256:0ab8611cd29e7aba8413c6f83ed1734b60fddf845b4a37808b742302d32dd043 diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index 53218e143fb3..b28bce55987d 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -91,7 +91,6 @@ samples) pushd ${SAMPLES_DIR} mvn -B \ - -Penable-samples \ -ntp \ -DtrimStackTrace=false \ -Dclirr.skip=true \ diff --git a/java-shared-config/CONTRIBUTING.md b/java-shared-config/CONTRIBUTING.md index f2dbdee06bc3..b65dd279c946 100644 --- a/java-shared-config/CONTRIBUTING.md +++ b/java-shared-config/CONTRIBUTING.md @@ -53,12 +53,12 @@ mvn -Penable-integration-tests clean verify ## Code Samples -Code Samples must be bundled in separate Maven modules, and guarded by a -Maven profile with the name `enable-samples`. +All code samples must be in compliance with the [java sample formatting guide][3]. +Code Samples must be bundled in separate Maven modules. The samples must be separate from the primary project for a few reasons: -1. Primary projects have a minimum Java version of Java 7 whereas samples have - a minimum Java version of Java 8. Due to this we need the ability to +1. Primary projects have a minimum Java version of Java 8 whereas samples can have + Java version of Java 11. Due to this we need the ability to selectively exclude samples from a build run. 2. Many code samples depend on external GCP services and need credentials to access the service. @@ -68,39 +68,16 @@ The samples must be separate from the primary project for a few reasons: ### Building ```bash -mvn -Penable-samples clean verify +mvn clean verify ``` Some samples require access to GCP services and require a service account: ```bash export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json -mvn -Penable-samples clean verify +mvn clean verify ``` -### Profile Config - -1. To add samples in a profile to your Maven project, add the following to your -`pom.xml` - - ```xml - - [...] - - - enable-samples - - sample - - - - [...] - - ``` - -2. [Activate](#profile-activation) the profile. -3. Define your samples in a normal Maven project in the `samples/` directory. - ### Code Formatting Code in this repo is formatted with @@ -110,30 +87,6 @@ To run formatting on your project, you can run: mvn com.coveo:fmt-maven-plugin:format ``` -### Profile Activation - -To include code samples when building and testing the project, enable the -`enable-samples` Maven profile. - -#### Command line - -To activate the Maven profile on the command line add `-Penable-samples` to your -Maven command. - -#### Maven `settings.xml` - -To activate the Maven profile in your `~/.m2/settings.xml` add an entry of -`enable-samples` following the instructions in [Active Profiles][2]. - -This method has the benefit of applying to all projects you build (and is -respected by IntelliJ IDEA) and is recommended if you are going to be -contributing samples to several projects. - -#### IntelliJ IDEA - -To activate the Maven Profile inside IntelliJ IDEA, follow the instructions in -[Activate Maven profiles][3] to activate `enable-samples`. - [1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account [2]: https://maven.apache.org/settings.html#Active_Profiles -[3]: https://www.jetbrains.com/help/idea/work-with-maven-profiles.html#activate_maven_profiles +[3]: https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md \ No newline at end of file From 4183c99c74c7332797de6dc005a54b74b1a4757b Mon Sep 17 00:00:00 2001 From: Daniel Zou Date: Mon, 6 Dec 2021 12:59:13 -0500 Subject: [PATCH 288/794] fix(java): Only enable integration tests for native image testing (#375) * fix(java): Only enable integration tests for native image testing --- java-shared-config/pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 0852eb319980..5f562a1c2757 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -790,8 +790,7 @@ org.graalvm.buildtools junit-platform-native - - 0.9.5 + 0.9.8 test @@ -806,14 +805,17 @@ + + **/IT*.java + org.graalvm.buildtools native-maven-plugin - 0.9.8 + true test-native @@ -827,7 +829,6 @@ --no-fallback --no-server - --features=com.google.cloud.nativeimage.features.ProtobufMessageFeature From 1f0afbe91e3332eeb3ed58063cd3839cf905803d Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 12:59:56 -0500 Subject: [PATCH 289/794] fix(java): add -ntp flag to native image testing command (#1299) (#376) Source-Link: https://github.com/googleapis/synthtool/commit/723f3ce6c8927683e96cd7a4a02b59606a14eafc Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:a4d7b2cfc6a9d6b378a6b2458740eae15fcab28854bd23dad3a15102d2e47c87 Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.kokoro/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index fd19c5541fa5..3d2f8282468e 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:0ab8611cd29e7aba8413c6f83ed1734b60fddf845b4a37808b742302d32dd043 + digest: sha256:a4d7b2cfc6a9d6b378a6b2458740eae15fcab28854bd23dad3a15102d2e47c87 diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index b28bce55987d..d9031127fbf5 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -71,7 +71,7 @@ integration) ;; graalvm) # Run Unit and Integration Tests with Native Image - mvn test -Pnative -Penable-integration-tests + mvn -ntp -Pnative -Penable-integration-tests test RETURN_CODE=$? ;; samples) From 0f7bb5e65a9005bbed1d6055e8dda7229d83bcc6 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Tue, 7 Dec 2021 11:36:59 -0800 Subject: [PATCH 290/794] chore: update doclet version (#368) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 5f562a1c2757..f3f8c631ae3b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -683,7 +683,7 @@ - java-docfx-doclet-1.3.0 + java-docfx-doclet-1.4.0 ${project.build.directory}/docfx-yml ${project.artifactId} From a935ed7a1f62404e9f7685bf33d023bcc6a49608 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 4 Jan 2022 21:44:05 +0100 Subject: [PATCH 291/794] deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.9 (#379) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index f3f8c631ae3b..358a9ca4ecda 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -790,7 +790,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.8 + 0.9.9 test From 6a32394118ec2c4f4758a080ee3a98a4b1f91017 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 4 Jan 2022 21:44:23 +0100 Subject: [PATCH 292/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.9 (#380) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 358a9ca4ecda..a75be4c03b65 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -814,7 +814,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.8 + 0.9.9 true From ba918e2dd2ff499e6d05a8ea82a6c6a0750241eb Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 4 Jan 2022 21:45:09 +0100 Subject: [PATCH 293/794] deps: update auto-value-annotation.version to v1.9 (#378) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index a75be4c03b65..5958f0a80dea 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -63,7 +63,7 @@ ${project.artifactId} false true - 1.8.2 + 1.9 /java/docs/reference/ From 66867a2ec5ba4caa86680a6aa17b3d8370c9ffba Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 4 Jan 2022 15:45:59 -0500 Subject: [PATCH 294/794] fix(java): Pass missing integration test flags to native image test commands (#1309) (#383) Source-Link: https://github.com/googleapis/synthtool/commit/21f4a8daa6419908a002eeaf5e42525cb8d16d1d Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:b5ce87328633e27aa3e65d42e84cc722519859349760cdad48c7b5051b519a7d Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.kokoro/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 3d2f8282468e..2b0252c5b268 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:a4d7b2cfc6a9d6b378a6b2458740eae15fcab28854bd23dad3a15102d2e47c87 + digest: sha256:b5ce87328633e27aa3e65d42e84cc722519859349760cdad48c7b5051b519a7d diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index d9031127fbf5..ee4d56655606 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -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) From 7051143bf6cfe5ad4061f9faaa126ac3ec9cec3e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 4 Jan 2022 21:52:36 +0100 Subject: [PATCH 295/794] build(deps): update dependency org.apache.maven.plugins:maven-site-plugin to v3.10.0 (#381) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 5958f0a80dea..8e74f9c326df 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -182,7 +182,7 @@ org.apache.maven.plugins maven-site-plugin - 3.9.1 + 3.10.0 true From df2820747d3c31ba67a2ba6b490541e4d285e358 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 4 Jan 2022 21:53:01 +0100 Subject: [PATCH 296/794] deps: update dependency com.puppycrawl.tools:checkstyle to v9.2.1 (#382) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 8e74f9c326df..55dbb99663b7 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -632,7 +632,7 @@ com.puppycrawl.tools checkstyle - 9.2 + 9.2.1 From 669686e5d99c8289fa7dfa0e1c5a6fb0e914dc11 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 5 Jan 2022 16:50:12 +0000 Subject: [PATCH 297/794] chore: release 1.2.3 (#363) :robot: I have created a release \*beep\* \*boop\* --- ### [1.2.3](https://www.github.com/googleapis/java-shared-config/compare/v1.2.2...v1.2.3) (2022-01-04) ### Bug Fixes * **java:** add -ntp flag to native image testing command ([#1299](https://www.github.com/googleapis/java-shared-config/issues/1299)) ([#376](https://www.github.com/googleapis/java-shared-config/issues/376)) ([1f0afbe](https://www.github.com/googleapis/java-shared-config/commit/1f0afbe91e3332eeb3ed58063cd3839cf905803d)) * **java:** Only enable integration tests for native image testing ([#375](https://www.github.com/googleapis/java-shared-config/issues/375)) ([4183c99](https://www.github.com/googleapis/java-shared-config/commit/4183c99c74c7332797de6dc005a54b74b1a4757b)) * **java:** Pass missing integration test flags to native image test commands ([#1309](https://www.github.com/googleapis/java-shared-config/issues/1309)) ([#383](https://www.github.com/googleapis/java-shared-config/issues/383)) ([66867a2](https://www.github.com/googleapis/java-shared-config/commit/66867a2ec5ba4caa86680a6aa17b3d8370c9ffba)) ### Dependencies * update auto-value-annotation.version to v1.9 ([#378](https://www.github.com/googleapis/java-shared-config/issues/378)) ([ba918e2](https://www.github.com/googleapis/java-shared-config/commit/ba918e2dd2ff499e6d05a8ea82a6c6a0750241eb)) * update dependency com.google.googlejavaformat:google-java-format to v1.13.0 ([#361](https://www.github.com/googleapis/java-shared-config/issues/361)) ([66af719](https://www.github.com/googleapis/java-shared-config/commit/66af719a0824e791cb10125e42e825e24ce1952c)) * update dependency com.puppycrawl.tools:checkstyle to v9.2 ([#366](https://www.github.com/googleapis/java-shared-config/issues/366)) ([452ef05](https://www.github.com/googleapis/java-shared-config/commit/452ef053f9742f407f76b261f9a109e301a49c0d)) * update dependency com.puppycrawl.tools:checkstyle to v9.2.1 ([#382](https://www.github.com/googleapis/java-shared-config/issues/382)) ([df28207](https://www.github.com/googleapis/java-shared-config/commit/df2820747d3c31ba67a2ba6b490541e4d285e358)) * update dependency org.graalvm.buildtools:junit-platform-native to v0.9.9 ([#379](https://www.github.com/googleapis/java-shared-config/issues/379)) ([a935ed7](https://www.github.com/googleapis/java-shared-config/commit/a935ed7a1f62404e9f7685bf33d023bcc6a49608)) * update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.8 ([#372](https://www.github.com/googleapis/java-shared-config/issues/372)) ([9cc190a](https://www.github.com/googleapis/java-shared-config/commit/9cc190a22d70c84467f470055a534f7e3ade09a0)) * update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.9 ([#380](https://www.github.com/googleapis/java-shared-config/issues/380)) ([6a32394](https://www.github.com/googleapis/java-shared-config/commit/6a32394118ec2c4f4758a080ee3a98a4b1f91017)) * update dependency org.junit.vintage:junit-vintage-engine to v5.8.2 ([#365](https://www.github.com/googleapis/java-shared-config/issues/365)) ([67a84c5](https://www.github.com/googleapis/java-shared-config/commit/67a84c58a2af5c2aea095eb70c4f907fc4873714)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 21 +++++++++++++++++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 14207c56f953..b4db9bf04bf2 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,26 @@ # Changelog +### [1.2.3](https://www.github.com/googleapis/java-shared-config/compare/v1.2.2...v1.2.3) (2022-01-04) + + +### Bug Fixes + +* **java:** add -ntp flag to native image testing command ([#1299](https://www.github.com/googleapis/java-shared-config/issues/1299)) ([#376](https://www.github.com/googleapis/java-shared-config/issues/376)) ([50e7a10](https://www.github.com/googleapis/java-shared-config/commit/50e7a10a8dca0505fd831e3dd929577d2f82b011)) +* **java:** Only enable integration tests for native image testing ([#375](https://www.github.com/googleapis/java-shared-config/issues/375)) ([663f421](https://www.github.com/googleapis/java-shared-config/commit/663f421de342afcba24703079f778738045d3ff2)) +* **java:** Pass missing integration test flags to native image test commands ([#1309](https://www.github.com/googleapis/java-shared-config/issues/1309)) ([#383](https://www.github.com/googleapis/java-shared-config/issues/383)) ([b17b44e](https://www.github.com/googleapis/java-shared-config/commit/b17b44e37fe44ba61616417189c6b2271f3a4d18)) + + +### Dependencies + +* update auto-value-annotation.version to v1.9 ([#378](https://www.github.com/googleapis/java-shared-config/issues/378)) ([5e1cd0e](https://www.github.com/googleapis/java-shared-config/commit/5e1cd0e39910548ec4eb6639da979c3b66411503)) +* update dependency com.google.googlejavaformat:google-java-format to v1.13.0 ([#361](https://www.github.com/googleapis/java-shared-config/issues/361)) ([095d60a](https://www.github.com/googleapis/java-shared-config/commit/095d60a061a574dcf84b9fcf26dff48617a306b1)) +* update dependency com.puppycrawl.tools:checkstyle to v9.2 ([#366](https://www.github.com/googleapis/java-shared-config/issues/366)) ([061df67](https://www.github.com/googleapis/java-shared-config/commit/061df676d8b2fef5bbb0ce9661d3c96fcb57e73a)) +* update dependency com.puppycrawl.tools:checkstyle to v9.2.1 ([#382](https://www.github.com/googleapis/java-shared-config/issues/382)) ([1a182c5](https://www.github.com/googleapis/java-shared-config/commit/1a182c52e7c5431875296940d68c9bdfcf74be00)) +* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.9 ([#379](https://www.github.com/googleapis/java-shared-config/issues/379)) ([0a2b05f](https://www.github.com/googleapis/java-shared-config/commit/0a2b05ff7f649331efbc4dd540705da10691a2f1)) +* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.8 ([#372](https://www.github.com/googleapis/java-shared-config/issues/372)) ([6fe795e](https://www.github.com/googleapis/java-shared-config/commit/6fe795ede39575656ef1609bf7aac28c1d170976)) +* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.9 ([#380](https://www.github.com/googleapis/java-shared-config/issues/380)) ([f2efad5](https://www.github.com/googleapis/java-shared-config/commit/f2efad585b431fe186c7900a8171a999c689405b)) +* update dependency org.junit.vintage:junit-vintage-engine to v5.8.2 ([#365](https://www.github.com/googleapis/java-shared-config/issues/365)) ([604058d](https://www.github.com/googleapis/java-shared-config/commit/604058d52dc962db9a506762926576542687285e)) + ### [1.2.2](https://www.github.com/googleapis/java-shared-config/compare/v1.2.1...v1.2.2) (2021-11-16) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 9515f0aaf387..5c1690fba91c 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 1.2.2 + 1.2.3 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 55dbb99663b7..44f608a4f725 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.3-SNAPSHOT + 1.2.3 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 5abc33d2ff9a..eea598b6c0d2 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.2:1.2.3-SNAPSHOT +google-cloud-shared-config:1.2.3:1.2.3 From 26e3ee73ba2350e0b7ae866b72ef9535bf39b41d Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Wed, 5 Jan 2022 18:54:16 -0500 Subject: [PATCH 298/794] deps: revert dependency com.google.googlejavaformat:google-java-format to v1.7 (#391) Causes lint failures in downstream libraries. --- java-shared-config/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 44f608a4f725..77943ad1e10f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -216,7 +216,7 @@ com.coveo fmt-maven-plugin - 2.13 + 2.9 true @@ -225,7 +225,7 @@ com.google.googlejavaformat google-java-format - 1.13.0 + 1.7 From de56af1862d9a48bcc2dd0ac5996c21251e8d609 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 6 Jan 2022 00:10:22 +0000 Subject: [PATCH 299/794] chore: release 1.2.4-SNAPSHOT (#390) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 77943ad1e10f..bbd47a5a25f5 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.3 + 1.2.4-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index eea598b6c0d2..01abef5e2631 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.3:1.2.3 +google-cloud-shared-config:1.2.3:1.2.4-SNAPSHOT From 5c64627ee58cdd67a9973f2e68ab73dc20c64ff9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 6 Jan 2022 00:32:22 +0000 Subject: [PATCH 300/794] chore: release 1.2.4 (#392) :robot: I have created a release \*beep\* \*boop\* --- ### [1.2.4](https://www.github.com/googleapis/java-shared-config/compare/v1.2.3...v1.2.4) (2022-01-06) ### Dependencies * revert dependency com.google.googlejavaformat:google-java-format to v1.7 ([#391](https://www.github.com/googleapis/java-shared-config/issues/391)) ([26e3ee7](https://www.github.com/googleapis/java-shared-config/commit/26e3ee73ba2350e0b7ae866b72ef9535bf39b41d)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/README.md | 2 +- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index b4db9bf04bf2..6edf11bcd57f 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.2.4](https://www.github.com/googleapis/java-shared-config/compare/v1.2.3...v1.2.4) (2022-01-06) + + +### Dependencies + +* revert dependency com.google.googlejavaformat:google-java-format to v1.7 ([#391](https://www.github.com/googleapis/java-shared-config/issues/391)) ([17077fb](https://www.github.com/googleapis/java-shared-config/commit/17077fb1a58eef7098dc5e1e9b2c78a63c5c11e1)) + ### [1.2.3](https://www.github.com/googleapis/java-shared-config/compare/v1.2.2...v1.2.3) (2022-01-04) diff --git a/java-shared-config/README.md b/java-shared-config/README.md index 5c1690fba91c..3e2bef13c6bf 100644 --- a/java-shared-config/README.md +++ b/java-shared-config/README.md @@ -13,7 +13,7 @@ If you are using Maven, use this artifact as your project's parent. com.google.cloud google-cloud-shared-config - 1.2.3 + 1.2.4 ``` diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index bbd47a5a25f5..017a7b2df262 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.4-SNAPSHOT + 1.2.4 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 01abef5e2631..7f9a61535f59 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.3:1.2.4-SNAPSHOT +google-cloud-shared-config:1.2.4:1.2.4 From ba90d52b0369e22e61cb546824ecf6d118c2f5f4 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 6 Jan 2022 20:26:13 +0000 Subject: [PATCH 301/794] chore: release 1.2.5-SNAPSHOT (#393) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 017a7b2df262..90e554cfb45e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.4 + 1.2.5-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 7f9a61535f59..bd79c57c8718 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.4:1.2.4 +google-cloud-shared-config:1.2.4:1.2.5-SNAPSHOT From 98e752fef962e3fa71d251a36a651996f3a45c73 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Tue, 11 Jan 2022 11:44:12 -0500 Subject: [PATCH 302/794] fix(java): Enable unit tests in generated libraries for native image testing (#394) * Include unit tests for generated libraries --- java-shared-config/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 90e554cfb45e..90f0be0bc2ae 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -807,6 +807,8 @@ **/IT*.java + + **/*ClientTest.java @@ -829,6 +831,7 @@ --no-fallback --no-server + --features=com.google.cloud.nativeimage.features.ProtobufMessageFeature From 2969644f2dac3664883f3754b6829128d6e3b854 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 11 Jan 2022 17:54:11 +0000 Subject: [PATCH 303/794] chore(main): release 1.2.5 (#402) :robot: I have created a release *beep* *boop* --- ### [1.2.5](https://github.com/googleapis/java-shared-config/compare/v1.2.4...v1.2.5) (2022-01-11) ### Bug Fixes * **java:** Enable unit tests in generated libraries for native image testing ([#394](https://github.com/googleapis/java-shared-config/issues/394)) ([98e752f](https://github.com/googleapis/java-shared-config/commit/98e752fef962e3fa71d251a36a651996f3a45c73)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 6edf11bcd57f..071fb987e4a5 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.2.5](https://github.com/googleapis/java-shared-config/compare/v1.2.4...v1.2.5) (2022-01-11) + + +### Bug Fixes + +* **java:** Enable unit tests in generated libraries for native image testing ([#394](https://github.com/googleapis/java-shared-config/issues/394)) ([a453b9f](https://github.com/googleapis/java-shared-config/commit/a453b9f141c7555f2fd5333eb17d223410ab66eb)) + ### [1.2.4](https://www.github.com/googleapis/java-shared-config/compare/v1.2.3...v1.2.4) (2022-01-06) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 90f0be0bc2ae..65f8310e4989 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.5-SNAPSHOT + 1.2.5 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index bd79c57c8718..7c20beae67c3 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.4:1.2.5-SNAPSHOT +google-cloud-shared-config:1.2.5:1.2.5 From 41e674b76d94141cc2586348f58ae08b87f3e0d7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 19 Jan 2022 02:27:11 +0100 Subject: [PATCH 304/794] build(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.9.0 (#405) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 65f8310e4989..b9b57349c8ff 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -169,7 +169,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.9.0 1.8 1.8 From 81ef28d4edd2815df24fe873e5fe52513e3512f1 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 17:27:45 -0800 Subject: [PATCH 305/794] chore(owlbot-java): disable re-writing clirr file in owlbot java post-processor (#1320) (#401) Source-Link: https://github.com/googleapis/synthtool/commit/4b86ab067da494e0af7df536dbd485e1f8f4aa67 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:efbfc5e9ff713005a037941f8ebcc0c69cc630e3ad934675ee26868705a30897 Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.kokoro/build.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 2b0252c5b268..20c6ee3c30ca 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:b5ce87328633e27aa3e65d42e84cc722519859349760cdad48c7b5051b519a7d + digest: sha256:efbfc5e9ff713005a037941f8ebcc0c69cc630e3ad934675ee26868705a30897 diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index ee4d56655606..6ba544a2cc78 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.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) @@ -104,7 +104,7 @@ samples) fi ;; clirr) - mvn -B -Denforcer.skip=true clirr:check + mvn -B -ntp -Denforcer.skip=true clirr:check RETURN_CODE=$? ;; *) From 93ffedc0da12e26c04f5bd41c0b8d3d08b4f2bdc Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 19 Jan 2022 02:28:03 +0100 Subject: [PATCH 306/794] build(deps): update dependency org.apache.maven.plugins:maven-jar-plugin to v3.2.2 (#396) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b9b57349c8ff..e9814f13f2dc 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -149,7 +149,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.2.2 true From fc636f133fe3df04fd9811a77852309b69674d94 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 19 Jan 2022 02:35:31 +0100 Subject: [PATCH 307/794] build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.3.0 (#395) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e9814f13f2dc..e2b0401f9d85 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -206,7 +206,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + 3.3.0 org.codehaus.mojo From d03fdd2c941fb89d52b8eacff908662809df5aa7 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Wed, 19 Jan 2022 11:44:52 -0800 Subject: [PATCH 308/794] chore: update cloud rad doclet version (#407) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e2b0401f9d85..e3a3c245acef 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -683,7 +683,7 @@ - java-docfx-doclet-1.4.0 + java-docfx-doclet-1.5.0 ${project.build.directory}/docfx-yml ${project.artifactId} From 83921523650fd87a5f2bb2951cb72b98351ee6cb Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 19 Jan 2022 12:21:50 -0800 Subject: [PATCH 309/794] chore(main): release 1.2.6-SNAPSHOT (#403) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e3a3c245acef..1c8fe213e108 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.5 + 1.2.6-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 7c20beae67c3..27829ca42a80 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.5:1.2.5 +google-cloud-shared-config:1.2.5:1.2.6-SNAPSHOT From b82faa9c2a2d37faaa0f81fdf359aabfe2c2cd48 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Wed, 19 Jan 2022 12:39:13 -0800 Subject: [PATCH 310/794] fix: library should released as 1.2.6 (#408) Release-As: 1.2.6 From 71bfeab1c66cd67631d1c90479b2ccb94d4df594 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 19 Jan 2022 13:07:05 -0800 Subject: [PATCH 311/794] chore(main): release 1.2.6 (#409) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 071fb987e4a5..44d92348e178 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.2.6](https://github.com/googleapis/java-shared-config/compare/v1.2.5...v1.2.6) (2022-01-19) + + +### Bug Fixes + +* library should released as 1.2.6 ([#408](https://github.com/googleapis/java-shared-config/issues/408)) ([4972daa](https://github.com/googleapis/java-shared-config/commit/4972daa60467797566c4b043cebd322577b8eb73)) + ### [1.2.5](https://github.com/googleapis/java-shared-config/compare/v1.2.4...v1.2.5) (2022-01-11) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 1c8fe213e108..701b57d279be 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.6-SNAPSHOT + 1.2.6 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 27829ca42a80..1c9fc5ffc472 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.5:1.2.6-SNAPSHOT +google-cloud-shared-config:1.2.6:1.2.6 From f4a7721e92b583db3c59411e9c5104498161a8a6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 21 Jan 2022 09:34:55 -0800 Subject: [PATCH 312/794] chore(main): release 1.2.7-SNAPSHOT (#410) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 701b57d279be..7f77313cb341 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.6 + 1.2.7-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 1c9fc5ffc472..14fd9b6805f0 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.6:1.2.6 +google-cloud-shared-config:1.2.6:1.2.7-SNAPSHOT From a093a714be8919a61f6644d5d427310835c0fd8f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 4 Feb 2022 21:45:25 +0100 Subject: [PATCH 313/794] deps: update dependency com.google.cloud:native-image-support to v0.12.0 (#414) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 7f77313cb341..ffbe7a95a4dd 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -776,7 +776,7 @@ com.google.cloud native-image-support - 0.10.0 + 0.12.0 test From b3b55ddd01245851c95b8c546837c72c97a38fde Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 17:53:07 +0000 Subject: [PATCH 314/794] chore(main): release 1.2.7 (#418) :robot: I have created a release *beep* *boop* --- ### [1.2.7](https://github.com/googleapis/java-shared-config/compare/v1.2.6...v1.2.7) (2022-02-04) ### Dependencies * update dependency com.google.cloud:native-image-support to v0.12.0 ([#414](https://github.com/googleapis/java-shared-config/issues/414)) ([a093a71](https://github.com/googleapis/java-shared-config/commit/a093a714be8919a61f6644d5d427310835c0fd8f)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 44d92348e178..b8c0a80cc417 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.2.7](https://github.com/googleapis/java-shared-config/compare/v1.2.6...v1.2.7) (2022-02-04) + + +### Dependencies + +* update dependency com.google.cloud:native-image-support to v0.12.0 ([#414](https://github.com/googleapis/java-shared-config/issues/414)) ([2133cc0](https://github.com/googleapis/java-shared-config/commit/2133cc093efd8420e352274f3eab09de819ff796)) + ### [1.2.6](https://github.com/googleapis/java-shared-config/compare/v1.2.5...v1.2.6) (2022-01-19) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ffbe7a95a4dd..3511d06e3f9c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.7-SNAPSHOT + 1.2.7 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 14fd9b6805f0..d8d8bd7cb0e9 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.6:1.2.7-SNAPSHOT +google-cloud-shared-config:1.2.7:1.2.7 From 4068cb9464851c8e0840ae52e206a4e6a6b5ecdc Mon Sep 17 00:00:00 2001 From: Mike Eltsufin Date: Mon, 7 Mar 2022 16:01:08 -0500 Subject: [PATCH 315/794] chore: increase IT timeout from 20 to 60 mins (#439) Required for java-redis. --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 3511d06e3f9c..cf8a190ed227 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -131,7 +131,7 @@ maven-failsafe-plugin 3.0.0-M4 - 1200 + 3600 sponge_log **/IT*.java From a59533aa3a1150cc22f1af9f46a8042ae0aedc18 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 21:10:11 +0000 Subject: [PATCH 316/794] chore(main): release 1.2.8-SNAPSHOT (#420) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index cf8a190ed227..d02f6645d044 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.7 + 1.2.8-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index d8d8bd7cb0e9..e30e65d358e7 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.7:1.2.7 +google-cloud-shared-config:1.2.7:1.2.8-SNAPSHOT From 1aa1021b0edbf6207891ab19ac4d3d096dafc619 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 16:11:37 -0500 Subject: [PATCH 317/794] chore: enable auto release in java (#1349) (#421) * chore: fix auto-release * chore: remove codecov.yml * chore: update license headers for yaml files Source-Link: https://github.com/googleapis/synthtool/commit/5b777277a01a93e7f10c9279521e807b934e78d4 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:ebc2104854c5b81c6fd72ca79400a2e20e0d510c5e0654fd1a19e5c9be160ca6 Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 20c6ee3c30ca..a8ddd81ae949 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:efbfc5e9ff713005a037941f8ebcc0c69cc630e3ad934675ee26868705a30897 + digest: sha256:ebc2104854c5b81c6fd72ca79400a2e20e0d510c5e0654fd1a19e5c9be160ca6 From 4daf4bb87a3cf2838489ffc262eaa877679d2245 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Mon, 7 Mar 2022 18:12:54 -0500 Subject: [PATCH 318/794] feat: increase IT timeout from 20 to 60 mins (#440) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: increase IT timeout from 20 to 60 mins * chore: fix repo-metadata * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: update owlbot * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- .../.github/ISSUE_TEMPLATE/bug_report.md | 2 +- .../.github/PULL_REQUEST_TEMPLATE.md | 3 ++ .../.github/workflows/approve-readme.yaml | 17 ++++++++- java-shared-config/.github/workflows/ci.yaml | 35 +++++++++++++----- java-shared-config/.kokoro/build.bat | 15 ++++++++ .../.kokoro/nightly/integration.cfg | 4 +- .../.kokoro/nightly/java11-integration.cfg | 37 +++++++++++++++++++ java-shared-config/.repo-metadata.json | 6 ++- 9 files changed, 104 insertions(+), 17 deletions(-) create mode 100644 java-shared-config/.kokoro/nightly/java11-integration.cfg diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index a8ddd81ae949..426cf83e2ec6 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:ebc2104854c5b81c6fd72ca79400a2e20e0d510c5e0654fd1a19e5c9be160ca6 + digest: sha256:b0b1c1c89570e229b1026372a2b8989ba31495007055b8d30178b7648503eefa diff --git a/java-shared-config/.github/ISSUE_TEMPLATE/bug_report.md b/java-shared-config/.github/ISSUE_TEMPLATE/bug_report.md index 13c74e459d6a..3076bcb4c927 100644 --- a/java-shared-config/.github/ISSUE_TEMPLATE/bug_report.md +++ b/java-shared-config/.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. google-cloud-shared-config version(s): +4. version(s): #### Steps to reproduce diff --git a/java-shared-config/.github/PULL_REQUEST_TEMPLATE.md b/java-shared-config/.github/PULL_REQUEST_TEMPLATE.md index c016681712a2..6fcc4d54e9b6 100644 --- a/java-shared-config/.github/PULL_REQUEST_TEMPLATE.md +++ b/java-shared-config/.github/PULL_REQUEST_TEMPLATE.md @@ -5,3 +5,6 @@ Thank you for opening a Pull Request! Before submitting your PR, there are a few - [ ] Appropriate docs were updated (if necessary) Fixes # ☕️ + +If you write sample code, please follow the [samples format]( +https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md). diff --git a/java-shared-config/.github/workflows/approve-readme.yaml b/java-shared-config/.github/workflows/approve-readme.yaml index 7513acaebcc2..f5fc7d5169eb 100644 --- a/java-shared-config/.github/workflows/approve-readme.yaml +++ b/java-shared-config/.github/workflows/approve-readme.yaml @@ -1,3 +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. on: pull_request: name: auto-merge-readme @@ -6,7 +21,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@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index 05de1f60dcf0..83ef7f9c2cf3 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -1,3 +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. on: push: branches: @@ -12,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}} @@ -24,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 @@ -39,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}} @@ -49,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 @@ -61,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/java-shared-config/.kokoro/build.bat b/java-shared-config/.kokoro/build.bat index 05826ad93fe8..067cf4a4c489 100644 --- a/java-shared-config/.kokoro/build.bat +++ b/java-shared-config/.kokoro/build.bat @@ -1,3 +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 "C:\Program Files\Git\bin\bash.exe" %~dp0build.sh diff --git a/java-shared-config/.kokoro/nightly/integration.cfg b/java-shared-config/.kokoro/nightly/integration.cfg index e51c7b4c6c11..a2907a257b2b 100644 --- a/java-shared-config/.kokoro/nightly/integration.cfg +++ b/java-shared-config/.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/java-shared-config/.kokoro/nightly/java11-integration.cfg b/java-shared-config/.kokoro/nightly/java11-integration.cfg new file mode 100644 index 000000000000..58049cc38f11 --- /dev/null +++ b/java-shared-config/.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/java-shared-config/.repo-metadata.json b/java-shared-config/.repo-metadata.json index 6eb837f18b35..ff027db5e7fe 100644 --- a/java-shared-config/.repo-metadata.json +++ b/java-shared-config/.repo-metadata.json @@ -1,9 +1,11 @@ { - "name": "google-cloud-shared-config", + "api_shortname": "google-cloud-shared-config", "name_pretty": "Google Cloud Shared Build Configs", "release_level": "beta", + "client_documentation": "n/a", "language": "java", "repo": "googleapis/java-shared-config", "repo_short": "java-shared-config", - "distribution_name": "com.google.cloud:google-cloud-shared-config" + "distribution_name": "com.google.cloud:google-cloud-shared-config", + "library_type": "OTHER" } From c8936be412cfdaf79d04561cecf42fdd93d12acd Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Mar 2022 00:22:37 +0100 Subject: [PATCH 319/794] build(deps): update dependency org.apache.maven.plugins:maven-site-plugin to v3.11.0 (#432) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d02f6645d044..6285fa499955 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -182,7 +182,7 @@ org.apache.maven.plugins maven-site-plugin - 3.10.0 + 3.11.0 true From 0db6b162607c213e683b9a944f62df449c5169e6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Mar 2022 00:22:44 +0100 Subject: [PATCH 320/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.10 (#430) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 6285fa499955..9b9ed6f3f4b4 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -816,7 +816,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.9 + 0.9.10 true From 8131c6acd32d8835b4e435ec4a614b39bd39fcbc Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Mar 2022 00:22:51 +0100 Subject: [PATCH 321/794] deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.10 (#429) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9b9ed6f3f4b4..0d1bea0c5d8c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -790,7 +790,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.9 + 0.9.10 test From e6e9e1eecb4d037c15bb231456a3f8d792d86b33 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Mar 2022 00:22:58 +0100 Subject: [PATCH 322/794] build(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.10.0 (#428) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 0d1bea0c5d8c..4060c3461d03 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -169,7 +169,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.9.0 + 3.10.0 1.8 1.8 From 95f8011d2f805d906db9b2974597bfaefcf56cbd Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Mar 2022 00:23:05 +0100 Subject: [PATCH 323/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.2 (#424) --- java-shared-config/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 4060c3461d03..e9ace453d592 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -465,7 +465,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.3.2 html @@ -565,7 +565,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.3.2 attach-javadocs @@ -696,7 +696,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.3.2 com.microsoft.doclet.DocFxDoclet false From 87e186541f3643b2787758b7751ec92db5779a14 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Mar 2022 00:27:01 +0100 Subject: [PATCH 324/794] deps: update dependency com.google.cloud:native-image-support to v0.12.6 (#423) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e9ace453d592..ef231a5fcf79 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -776,7 +776,7 @@ com.google.cloud native-image-support - 0.12.0 + 0.12.6 test From 14362668d8c78624087160140e12ffeb0a22b4f1 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Mar 2022 00:28:11 +0100 Subject: [PATCH 325/794] deps: update dependency com.puppycrawl.tools:checkstyle to v9.3 (#415) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ef231a5fcf79..2a823416fbee 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -632,7 +632,7 @@ com.puppycrawl.tools checkstyle - 9.2.1 + 9.3 From 750f22cd5f9cb480c521272e85864828b5d71101 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 8 Mar 2022 00:28:21 +0100 Subject: [PATCH 326/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.2.2 (#419) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2a823416fbee..09bda67e006a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -438,7 +438,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.2 + 3.2.2 From f8511935162a330ab109a5cfd6a5bdefabba2779 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 23:42:14 +0000 Subject: [PATCH 327/794] chore(main): release 1.3.0 (#441) :robot: I have created a release *beep* *boop* --- ## [1.3.0](https://github.com/googleapis/java-shared-config/compare/v1.2.7...v1.3.0) (2022-03-07) ### Features * increase IT timeout from 20 to 60 mins ([#440](https://github.com/googleapis/java-shared-config/issues/440)) ([4daf4bb](https://github.com/googleapis/java-shared-config/commit/4daf4bb87a3cf2838489ffc262eaa877679d2245)) ### Dependencies * update dependency com.google.cloud:native-image-support to v0.12.6 ([#423](https://github.com/googleapis/java-shared-config/issues/423)) ([87e1865](https://github.com/googleapis/java-shared-config/commit/87e186541f3643b2787758b7751ec92db5779a14)) * update dependency com.puppycrawl.tools:checkstyle to v9.3 ([#415](https://github.com/googleapis/java-shared-config/issues/415)) ([1436266](https://github.com/googleapis/java-shared-config/commit/14362668d8c78624087160140e12ffeb0a22b4f1)) * update dependency org.graalvm.buildtools:junit-platform-native to v0.9.10 ([#429](https://github.com/googleapis/java-shared-config/issues/429)) ([8131c6a](https://github.com/googleapis/java-shared-config/commit/8131c6acd32d8835b4e435ec4a614b39bd39fcbc)) * update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.10 ([#430](https://github.com/googleapis/java-shared-config/issues/430)) ([0db6b16](https://github.com/googleapis/java-shared-config/commit/0db6b162607c213e683b9a944f62df449c5169e6)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 15 +++++++++++++++ java-shared-config/pom.xml | 4 ++-- java-shared-config/versions.txt | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index b8c0a80cc417..2907c5503c59 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [1.3.0](https://github.com/googleapis/java-shared-config/compare/v1.2.7...v1.3.0) (2022-03-07) + + +### Features + +* increase IT timeout from 20 to 60 mins ([#440](https://github.com/googleapis/java-shared-config/issues/440)) ([a4427bc](https://github.com/googleapis/java-shared-config/commit/a4427bceebd0624e23f0b02bb24d7ed46ea4b3a6)) + + +### Dependencies + +* update dependency com.google.cloud:native-image-support to v0.12.6 ([#423](https://github.com/googleapis/java-shared-config/issues/423)) ([9a0cb79](https://github.com/googleapis/java-shared-config/commit/9a0cb79896d5c97dc3c5648a6740d53eb9ada673)) +* update dependency com.puppycrawl.tools:checkstyle to v9.3 ([#415](https://github.com/googleapis/java-shared-config/issues/415)) ([9e2d3fd](https://github.com/googleapis/java-shared-config/commit/9e2d3fd8bd42bc210dae5798f7d5dfe950c29f51)) +* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.10 ([#429](https://github.com/googleapis/java-shared-config/issues/429)) ([0355f29](https://github.com/googleapis/java-shared-config/commit/0355f2988ebcff19615b72bc65523555e4844523)) +* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.10 ([#430](https://github.com/googleapis/java-shared-config/issues/430)) ([16984d2](https://github.com/googleapis/java-shared-config/commit/16984d25a84aa6a8daf2a0925ea57cd0d3f0ee24)) + ### [1.2.7](https://github.com/googleapis/java-shared-config/compare/v1.2.6...v1.2.7) (2022-02-04) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 09bda67e006a..6e99139f763f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.2.8-SNAPSHOT + 1.3.0 Google Cloud https://github.com/googleapis/java-shared-config @@ -438,7 +438,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.2.2 + 3.1.2 diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index e30e65d358e7..a98293285890 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.2.7:1.2.8-SNAPSHOT +google-cloud-shared-config:1.3.0:1.3.0 From 62e4604bb0facd2ca892c97a0110fdde00b9cf70 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 8 Mar 2022 18:22:20 -0500 Subject: [PATCH 328/794] chore: update repo-metadata (#445) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #406 ☕️ --- java-shared-config/.repo-metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.repo-metadata.json b/java-shared-config/.repo-metadata.json index ff027db5e7fe..81cfec03ed6d 100644 --- a/java-shared-config/.repo-metadata.json +++ b/java-shared-config/.repo-metadata.json @@ -1,8 +1,8 @@ { "api_shortname": "google-cloud-shared-config", "name_pretty": "Google Cloud Shared Build Configs", - "release_level": "beta", - "client_documentation": "n/a", + "release_level": "preview", + "client_documentation": "https://n/a", "language": "java", "repo": "googleapis/java-shared-config", "repo_short": "java-shared-config", From 34ca2191f45f41ff5c39d63faae4fbca652e8229 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 25 Mar 2022 21:19:45 +0100 Subject: [PATCH 329/794] deps: update dependency com.google.cloud:native-image-support to v0.12.10 (#443) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 6e99139f763f..74acf4134982 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -776,7 +776,7 @@ com.google.cloud native-image-support - 0.12.6 + 0.12.10 test From c8f90160f77fe0d509c535dd5ea216bb39459e88 Mon Sep 17 00:00:00 2001 From: Mike Eltsufin Date: Fri, 25 Mar 2022 16:20:03 -0400 Subject: [PATCH 330/794] chore: force detected repo language to Java (#444) --- java-shared-config/.gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 java-shared-config/.gitattributes diff --git a/java-shared-config/.gitattributes b/java-shared-config/.gitattributes new file mode 100644 index 000000000000..3c1b9d4384f2 --- /dev/null +++ b/java-shared-config/.gitattributes @@ -0,0 +1,2 @@ +# to change language of repo from Shell to Java +*.sh linguist-language=Java From b5ca5a221c8ab331046bdf2dc9151911cdd4d2a2 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 25 Mar 2022 21:20:19 +0100 Subject: [PATCH 331/794] deps: update dependency com.google.googlejavaformat:google-java-format to v1.15.0 (#426) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 74acf4134982..5ce1d817e442 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -225,7 +225,7 @@ com.google.googlejavaformat google-java-format - 1.7 + 1.15.0 From edd6f992c0943fb6d1ab5a93b4443a79a8eb1dfa Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 25 Mar 2022 21:20:52 +0100 Subject: [PATCH 332/794] build(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.10.1 (#446) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 5ce1d817e442..2a796b4ffd12 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -169,7 +169,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.0 + 3.10.1 1.8 1.8 From d5da261a2f24b41aa223f1032d9b160542f2f0cf Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 25 Mar 2022 21:21:39 +0100 Subject: [PATCH 333/794] build(deps): update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.6.12 (#427) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2a796b4ffd12..46d533206ad5 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -73,7 +73,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.12 true ossrh From d0892fa3658efdf47bab1fa61c4340a642c659e7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 25 Mar 2022 21:36:43 +0100 Subject: [PATCH 334/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.11 (#449) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 46d533206ad5..ca2d991f71df 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -816,7 +816,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.10 + 0.9.11 true From aa8e4305ca26b0fc1b7914fde9839cca369f875a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 25 Mar 2022 21:37:09 +0100 Subject: [PATCH 335/794] deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.11 (#448) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ca2d991f71df..e673ebfa52fb 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -790,7 +790,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.10 + 0.9.11 test From 6b766517862ad20506fb112c5f401f5660d47bd3 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 25 Mar 2022 20:42:13 +0000 Subject: [PATCH 336/794] chore(main): release 1.3.1-SNAPSHOT (#442) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e673ebfa52fb..9c96c3af761a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.3.0 + 1.3.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index a98293285890..9457de55c86c 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.3.0:1.3.0 +google-cloud-shared-config:1.3.0:1.3.1-SNAPSHOT From c4c4ee78d693d17f464c7f9e3987667f14484b76 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 25 Mar 2022 21:18:13 +0000 Subject: [PATCH 337/794] chore(main): release 1.3.1 (#450) :robot: I have created a release *beep* *boop* --- ### [1.3.1](https://github.com/googleapis/java-shared-config/compare/v1.3.0...v1.3.1) (2022-03-25) ### Dependencies * update dependency com.google.cloud:native-image-support to v0.12.10 ([#443](https://github.com/googleapis/java-shared-config/issues/443)) ([34ca219](https://github.com/googleapis/java-shared-config/commit/34ca2191f45f41ff5c39d63faae4fbca652e8229)) * update dependency com.google.googlejavaformat:google-java-format to v1.15.0 ([#426](https://github.com/googleapis/java-shared-config/issues/426)) ([b5ca5a2](https://github.com/googleapis/java-shared-config/commit/b5ca5a221c8ab331046bdf2dc9151911cdd4d2a2)) * update dependency org.graalvm.buildtools:junit-platform-native to v0.9.11 ([#448](https://github.com/googleapis/java-shared-config/issues/448)) ([aa8e430](https://github.com/googleapis/java-shared-config/commit/aa8e4305ca26b0fc1b7914fde9839cca369f875a)) * update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.11 ([#449](https://github.com/googleapis/java-shared-config/issues/449)) ([d0892fa](https://github.com/googleapis/java-shared-config/commit/d0892fa3658efdf47bab1fa61c4340a642c659e7)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 10 ++++++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 2907c5503c59..16af51ccbba3 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +### [1.3.1](https://github.com/googleapis/java-shared-config/compare/v1.3.0...v1.3.1) (2022-03-25) + + +### Dependencies + +* update dependency com.google.cloud:native-image-support to v0.12.10 ([#443](https://github.com/googleapis/java-shared-config/issues/443)) ([5b39d5e](https://github.com/googleapis/java-shared-config/commit/5b39d5ee15121f052226ff873b6ab101e9c71de5)) +* update dependency com.google.googlejavaformat:google-java-format to v1.15.0 ([#426](https://github.com/googleapis/java-shared-config/issues/426)) ([4c3c4b6](https://github.com/googleapis/java-shared-config/commit/4c3c4b66129632181e6bc363a0ecccf4f5aac914)) +* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.11 ([#448](https://github.com/googleapis/java-shared-config/issues/448)) ([f7f518e](https://github.com/googleapis/java-shared-config/commit/f7f518e87d1d9feb9ac54d7c099f97d8751ee3da)) +* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.11 ([#449](https://github.com/googleapis/java-shared-config/issues/449)) ([3e1c0b5](https://github.com/googleapis/java-shared-config/commit/3e1c0b5a1d2f4a0db88c06a0d683ed90cbc745e2)) + ## [1.3.0](https://github.com/googleapis/java-shared-config/compare/v1.2.7...v1.3.0) (2022-03-07) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9c96c3af761a..01aadba39fff 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.3.1-SNAPSHOT + 1.3.1 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 9457de55c86c..ff40eca38ab1 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.3.0:1.3.1-SNAPSHOT +google-cloud-shared-config:1.3.1:1.3.1 From e6abdec02771b7e8d6a08094ebd4fb67289ad6bc Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 28 Mar 2022 14:52:39 -0400 Subject: [PATCH 338/794] ci: running apt-get update in downstream.yaml (#455) --- java-shared-config/.github/workflows/downstream.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/java-shared-config/.github/workflows/downstream.yaml b/java-shared-config/.github/workflows/downstream.yaml index 88de3ec21a33..8992a5994603 100644 --- a/java-shared-config/.github/workflows/downstream.yaml +++ b/java-shared-config/.github/workflows/downstream.yaml @@ -26,5 +26,6 @@ jobs: with: java-version: ${{matrix.java}} - run: java -version + - run: sudo apt-get update -y - run: sudo apt-get install libxml2-utils - run: .kokoro/client-library-check.sh ${{matrix.repo}} From da4875b6a5c122e62ff30bf0feadebc4206e2d3e Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 28 Mar 2022 15:06:11 -0400 Subject: [PATCH 339/794] deps: revert google-java-format to 1.7 (#453) Fixes #452 . (This revert would fix the problem but when RenovateBot create a pull request we'll be forgetting about the problem.) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 01aadba39fff..cd6b7b045c82 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -225,7 +225,7 @@ com.google.googlejavaformat google-java-format - 1.15.0 + 1.7 From cbe1128b26864635fe8a61b36942c07c8afc7b75 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 19:16:15 +0000 Subject: [PATCH 340/794] chore(main): release 1.3.2-SNAPSHOT (#451) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index cd6b7b045c82..83925e567e23 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.3.1 + 1.3.2-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index ff40eca38ab1..a651c2938519 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.3.1:1.3.1 +google-cloud-shared-config:1.3.1:1.3.2-SNAPSHOT From dce9e9ff4f4945a99b52189bd16d66ac12e77917 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 28 Mar 2022 19:28:13 +0000 Subject: [PATCH 341/794] chore(main): release 1.3.2 (#457) :robot: I have created a release *beep* *boop* --- ### [1.3.2](https://github.com/googleapis/java-shared-config/compare/v1.3.1...v1.3.2) (2022-03-28) ### Dependencies * revert google-java-format to 1.7 ([#453](https://github.com/googleapis/java-shared-config/issues/453)) ([da4875b](https://github.com/googleapis/java-shared-config/commit/da4875b6a5c122e62ff30bf0feadebc4206e2d3e)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 16af51ccbba3..d889322c57f4 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.3.2](https://github.com/googleapis/java-shared-config/compare/v1.3.1...v1.3.2) (2022-03-28) + + +### Dependencies + +* revert google-java-format to 1.7 ([#453](https://github.com/googleapis/java-shared-config/issues/453)) ([cbc777f](https://github.com/googleapis/java-shared-config/commit/cbc777f3e9ab75edb6fa2e0268a7446ae4111725)) + ### [1.3.1](https://github.com/googleapis/java-shared-config/compare/v1.3.0...v1.3.1) (2022-03-25) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 83925e567e23..628bea796e73 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.3.2-SNAPSHOT + 1.3.2 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index a651c2938519..5079fd28da3b 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.3.1:1.3.2-SNAPSHOT +google-cloud-shared-config:1.3.2:1.3.2 From 1e2ad74e4773cb37296affac8a7b37a13a31fd5c Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 29 Mar 2022 15:09:27 -0400 Subject: [PATCH 342/794] test: verifying test, lint, clirr, and graalvm in checks (#456) * test: verifying test, lint, and clirr in checks * test: trying graalvm job-type with GraalVM 22.0.0.2 * ci: adding the new builds as required checks The following simple Python script can generate the list: for j in [8, 11]: for r in ["java-trace", "java-bigquery"]: for t in ["test", "lint", "clirr"]: print(' - "build (%s, %s, %s)"' % (j, r, t)) --- .../.github/sync-repo-settings.yaml | 13 ++++ ...ream.yaml => downstream-dependencies.yaml} | 10 ++- .../workflows/downstream-maven-plugins.yaml | 67 +++++++++++++++++++ .../.kokoro/client-library-check.sh | 23 +++++-- 4 files changed, 103 insertions(+), 10 deletions(-) rename java-shared-config/.github/workflows/{downstream.yaml => downstream-dependencies.yaml} (70%) create mode 100644 java-shared-config/.github/workflows/downstream-maven-plugins.yaml diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index c2d7ab054f3b..c3a74079fac8 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -46,6 +46,19 @@ branchProtectionRules: - "dependencies (11, java-spanner)" - "dependencies (11, java-storage)" - "dependencies (11, java-pubsub)" + - "build (8, java-trace, test)" + - "build (8, java-trace, lint)" + - "build (8, java-trace, clirr)" + - "build (8, java-bigquery, test)" + - "build (8, java-bigquery, lint)" + - "build (8, java-bigquery, clirr)" + - "build (11, java-trace, test)" + - "build (11, java-trace, lint)" + - "build (11, java-trace, clirr)" + - "build (11, java-bigquery, test)" + - "build (11, java-bigquery, lint)" + - "build (11, java-bigquery, clirr)" + - "graalvm (11, java-orgpolicy)" - "cla/google" - pattern: java7 # Can admins overwrite branch protection. diff --git a/java-shared-config/.github/workflows/downstream.yaml b/java-shared-config/.github/workflows/downstream-dependencies.yaml similarity index 70% rename from java-shared-config/.github/workflows/downstream.yaml rename to java-shared-config/.github/workflows/downstream-dependencies.yaml index 8992a5994603..58c60f9d0f40 100644 --- a/java-shared-config/.github/workflows/downstream.yaml +++ b/java-shared-config/.github/workflows/downstream-dependencies.yaml @@ -18,14 +18,12 @@ jobs: - java-storage - java-pubsub steps: - - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: + distribution: zulu java-version: ${{matrix.java}} - run: java -version - run: sudo apt-get update -y - run: sudo apt-get install libxml2-utils - - run: .kokoro/client-library-check.sh ${{matrix.repo}} + - run: .kokoro/client-library-check.sh ${{matrix.repo}} dependencies diff --git a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml new file mode 100644 index 000000000000..e15445400630 --- /dev/null +++ b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml @@ -0,0 +1,67 @@ +on: + push: + branches: + - main + pull_request: + +# Keeping this file separate as the dependencies check would use more +# repositories than needed this downstream check for GraalVM native image and +# other Maven plugins. +name: downstream +jobs: + build: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + java: [8, 11] + repo: + # GAPIC library + - java-trace + # Handwritten library + - java-bigquery + job-type: + - test # maven-surefire-plugin + - lint # fmt-maven-plugin and google-java-format + - clirr # clirr-maven-plugin + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: zulu + java-version: ${{matrix.java}} + - run: java -version + - run: sudo apt-get update -y + - run: sudo apt-get install libxml2-utils + - run: .kokoro/client-library-check.sh ${{matrix.repo}} ${{matrix.job-type}} + + # GraalVM job ensures the compatibility of GraaVM version above and the + # native-maven-plugin version. + graalvm: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + java: [11] + repo: + # GAPIC library that doesn't use a real GCP project in integration tests + - java-orgpolicy + steps: + - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 + - uses: ayltai/setup-graalvm@v1 + with: + java-version: ${{matrix.java}} + # When a new version of native-maven-plugin fails to run in a downstream + # library, it's likely to be an incompatibility with the GraalVM version. + # In that case, you need to upgrade the Docker container used in the + # tests in the downstream repositories (not just this value below). + # Example: https://github.com/googleapis/testing-infra-docker/pull/195 + graalvm-version: 22.0.0.2 + native-image: true + - run: java -version + - run: sudo apt-get update -y + - run: sudo apt-get install libxml2-utils + - run: .kokoro/client-library-check.sh ${{matrix.repo}} graalvm diff --git a/java-shared-config/.kokoro/client-library-check.sh b/java-shared-config/.kokoro/client-library-check.sh index 03cee53b0dff..3cddeb10f6c4 100755 --- a/java-shared-config/.kokoro/client-library-check.sh +++ b/java-shared-config/.kokoro/client-library-check.sh @@ -21,12 +21,15 @@ set -eo pipefail # Display commands being run. set -x -if [[ $# -lt 1 ]]; +if [[ $# -ne 2 ]]; then - echo "Usage: $0 " + echo "Usage: $0 " + echo "where repo-name is java-XXX and check-type is dependencies, lint, or clirr" exit 1 fi REPO=$1 +# build.sh uses this environment variable +export JOB_TYPE=$2 ## Get the directory of the build script scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) @@ -61,5 +64,17 @@ set ${VERSION} save pom.xml EOF -# run dependencies script -.kokoro/dependencies.sh +case ${JOB_TYPE} in +dependencies) + .kokoro/dependencies.sh + RETURN_CODE=$? + ;; +*) + # This reads the JOB_TYPE environmental variable + .kokoro/build.sh + RETURN_CODE=$? + ;; +esac + +echo "exiting with ${RETURN_CODE}" +exit ${RETURN_CODE} From cd4244cc2e5b254a0b982a78cc7f97e8db0982b8 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 1 Apr 2022 20:00:29 +0200 Subject: [PATCH 343/794] deps: update dependency com.google.cloud:native-image-support to v0.12.11 (#459) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:native-image-support](https://togithub.com/googleapis/java-core) | `0.12.10` -> `0.12.11` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.11/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.11/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.11/compatibility-slim/0.12.10)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:native-image-support/0.12.11/confidence-slim/0.12.10)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 628bea796e73..e5025133e652 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -776,7 +776,7 @@ com.google.cloud native-image-support - 0.12.10 + 0.12.11 test From 740b586c075b86ff9509c9b69d04be3bae19ccb8 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 6 Apr 2022 22:14:20 +0200 Subject: [PATCH 344/794] build(deps): update dependency org.apache.maven.plugins:maven-jxr-plugin to v3.2.0 (#447) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e5025133e652..d8ebd4100942 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -506,7 +506,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.1.1 + 3.2.0 true From 3b5a06bcccfeeaf982da3d72becc206cab57d73c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 6 Apr 2022 22:14:33 +0200 Subject: [PATCH 345/794] build(deps): update dependency org.jacoco:jacoco-maven-plugin to v0.8.8 (#463) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d8ebd4100942..3e4e9356b53c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -190,7 +190,7 @@ org.jacoco jacoco-maven-plugin - 0.8.7 + 0.8.8 org.apache.maven.plugins From f9409f46d0f5215ca181608e1451db39fc89326c Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 6 Apr 2022 16:16:19 -0400 Subject: [PATCH 346/794] test: versioning maven-failsafe-plugin and maven-surefire-plugin together (#460) * test: versioning maven-failsafe-plugin and maven-surefire-plugin * deps: surefire v3.0.0-m6 --- java-shared-config/pom.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 3e4e9356b53c..288a50a17e3f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -64,6 +64,7 @@ false true 1.9 + 3.0.0-M6 /java/docs/reference/ @@ -85,7 +86,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + ${surefire.version} @@ -98,7 +99,7 @@ org.apache.maven.surefire surefire-junit47 - 3.0.0-M5 + ${surefire.version} @@ -129,7 +130,8 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0-M4 + + ${surefire.version} 3600 sponge_log @@ -142,7 +144,7 @@ org.apache.maven.surefire surefire-junit47 - 3.0.0-M4 + ${surefire.version} From c9b18c9f0d0e47fb690d38545df33b1cbaac92e3 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 6 Apr 2022 13:17:11 -0700 Subject: [PATCH 347/794] chore: Enable Size-Label bot in all googleapis Java repositories (#1381) (#464) * chore: Enable Size-Label bot in all googleapis Java repositories Auto-label T-shirt size indicator should be assigned on every new pull request in all googleapis Java repositories * Remove product Remove product since it is by default true * add license header Co-authored-by: Neenu Shaji Source-Link: https://github.com/googleapis/synthtool/commit/54b2c6ac75370a4a3582431b4a3080f777ba1f11 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813 Co-authored-by: Owl Bot Co-authored-by: Neenu Shaji --- java-shared-config/.github/.OwlBot.lock.yaml | 3 ++- java-shared-config/.github/auto-label.yaml | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 java-shared-config/.github/auto-label.yaml diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 426cf83e2ec6..f60d774937f6 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,4 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:b0b1c1c89570e229b1026372a2b8989ba31495007055b8d30178b7648503eefa + digest: sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813 +# created: 2022-04-06T16:30:03.627422514Z diff --git a/java-shared-config/.github/auto-label.yaml b/java-shared-config/.github/auto-label.yaml new file mode 100644 index 000000000000..4caef688b745 --- /dev/null +++ b/java-shared-config/.github/auto-label.yaml @@ -0,0 +1,15 @@ +# 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. +# 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. +requestsize: + enabled: true From 66b5d56325cb09e4861be3b46ded10d73dc73ffa Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 18 Apr 2022 16:49:23 -0400 Subject: [PATCH 348/794] fix(java): remove protobuf feature from native profile (#461) --- java-shared-config/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 288a50a17e3f..66bd316d71ad 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -833,7 +833,6 @@ --no-fallback --no-server - --features=com.google.cloud.nativeimage.features.ProtobufMessageFeature From ae2b96233109f52a0269edcfded8fc50863c9971 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 19 Apr 2022 00:46:59 +0200 Subject: [PATCH 349/794] deps: update dependency com.google.cloud:native-image-support to v0.13.1 (#465) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 66bd316d71ad..9d7fac836d30 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -778,7 +778,7 @@ com.google.cloud native-image-support - 0.12.11 + 0.13.1 test From 3b89b0d65b33f157b515281b42f98ebb3f247da6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 18:16:23 +0000 Subject: [PATCH 350/794] chore(main): release 1.3.3-SNAPSHOT (#458) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9d7fac836d30..2127fde78215 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.3.2 + 1.3.3-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 5079fd28da3b..e26ffec8b738 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.3.2:1.3.2 +google-cloud-shared-config:1.3.2:1.3.3-SNAPSHOT From 0652bc5f99ab80806417fd50b83aef624c5fae78 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 20:34:19 +0000 Subject: [PATCH 351/794] chore(main): release 1.3.3 (#466) :robot: I have created a release *beep* *boop* --- ### [1.3.3](https://github.com/googleapis/java-shared-config/compare/v1.3.2...v1.3.3) (2022-04-19) ### Bug Fixes * **java:** remove protobuf feature from native profile ([#461](https://github.com/googleapis/java-shared-config/issues/461)) ([66b5d56](https://github.com/googleapis/java-shared-config/commit/66b5d56325cb09e4861be3b46ded10d73dc73ffa)) ### Dependencies * update dependency com.google.cloud:native-image-support to v0.12.11 ([#459](https://github.com/googleapis/java-shared-config/issues/459)) ([cd4244c](https://github.com/googleapis/java-shared-config/commit/cd4244cc2e5b254a0b982a78cc7f97e8db0982b8)) * update dependency com.google.cloud:native-image-support to v0.13.1 ([#465](https://github.com/googleapis/java-shared-config/issues/465)) ([ae2b962](https://github.com/googleapis/java-shared-config/commit/ae2b96233109f52a0269edcfded8fc50863c9971)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 13 +++++++++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index d889322c57f4..cc875d873946 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +### [1.3.3](https://github.com/googleapis/java-shared-config/compare/v1.3.2...v1.3.3) (2022-04-19) + + +### Bug Fixes + +* **java:** remove protobuf feature from native profile ([#461](https://github.com/googleapis/java-shared-config/issues/461)) ([ffd07cb](https://github.com/googleapis/java-shared-config/commit/ffd07cb18ee7d45d4daee1d9ea6f6d321fdca874)) + + +### Dependencies + +* update dependency com.google.cloud:native-image-support to v0.12.11 ([#459](https://github.com/googleapis/java-shared-config/issues/459)) ([d20008d](https://github.com/googleapis/java-shared-config/commit/d20008df15209708fdf9d06828b567778190f4d0)) +* update dependency com.google.cloud:native-image-support to v0.13.1 ([#465](https://github.com/googleapis/java-shared-config/issues/465)) ([b202064](https://github.com/googleapis/java-shared-config/commit/b2020648816feb4740ad70acedfed470d7da5bcf)) + ### [1.3.2](https://github.com/googleapis/java-shared-config/compare/v1.3.1...v1.3.2) (2022-03-28) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2127fde78215..cd599903f755 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.3.3-SNAPSHOT + 1.3.3 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index e26ffec8b738..1aca0482fa20 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.3.2:1.3.3-SNAPSHOT +google-cloud-shared-config:1.3.3:1.3.3 From 346f455a8123c02331fb65752e7ac92150c413e7 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 21 Apr 2022 16:38:18 +0200 Subject: [PATCH 352/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.4.0 (#469) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-javadoc-plugin](https://maven.apache.org/plugins/) | `3.3.2` -> `3.4.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.4.0/compatibility-slim/3.3.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.4.0/confidence-slim/3.3.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index cd599903f755..2865b203afee 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -467,7 +467,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.0 html @@ -567,7 +567,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.0 attach-javadocs @@ -698,7 +698,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.2 + 3.4.0 com.microsoft.doclet.DocFxDoclet false From 06f770219cfd1b11c4a8cf785fa05c0517f30014 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 21 Apr 2022 16:40:13 +0200 Subject: [PATCH 353/794] build(deps): update dependency org.apache.maven.plugins:maven-site-plugin to v3.12.0 (#468) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-site-plugin](https://maven.apache.org/plugins/) ([source](https://togithub.com/apache/maven-site-plugin)) | `3.11.0` -> `3.12.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-site-plugin/3.12.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-site-plugin/3.12.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-site-plugin/3.12.0/compatibility-slim/3.11.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-site-plugin/3.12.0/confidence-slim/3.11.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2865b203afee..b2777ff83014 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-site-plugin - 3.11.0 + 3.12.0 true From 4be9f1a99a3f46c998c18920ce7dc48e8535828a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 21 Apr 2022 19:34:28 +0200 Subject: [PATCH 354/794] build(deps): update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.6.13 (#470) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.sonatype.plugins:nexus-staging-maven-plugin](http://www.sonatype.com/) ([source](https://togithub.com/sonatype/nexus-maven-plugins)) | `1.6.12` -> `1.6.13` | [![age](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.13/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.13/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.13/compatibility-slim/1.6.12)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.sonatype.plugins:nexus-staging-maven-plugin/1.6.13/confidence-slim/1.6.12)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
sonatype/nexus-maven-plugins ### [`v1.6.13`](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.12...release-1.6.13) [Compare Source](https://togithub.com/sonatype/nexus-maven-plugins/compare/release-1.6.12...release-1.6.13)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b2777ff83014..052003f777ea 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -74,7 +74,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.12 + 1.6.13 true ossrh From 4a7af52555bd722a882a6e9ffa81c3abd36abd0d Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Wed, 27 Apr 2022 17:53:47 -0400 Subject: [PATCH 355/794] feat(java): remove native image module (#471) --- java-shared-config/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 052003f777ea..693787c7314a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -775,12 +775,6 @@ native - - com.google.cloud - native-image-support - 0.13.1 - test - org.junit.vintage From 5c11d99d1ff8e58996813c7e5a82d0e765314be3 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 28 Apr 2022 16:34:38 +0000 Subject: [PATCH 356/794] chore(main): release 1.3.4-SNAPSHOT (#467) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 693787c7314a..f8464e392aa7 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.3.3 + 1.3.4-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 1aca0482fa20..e1d06be19b3b 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.3.3:1.3.3 +google-cloud-shared-config:1.3.3:1.3.4-SNAPSHOT From 320c562886753d50e496314d32a6bb166724f3e9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 28 Apr 2022 19:10:13 +0000 Subject: [PATCH 357/794] chore(main): release 1.4.0 (#473) :robot: I have created a release *beep* *boop* --- ## [1.4.0](https://github.com/googleapis/java-shared-config/compare/v1.3.3...v1.4.0) (2022-04-28) ### Features * **java:** remove native image module ([#471](https://github.com/googleapis/java-shared-config/issues/471)) ([4a7af52](https://github.com/googleapis/java-shared-config/commit/4a7af52555bd722a882a6e9ffa81c3abd36abd0d)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index cc875d873946..1a551fa93df6 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.4.0](https://github.com/googleapis/java-shared-config/compare/v1.3.3...v1.4.0) (2022-04-28) + + +### Features + +* **java:** remove native image module ([#471](https://github.com/googleapis/java-shared-config/issues/471)) ([7fcba01](https://github.com/googleapis/java-shared-config/commit/7fcba016b3138d7beaa4e962853f9bc80f59438c)) + ### [1.3.3](https://github.com/googleapis/java-shared-config/compare/v1.3.2...v1.3.3) (2022-04-19) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index f8464e392aa7..57e88aca1f00 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.3.4-SNAPSHOT + 1.4.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index e1d06be19b3b..f8b8c72e8d14 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.3.3:1.3.4-SNAPSHOT +google-cloud-shared-config:1.4.0:1.4.0 From c57e1aae9020c4a6d5e3edbae045cf7bd175feda Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 6 May 2022 00:36:24 +0200 Subject: [PATCH 358/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.3.0 (#472) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-project-info-reports-plugin](https://maven.apache.org/plugins/) ([source](https://togithub.com/apache/maven-project-info-reports-plugin)) | `3.1.2` -> `3.3.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.3.0/compatibility-slim/3.1.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.3.0/confidence-slim/3.1.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 57e88aca1f00..bc941914028c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -440,7 +440,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.2 + 3.3.0 From 80ce03bcbd6c55746d978b4da99a115372bb8ec2 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 17 May 2022 20:02:13 +0000 Subject: [PATCH 359/794] chore(main): release 1.4.1-SNAPSHOT (#474) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index bc941914028c..c11f452b348f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.4.0 + 1.4.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index f8b8c72e8d14..8c37c77f3f6c 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.4.0:1.4.0 +google-cloud-shared-config:1.4.0:1.4.1-SNAPSHOT From 3945cc2ebf1b80a9a89e8148cb6793f24d1ec388 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 19 May 2022 21:02:24 +0000 Subject: [PATCH 360/794] feat: add build scripts for native image testing in Java 17 (#1440) (#475) Source-Link: https://github.com/googleapis/synthtool/commit/505ce5a7edb58bf6d9d4de10b4bb4e81000ae324 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:2567a120ce90fadb6201999b87d649d9f67459de28815ad239bce9ebfaa18a74 --- java-shared-config/.github/.OwlBot.lock.yaml | 4 +-- java-shared-config/.kokoro/build.sh | 5 +++ .../.kokoro/presubmit/graalvm-native-17.cfg | 33 +++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index f60d774937f6..a79f06271b60 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813 -# created: 2022-04-06T16:30:03.627422514Z + digest: sha256:2567a120ce90fadb6201999b87d649d9f67459de28815ad239bce9ebfaa18a74 +# created: 2022-05-19T15:12:45.278246753Z diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index 6ba544a2cc78..81635ed0c337 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -74,6 +74,11 @@ graalvm) mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test RETURN_CODE=$? ;; +graalvm17) + # Run Unit and Integration Tests with Native Image + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test + RETURN_CODE=$? + ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg b/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg new file mode 100644 index 000000000000..a3f7fb9d4943 --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm17" +} + +# 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: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} \ No newline at end of file From 94ba4beaadd9d60907a666e7c0a23a6bb79b79b2 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 10 Jun 2022 12:30:17 -0400 Subject: [PATCH 361/794] ci: removing dependencies (8) from required checks (#479) --- java-shared-config/.github/sync-repo-settings.yaml | 5 ----- .../.github/workflows/downstream-dependencies.yaml | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index c3a74079fac8..7547b27e9379 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -36,11 +36,6 @@ branchProtectionRules: - "units (8)" - "units (11)" - "Kokoro - Test: Integration" - - "dependencies (8, java-bigquery)" - - "dependencies (8, java-bigqueryconnection)" - - "dependencies (8, java-spanner)" - - "dependencies (8, java-storage)" - - "dependencies (8, java-pubsub)" - "dependencies (11, java-bigquery)" - "dependencies (11, java-bigqueryconnection)" - "dependencies (11, java-spanner)" diff --git a/java-shared-config/.github/workflows/downstream-dependencies.yaml b/java-shared-config/.github/workflows/downstream-dependencies.yaml index 58c60f9d0f40..22dc3123f818 100644 --- a/java-shared-config/.github/workflows/downstream-dependencies.yaml +++ b/java-shared-config/.github/workflows/downstream-dependencies.yaml @@ -27,3 +27,5 @@ jobs: - run: sudo apt-get update -y - run: sudo apt-get install libxml2-utils - run: .kokoro/client-library-check.sh ${{matrix.repo}} dependencies + if: ${{matrix.java != '8' }} + # Always successful for Java 8, which we'll remove soon From cf14e3a379f242b754acaca03c719ffc679f8325 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 10 Jun 2022 16:12:24 -0400 Subject: [PATCH 362/794] ci: release=8 for JDK 9+ (#478) * ci: release=8 for JDK 9+ * ci: removing "dependencies (8)" --- java-shared-config/.github/sync-repo-settings.yaml | 1 - .../.github/workflows/downstream-dependencies.yaml | 4 +--- java-shared-config/pom.xml | 13 ++++++++++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index 7547b27e9379..ca2e4cf14085 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -29,7 +29,6 @@ branchProtectionRules: requiresStrictStatusChecks: false # List of required status check contexts that must pass for commits to be accepted to matching branches. requiredStatusCheckContexts: - - "dependencies (8)" - "dependencies (11)" - "lint" - "clirr" diff --git a/java-shared-config/.github/workflows/downstream-dependencies.yaml b/java-shared-config/.github/workflows/downstream-dependencies.yaml index 22dc3123f818..5911098d844b 100644 --- a/java-shared-config/.github/workflows/downstream-dependencies.yaml +++ b/java-shared-config/.github/workflows/downstream-dependencies.yaml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - java: [8, 11] + java: [11] repo: - java-bigquery - java-bigqueryconnection @@ -27,5 +27,3 @@ jobs: - run: sudo apt-get update -y - run: sudo apt-get install libxml2-utils - run: .kokoro/client-library-check.sh ${{matrix.repo}} dependencies - if: ${{matrix.java != '8' }} - # Always successful for Java 8, which we'll remove soon diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index c11f452b348f..b43ab556e824 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -833,6 +833,17 @@ - + + + compiler-release-8 + + [9,] + + + 8 + + From a1c79529119ebc7ce0fa87d27396c440abcd605b Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Sat, 11 Jun 2022 00:26:12 +0200 Subject: [PATCH 363/794] build(deps): update surefire.version to v3.0.0-m7 (#480) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.surefire:surefire-junit47](https://maven.apache.org/surefire/) | `3.0.0-M6` -> `3.0.0-M7` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.surefire:surefire-junit47/3.0.0-M7/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.surefire:surefire-junit47/3.0.0-M7/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.surefire:surefire-junit47/3.0.0-M7/compatibility-slim/3.0.0-M6)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.surefire:surefire-junit47/3.0.0-M7/confidence-slim/3.0.0-M6)](https://docs.renovatebot.com/merge-confidence/) | | [org.apache.maven.plugins:maven-failsafe-plugin](https://maven.apache.org/surefire/) | `3.0.0-M6` -> `3.0.0-M7` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-failsafe-plugin/3.0.0-M7/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-failsafe-plugin/3.0.0-M7/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-failsafe-plugin/3.0.0-M7/compatibility-slim/3.0.0-M6)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-failsafe-plugin/3.0.0-M7/confidence-slim/3.0.0-M6)](https://docs.renovatebot.com/merge-confidence/) | | [org.apache.maven.plugins:maven-surefire-plugin](https://maven.apache.org/surefire/) | `3.0.0-M6` -> `3.0.0-M7` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.0.0-M7/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.0.0-M7/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.0.0-M7/compatibility-slim/3.0.0-M6)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.0.0-M7/confidence-slim/3.0.0-M6)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b43ab556e824..332ed47c88c5 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -64,7 +64,7 @@ false true 1.9 - 3.0.0-M6 + 3.0.0-M7 /java/docs/reference/ From e370c1c27304f87fd9170fe15a128482e87a7529 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Sat, 11 Jun 2022 02:06:13 +0000 Subject: [PATCH 364/794] chore(main): release 1.5.0 (#476) :robot: I have created a release *beep* *boop* --- ## [1.5.0](https://github.com/googleapis/java-shared-config/compare/v1.4.0...v1.5.0) (2022-06-10) ### Features * add build scripts for native image testing in Java 17 ([#1440](https://github.com/googleapis/java-shared-config/issues/1440)) ([#475](https://github.com/googleapis/java-shared-config/issues/475)) ([3945cc2](https://github.com/googleapis/java-shared-config/commit/3945cc2ebf1b80a9a89e8148cb6793f24d1ec388)) * to produce Java 8 compatible bytecode when using JDK 9+ ([cf14e3a](https://github.com/googleapis/java-shared-config/commit/cf14e3a379f242b754acaca03c719ffc679f8325)) ### Dependencies * update surefire.version to v3.0.0-m7 ([a1c7952](https://github.com/googleapis/java-shared-config/commit/a1c79529119ebc7ce0fa87d27396c440abcd605b)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 13 +++++++++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 1a551fa93df6..2c57a505e905 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [1.5.0](https://github.com/googleapis/java-shared-config/compare/v1.4.0...v1.5.0) (2022-06-10) + + +### Features + +* add build scripts for native image testing in Java 17 ([#1440](https://github.com/googleapis/java-shared-config/issues/1440)) ([#475](https://github.com/googleapis/java-shared-config/issues/475)) ([e4dfc1b](https://github.com/googleapis/java-shared-config/commit/e4dfc1ba29295158c78c8fcf94467d2a6a33538a)) +* to produce Java 8 compatible bytecode when using JDK 9+ ([2468276](https://github.com/googleapis/java-shared-config/commit/2468276145cdfe1ca911b52f765e026e77661a09)) + + +### Dependencies + +* update surefire.version to v3.0.0-m7 ([bbfe663](https://github.com/googleapis/java-shared-config/commit/bbfe66393af3e49612c9c1e4334ba39c133ea1d0)) + ## [1.4.0](https://github.com/googleapis/java-shared-config/compare/v1.3.3...v1.4.0) (2022-04-28) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 332ed47c88c5..b88c29f4ddf9 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.4.1-SNAPSHOT + 1.5.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 8c37c77f3f6c..fb445a801632 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.4.0:1.4.1-SNAPSHOT +google-cloud-shared-config:1.5.0:1.5.0 From 055c730f358e27aab74a268ba11fe6a0d18f850d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 15 Jun 2022 18:30:16 +0200 Subject: [PATCH 365/794] build(deps): update dependency org.codehaus.mojo:animal-sniffer-maven-plugin to v1.21 (#416) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.codehaus.mojo:animal-sniffer-maven-plugin](https://www.mojohaus.org/animal-sniffer) ([source](https://togithub.com/mojohaus/animal-sniffer)) | `1.20` -> `1.21` | [![age](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:animal-sniffer-maven-plugin/1.21/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:animal-sniffer-maven-plugin/1.21/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:animal-sniffer-maven-plugin/1.21/compatibility-slim/1.20)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:animal-sniffer-maven-plugin/1.21/confidence-slim/1.20)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b88c29f4ddf9..9f601a5128c4 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -415,7 +415,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.20 + 1.21 java8 From b3c18b4513ba75df0acc3678bcd52fc43d824058 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 22 Jun 2022 02:06:31 +0200 Subject: [PATCH 366/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.12 (#483) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.11` -> `0.9.12` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.12/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.12/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.12/compatibility-slim/0.9.11)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.12/confidence-slim/0.9.11)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.12`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.12) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.11...0.9.12) #### What's Changed Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog). - Add Mockito / Byte Buddy support documentation by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/236](https://togithub.com/graalvm/native-build-tools/pull/236) - Prevent builds from failing if no test list is present by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/239](https://togithub.com/graalvm/native-build-tools/pull/239) - Support different agent modes in the native-image Gradle plugin by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/230](https://togithub.com/graalvm/native-build-tools/pull/230) - JVM Reachability Metadata support for Maven by [@​alvarosanchez](https://togithub.com/alvarosanchez) in [https://github.com/graalvm/native-build-tools/pull/240](https://togithub.com/graalvm/native-build-tools/pull/240) - Warn about deprecated agent DSL by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/242](https://togithub.com/graalvm/native-build-tools/pull/242) - Rework Maven plugin by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/247](https://togithub.com/graalvm/native-build-tools/pull/247) - Add Gradle rich output support, configure default metadata URL on Maven by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/249](https://togithub.com/graalvm/native-build-tools/pull/249) - Fix wrong scope for test dependencies by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/251](https://togithub.com/graalvm/native-build-tools/pull/251) - Add documentation for alternative build systems. by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/248](https://togithub.com/graalvm/native-build-tools/pull/248) **Full Changelog**: https://github.com/graalvm/native-build-tools/compare/0.9.11...0.9.12
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9f601a5128c4..ed1aa489256f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -812,7 +812,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.11 + 0.9.12 true From f61389944011e287b3df46febca7128a01d7589b Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 22 Jun 2022 02:08:15 +0200 Subject: [PATCH 367/794] deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.12 (#482) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.11` -> `0.9.12` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.12/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.12/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.12/compatibility-slim/0.9.11)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.12/confidence-slim/0.9.11)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.12`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.12) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.11...0.9.12) #### What's Changed Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog). - Add Mockito / Byte Buddy support documentation by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/236](https://togithub.com/graalvm/native-build-tools/pull/236) - Prevent builds from failing if no test list is present by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/239](https://togithub.com/graalvm/native-build-tools/pull/239) - Support different agent modes in the native-image Gradle plugin by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/230](https://togithub.com/graalvm/native-build-tools/pull/230) - JVM Reachability Metadata support for Maven by [@​alvarosanchez](https://togithub.com/alvarosanchez) in [https://github.com/graalvm/native-build-tools/pull/240](https://togithub.com/graalvm/native-build-tools/pull/240) - Warn about deprecated agent DSL by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/242](https://togithub.com/graalvm/native-build-tools/pull/242) - Rework Maven plugin by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/247](https://togithub.com/graalvm/native-build-tools/pull/247) - Add Gradle rich output support, configure default metadata URL on Maven by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/249](https://togithub.com/graalvm/native-build-tools/pull/249) - Fix wrong scope for test dependencies by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/251](https://togithub.com/graalvm/native-build-tools/pull/251) - Add documentation for alternative build systems. by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/248](https://togithub.com/graalvm/native-build-tools/pull/248) **Full Changelog**: https://github.com/graalvm/native-build-tools/compare/0.9.11...0.9.12
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ed1aa489256f..cc9e5d767665 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -786,7 +786,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.11 + 0.9.12 test From 2e1526831474d354951079cb201cc42e3c0f87a3 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 22 Jun 2022 19:14:11 +0000 Subject: [PATCH 368/794] chore(main): release 1.5.1-SNAPSHOT (#481) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index cc9e5d767665..a84d3b1036de 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.0 + 1.5.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index fb445a801632..83767a919864 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.0:1.5.0 +google-cloud-shared-config:1.5.0:1.5.1-SNAPSHOT From 0da6a9e1ca81a9f5c40155adb03dae0f7c4fa3e0 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 27 Jun 2022 19:24:34 +0000 Subject: [PATCH 369/794] chore: update dependencies for regapic (#1467) (#485) * chore: update dependencies for regapic * add more dependencies and trigger comment * update goldens * fix indentation * remove duplicate gax-httpjson dependency * remove duplicated dependencies Source-Link: https://github.com/googleapis/synthtool/commit/fa54eb2a78c6ee48613fd33152e2130e949dcbd9 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:1ec28a46062b19135b11178ceee60231e5f5a92dab454e23ae0aab72cd875906 --- java-shared-config/.github/.OwlBot.lock.yaml | 4 ++-- java-shared-config/.kokoro/common.sh | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index a79f06271b60..f0625e4d9459 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:2567a120ce90fadb6201999b87d649d9f67459de28815ad239bce9ebfaa18a74 -# created: 2022-05-19T15:12:45.278246753Z + digest: sha256:1ec28a46062b19135b11178ceee60231e5f5a92dab454e23ae0aab72cd875906 +# created: 2022-06-27T15:01:06.405564326Z diff --git a/java-shared-config/.kokoro/common.sh b/java-shared-config/.kokoro/common.sh index ace89f45a9de..f8f957af1112 100644 --- a/java-shared-config/.kokoro/common.sh +++ b/java-shared-config/.kokoro/common.sh @@ -55,4 +55,6 @@ function retry_with_backoff { ## Helper functionss function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; } function msg() { println "$*" >&2; } -function println() { printf '%s\n' "$(now) $*"; } \ No newline at end of file +function println() { printf '%s\n' "$(now) $*"; } + +## Helper comment to trigger updated repo dependency release \ No newline at end of file From a16445a846dac0cc5163c1b392b662bb5a77f37b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 30 Jun 2022 02:20:30 +0000 Subject: [PATCH 370/794] chore: Disable CLIRR checks on releas (#1474) (#486) Source-Link: https://github.com/googleapis/synthtool/commit/7a220e27993a25ab3cda26510d5619d97b6952a9 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:6d4e3a15c62cfdcb823d60e16da7521e7c6fc00eba07c8ff12e4de9924a57d28 --- java-shared-config/.github/.OwlBot.lock.yaml | 4 ++-- java-shared-config/.kokoro/release/stage.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index f0625e4d9459..a454a61e8dc2 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:1ec28a46062b19135b11178ceee60231e5f5a92dab454e23ae0aab72cd875906 -# created: 2022-06-27T15:01:06.405564326Z + digest: sha256:6d4e3a15c62cfdcb823d60e16da7521e7c6fc00eba07c8ff12e4de9924a57d28 +# created: 2022-06-29T23:17:33.110417661Z diff --git a/java-shared-config/.kokoro/release/stage.sh b/java-shared-config/.kokoro/release/stage.sh index 77dc4e8f0f3a..1dba8de10857 100755 --- a/java-shared-config/.kokoro/release/stage.sh +++ b/java-shared-config/.kokoro/release/stage.sh @@ -32,6 +32,7 @@ retry_with_backoff 3 10 \ mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DskipTests=true \ + -Dclirr.skip=true \ -DperformRelease=true \ -Dgpg.executable=gpg \ -Dgpg.passphrase=${GPG_PASSPHRASE} \ @@ -42,4 +43,4 @@ then mvn nexus-staging:release -B \ -DperformRelease=true \ --settings=settings.xml -fi \ No newline at end of file +fi From a098a92b4c00ae1f98fc151994a6eab822cc5bed Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 1 Jul 2022 17:30:29 +0000 Subject: [PATCH 371/794] chore(main): release 1.5.1 (#484) :robot: I have created a release *beep* *boop* --- ## [1.5.1](https://github.com/googleapis/java-shared-config/compare/v1.5.0...v1.5.1) (2022-06-30) ### Dependencies * update dependency org.graalvm.buildtools:junit-platform-native to v0.9.12 ([#482](https://github.com/googleapis/java-shared-config/issues/482)) ([f613899](https://github.com/googleapis/java-shared-config/commit/f61389944011e287b3df46febca7128a01d7589b)) * update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.12 ([#483](https://github.com/googleapis/java-shared-config/issues/483)) ([b3c18b4](https://github.com/googleapis/java-shared-config/commit/b3c18b4513ba75df0acc3678bcd52fc43d824058)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 8 ++++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 2c57a505e905..08257dbb3d27 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [1.5.1](https://github.com/googleapis/java-shared-config/compare/v1.5.0...v1.5.1) (2022-06-30) + + +### Dependencies + +* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.12 ([#482](https://github.com/googleapis/java-shared-config/issues/482)) ([fbfc6dc](https://github.com/googleapis/java-shared-config/commit/fbfc6dc1329faaead3a3114c8599d9267722e7f0)) +* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.12 ([#483](https://github.com/googleapis/java-shared-config/issues/483)) ([336cb78](https://github.com/googleapis/java-shared-config/commit/336cb7827b36583228c9e2b85871ae72f4c55975)) + ## [1.5.0](https://github.com/googleapis/java-shared-config/compare/v1.4.0...v1.5.0) (2022-06-10) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index a84d3b1036de..1ff73faf7b41 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.1-SNAPSHOT + 1.5.1 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 83767a919864..85f6fbe77039 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.0:1.5.1-SNAPSHOT +google-cloud-shared-config:1.5.1:1.5.1 From 2ce67a6d7abf862e8e3cff27ca943fa212802c4b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 13 Jul 2022 19:30:12 +0000 Subject: [PATCH 372/794] fix: enable longpaths support for windows test (#1485) (#490) Source-Link: https://github.com/googleapis/synthtool/commit/73365620c41d96e97ff474b2c4d39b890ad51967 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:d4b80feffe1579818cdc39466152e9de95789a193408506cd4a1ffbe8804dc00 --- java-shared-config/.github/.OwlBot.lock.yaml | 4 ++-- java-shared-config/.github/workflows/ci.yaml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index a454a61e8dc2..de9173d95efb 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:6d4e3a15c62cfdcb823d60e16da7521e7c6fc00eba07c8ff12e4de9924a57d28 -# created: 2022-06-29T23:17:33.110417661Z + digest: sha256:d4b80feffe1579818cdc39466152e9de95789a193408506cd4a1ffbe8804dc00 +# created: 2022-07-13T13:53:17.676447481Z diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index 83ef7f9c2cf3..e3bb26e37719 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -39,6 +39,8 @@ jobs: windows: runs-on: windows-latest steps: + - name: Support longpaths + run: git config --system core.longpaths true - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: From 438fcc8c328c8236a1fb4a4c9ab982ae99977b83 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 13 Jul 2022 23:59:11 +0200 Subject: [PATCH 373/794] deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.13 (#488) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 1ff73faf7b41..8f6b88a1dc8a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -786,7 +786,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.12 + 0.9.13 test From 338fee2c1e9747494c1de6a1dccb118dcbc02fa8 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 13 Jul 2022 23:59:21 +0200 Subject: [PATCH 374/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.13 (#489) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 8f6b88a1dc8a..33b7be568b11 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -812,7 +812,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.12 + 0.9.13 true From 5a755b6970a77f083a398063cbd3dbaeb3236e3c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 14 Jul 2022 14:18:32 +0000 Subject: [PATCH 375/794] chore(main): release 1.5.2-SNAPSHOT (#487) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 33b7be568b11..a7f20fbb1a2f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.1 + 1.5.2-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 85f6fbe77039..80efaab49733 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.1:1.5.1 +google-cloud-shared-config:1.5.1:1.5.2-SNAPSHOT From da63389547928a36663bc10cd4896eb41983a67e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 15 Jul 2022 18:50:17 +0200 Subject: [PATCH 376/794] build(deps): update dependency org.codehaus.mojo:exec-maven-plugin to v3.1.0 (#492) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.codehaus.mojo:exec-maven-plugin](https://www.mojohaus.org/exec-maven-plugin) ([source](https://togithub.com/mojohaus/exec-maven-plugin)) | `3.0.0` -> `3.1.0` | [![age](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:exec-maven-plugin/3.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:exec-maven-plugin/3.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:exec-maven-plugin/3.1.0/compatibility-slim/3.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:exec-maven-plugin/3.1.0/confidence-slim/3.0.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index a7f20fbb1a2f..092e8eb5b318 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -118,7 +118,7 @@ org.codehaus.mojo exec-maven-plugin - 3.0.0 + 3.1.0 If you want to rebase/retry this PR, click this checkbox. ⚠ **Warning**: custom changes will be lost. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 42a7927f6203..aa3248bc835e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -106,12 +106,12 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M3 + 3.1.0 org.codehaus.mojo extra-enforcer-rules - 1.3 + 1.6.0 From 29b3b49ec61f1ee6eda3337051af5589681f32b6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 18 Jul 2022 22:04:12 +0200 Subject: [PATCH 379/794] build(deps): update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.3.0 (#400) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-dependency-plugin](https://maven.apache.org/plugins/) | `3.1.2` -> `3.3.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-dependency-plugin/3.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-dependency-plugin/3.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-dependency-plugin/3.3.0/compatibility-slim/3.1.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-dependency-plugin/3.3.0/confidence-slim/3.1.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index aa3248bc835e..8ad9408e5c3e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -197,12 +197,21 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.2 + 3.3.0 javax.annotation:javax.annotation-api + + + io.grpc:* + + com.google.protobuf:* + + com.google.api.grpc:* + + From bedccafab5e283d9c0a5c7b952823332d5ef32ac Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 19 Jul 2022 01:52:44 +0200 Subject: [PATCH 380/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10 (#435) * Skip checkstyle on Java 8 builds --- java-shared-config/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 8ad9408e5c3e..71f20a9ab626 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -628,10 +628,10 @@ - + checkstyle-tests - [1.8,) + [1.11,) @@ -643,7 +643,7 @@ com.puppycrawl.tools checkstyle - 9.3 + 10.3.1 From 01cbff767dcfc66587c529b073bdc98815705d4e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 20:32:16 +0000 Subject: [PATCH 381/794] chore(main): release 1.5.2 (#491) :robot: I have created a release *beep* *boop* --- ## [1.5.2](https://github.com/googleapis/java-shared-config/compare/v1.5.1...v1.5.2) (2022-07-25) ### Dependencies * update dependency com.puppycrawl.tools:checkstyle to v10 ([#435](https://github.com/googleapis/java-shared-config/issues/435)) ([bedccaf](https://github.com/googleapis/java-shared-config/commit/bedccafab5e283d9c0a5c7b952823332d5ef32ac)) * update dependency org.graalvm.buildtools:junit-platform-native to v0.9.13 ([#488](https://github.com/googleapis/java-shared-config/issues/488)) ([438fcc8](https://github.com/googleapis/java-shared-config/commit/438fcc8c328c8236a1fb4a4c9ab982ae99977b83)) * update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.13 ([#489](https://github.com/googleapis/java-shared-config/issues/489)) ([338fee2](https://github.com/googleapis/java-shared-config/commit/338fee2c1e9747494c1de6a1dccb118dcbc02fa8)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 9 +++++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 08257dbb3d27..9a27826f5818 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [1.5.2](https://github.com/googleapis/java-shared-config/compare/v1.5.1...v1.5.2) (2022-07-25) + + +### Dependencies + +* update dependency com.puppycrawl.tools:checkstyle to v10 ([#435](https://github.com/googleapis/java-shared-config/issues/435)) ([bfc8ce1](https://github.com/googleapis/java-shared-config/commit/bfc8ce1deca6292147d002d3afe22a09840aa5d6)) +* update dependency org.graalvm.buildtools:junit-platform-native to v0.9.13 ([#488](https://github.com/googleapis/java-shared-config/issues/488)) ([39b91ee](https://github.com/googleapis/java-shared-config/commit/39b91ee1283f0a5fbbe63e8bfd1ec97ab4ab377e)) +* update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.13 ([#489](https://github.com/googleapis/java-shared-config/issues/489)) ([cc3bcfa](https://github.com/googleapis/java-shared-config/commit/cc3bcfa2d6717441a8d5b5048fa78c2cf7aabf2b)) + ## [1.5.1](https://github.com/googleapis/java-shared-config/compare/v1.5.0...v1.5.1) (2022-06-30) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 71f20a9ab626..25655bdd63e2 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.2-SNAPSHOT + 1.5.2 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 80efaab49733..9c1908b9c388 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.1:1.5.2-SNAPSHOT +google-cloud-shared-config:1.5.2:1.5.2 From 2ff06f0e3bdfbf4359caec7a2687fb62f3c06877 Mon Sep 17 00:00:00 2001 From: Mike Eltsufin Date: Wed, 27 Jul 2022 10:51:08 -0400 Subject: [PATCH 382/794] chore: Allow docletPath to be specified as a user property (#496) --- java-shared-config/pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 25655bdd63e2..c4fbcc072175 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -695,6 +695,7 @@ java-docfx-doclet-1.5.0 + ${env.KOKORO_GFILE_DIR}/${docletName}.jar ${project.build.directory}/docfx-yml ${project.artifactId} @@ -710,9 +711,7 @@ 3.4.0 com.microsoft.doclet.DocFxDoclet - false - - ${env.KOKORO_GFILE_DIR}/${docletName}.jar + false -outputpath ${outputpath} -projectname ${projectname} From 813b53a9059bb9ffd588cb187e0cb0c34caf7773 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 27 Jul 2022 16:52:34 +0200 Subject: [PATCH 383/794] deps: update dependency org.junit.vintage:junit-vintage-engine to v5.9.0 (#497) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index c4fbcc072175..eef792a01268 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -787,7 +787,7 @@ org.junit.vintage junit-vintage-engine - 5.8.2 + 5.9.0 test From cda9e917659cbe037104aa5ed33b81180527b2da Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 27 Jul 2022 14:56:12 +0000 Subject: [PATCH 384/794] chore(main): release 1.5.3-SNAPSHOT (#495) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index eef792a01268..fb7937a0950b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.2 + 1.5.3-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 9c1908b9c388..0e7cce0d54bc 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.2:1.5.2 +google-cloud-shared-config:1.5.2:1.5.3-SNAPSHOT From 9aa483fa7bd25497c0d5e5e327e4435cd86e473c Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Wed, 27 Jul 2022 11:10:13 -0400 Subject: [PATCH 385/794] fix: Update doclet to latest version (#499) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly: - [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/java-shared-config/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [ ] Ensure the tests and linter pass - [ ] Code coverage does not decrease (if any source code was changed) - [ ] Appropriate docs were updated (if necessary) Fixes # ☕️ If you write sample code, please follow the [samples format]( https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index fb7937a0950b..43e70fd92010 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -694,7 +694,7 @@ - java-docfx-doclet-1.5.0 + java-docfx-doclet-1.6.0 ${env.KOKORO_GFILE_DIR}/${docletName}.jar ${project.build.directory}/docfx-yml ${project.artifactId} From c6dd4b200bb90713498129230a6efd12cdf5bdd2 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 27 Jul 2022 12:52:22 -0400 Subject: [PATCH 386/794] chore(main): release 1.5.3 (#498) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 8 ++++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 9a27826f5818..00ee16af51f8 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [1.5.3](https://github.com/googleapis/java-shared-config/compare/v1.5.2...v1.5.3) (2022-07-27) + + +### Dependencies + +* update dependency org.junit.vintage:junit-vintage-engine to v5.9.0 ([#497](https://github.com/googleapis/java-shared-config/issues/497)) ([1fc6ab4](https://github.com/googleapis/java-shared-config/commit/1fc6ab445624cd4f9c8b161d109f346a9e5ed09a)) +* Update doclet to latest version 1.6.0 ([38fb7c3](https://github.com/googleapis/java-shared-config/commit/38fb7c3957fb6c9b2da10f9e463cc93a8b80a3a4)) + ## [1.5.2](https://github.com/googleapis/java-shared-config/compare/v1.5.1...v1.5.2) (2022-07-25) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 43e70fd92010..ba319ad85faf 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.3-SNAPSHOT + 1.5.3 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 0e7cce0d54bc..838cb674c726 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.2:1.5.3-SNAPSHOT +google-cloud-shared-config:1.5.3:1.5.3 From f186941a00eaf44f4efd8e1981d09e287a5e675b Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 2 Aug 2022 20:48:26 +0200 Subject: [PATCH 387/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.3.2 (#501) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `10.3.1` -> `10.3.2` | [![age](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.3.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.3.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.3.2/compatibility-slim/10.3.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.3.2/confidence-slim/10.3.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ba319ad85faf..6d6762fd35c6 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -643,7 +643,7 @@ com.puppycrawl.tools checkstyle - 10.3.1 + 10.3.2 From 9bd4173fa24259663e33f1134633d0fe6bf29529 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 2 Aug 2022 20:54:12 +0200 Subject: [PATCH 388/794] build(deps): update dependency org.codehaus.mojo:extra-enforcer-rules to v1.6.1 (#502) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.codehaus.mojo:extra-enforcer-rules](https://www.mojohaus.org/extra-enforcer-rules/) ([source](https://togithub.com/mojohaus/extra-enforcer-rules)) | `1.6.0` -> `1.6.1` | [![age](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:extra-enforcer-rules/1.6.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:extra-enforcer-rules/1.6.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:extra-enforcer-rules/1.6.1/compatibility-slim/1.6.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:extra-enforcer-rules/1.6.1/confidence-slim/1.6.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 6d6762fd35c6..2661ec175258 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -111,7 +111,7 @@ org.codehaus.mojo extra-enforcer-rules - 1.6.0 + 1.6.1 From 33e0e55558be74718fb1adc424b3fe8adaec4c96 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 4 Aug 2022 19:10:29 +0200 Subject: [PATCH 389/794] build(deps): update dependency org.apache.maven.plugins:maven-site-plugin to v3.12.1 (#503) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-site-plugin](https://maven.apache.org/plugins/) | `3.12.0` -> `3.12.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-site-plugin/3.12.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-site-plugin/3.12.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-site-plugin/3.12.1/compatibility-slim/3.12.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-site-plugin/3.12.1/confidence-slim/3.12.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2661ec175258..91b6a8b7914e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-site-plugin - 3.12.0 + 3.12.1 true From 900cf46937181371c94d50ebb0cd966781ad3ff9 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 16 Aug 2022 20:28:19 +0200 Subject: [PATCH 390/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.4.1 (#505) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-project-info-reports-plugin](https://maven.apache.org/plugins/) ([source](https://togithub.com/apache/maven-project-info-reports-plugin)) | `3.4.0` -> `3.4.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.1/compatibility-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.1/confidence-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 91b6a8b7914e..907a0251304d 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -449,7 +449,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.0 + 3.4.1 From c957e230711cf71d04677c9eaf908b346d11a42c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 16 Aug 2022 21:32:37 +0200 Subject: [PATCH 391/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.4.1 (#504) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-javadoc-plugin](https://maven.apache.org/plugins/) | `3.4.0` -> `3.4.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.4.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.4.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.4.1/compatibility-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.4.1/confidence-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 907a0251304d..aecc68f896e1 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -476,7 +476,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.0 + 3.4.1 html @@ -576,7 +576,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.0 + 3.4.1 attach-javadocs @@ -708,7 +708,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.0 + 3.4.1 com.microsoft.doclet.DocFxDoclet false From 9018b2553c83042cbbe7b962b7d16fd877fbcd28 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 17 Aug 2022 17:28:35 +0200 Subject: [PATCH 392/794] build(deps): update dependency org.codehaus.mojo:animal-sniffer-maven-plugin to v1.22 (#506) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index aecc68f896e1..39abf71aae97 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -424,7 +424,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.21 + 1.22 java8 From cdfce95615897da449a98f4d923e2459ee06131a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 19 Aug 2022 20:32:40 +0200 Subject: [PATCH 393/794] build(deps): update dependency org.apache.maven.plugins:maven-jxr-plugin to v3.3.0 (#508) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 39abf71aae97..166516f11db4 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -517,7 +517,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.2.0 + 3.3.0 true From c0cf51ec78604c1982941114ca76493b38aaaf91 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 23 Aug 2022 23:52:12 +0200 Subject: [PATCH 394/794] build(deps): update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.2.0 (#509) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-checkstyle-plugin](https://maven.apache.org/plugins/) ([source](https://togithub.com/apache/maven-checkstyle-plugin)) | `3.1.2` -> `3.2.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-checkstyle-plugin/3.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-checkstyle-plugin/3.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-checkstyle-plugin/3.2.0/compatibility-slim/3.1.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-checkstyle-plugin/3.2.0/confidence-slim/3.1.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 166516f11db4..67142db5c63f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -638,7 +638,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.2 + 3.2.0 com.puppycrawl.tools From 34845eb760958adc6a12c3a0326ee1a538b72247 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 29 Aug 2022 16:00:18 +0200 Subject: [PATCH 395/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.3.3 (#510) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `10.3.2` -> `10.3.3` | [![age](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.3.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.3.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.3.3/compatibility-slim/10.3.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.3.3/confidence-slim/10.3.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 67142db5c63f..0a936b0c9b93 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -643,7 +643,7 @@ com.puppycrawl.tools checkstyle - 10.3.2 + 10.3.3 From 0bc8875b776cd5009a6d9b5d35343d6e36ef432b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 9 Sep 2022 15:14:27 +0000 Subject: [PATCH 396/794] chore(main): release 1.5.4-SNAPSHOT (#500) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 0a936b0c9b93..16a6de9a5e94 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.3 + 1.5.4-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 838cb674c726..47ae79389584 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.3:1.5.3 +google-cloud-shared-config:1.5.3:1.5.4-SNAPSHOT From 88a17a924cc017a3b8216d5018664caa98962b4b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Sat, 10 Sep 2022 02:18:37 +0000 Subject: [PATCH 397/794] chore: Generated snippets should not be owned by samples reviewers (#1575) (#512) Source-Link: https://github.com/googleapis/synthtool/commit/2e9ac19d5b8181af77cdc5337cf922517813cc49 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:8175681a918181d306d9c370d3262f16b4c724cc73d74111b7d42fc985ca7f93 --- java-shared-config/.github/.OwlBot.lock.yaml | 3 +-- java-shared-config/.github/CODEOWNERS | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index de9173d95efb..6259292301cb 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,5 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:d4b80feffe1579818cdc39466152e9de95789a193408506cd4a1ffbe8804dc00 -# created: 2022-07-13T13:53:17.676447481Z + digest: sha256:8175681a918181d306d9c370d3262f16b4c724cc73d74111b7d42fc985ca7f93 diff --git a/java-shared-config/.github/CODEOWNERS b/java-shared-config/.github/CODEOWNERS index 30fdb7b9c8f7..db2d8ad1747b 100644 --- a/java-shared-config/.github/CODEOWNERS +++ b/java-shared-config/.github/CODEOWNERS @@ -8,3 +8,6 @@ # The java-samples-reviewers team is the default owner for samples changes samples/**/*.java @googleapis/java-samples-reviewers + +# Generated snippets should not be owned by samples reviewers +samples/snippets/generated/ @googleapis/yoshi-java From 0062cdb8d195c0025d43ebb3e5c83918fa15b477 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 20 Sep 2022 16:10:30 +0200 Subject: [PATCH 398/794] build(deps): update dependency org.apache.maven.plugins:maven-jar-plugin to v3.3.0 (#513) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-jar-plugin](https://maven.apache.org/plugins/) | `3.2.2` -> `3.3.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-jar-plugin/3.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-jar-plugin/3.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-jar-plugin/3.3.0/compatibility-slim/3.2.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-jar-plugin/3.3.0/confidence-slim/3.2.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 16a6de9a5e94..b6d65ffef287 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -151,7 +151,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.2 + 3.3.0 true From 985224562094f0104a526a71d4e6d8fde09b78c8 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 21 Sep 2022 16:24:22 +0200 Subject: [PATCH 399/794] deps: update dependency org.junit.vintage:junit-vintage-engine to v5.9.1 (#514) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.junit.vintage:junit-vintage-engine](https://junit.org/junit5/) ([source](https://togithub.com/junit-team/junit5)) | `5.9.0` -> `5.9.1` | [![age](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.1/compatibility-slim/5.9.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.1/confidence-slim/5.9.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b6d65ffef287..5c304ccb6442 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -787,7 +787,7 @@ org.junit.vintage junit-vintage-engine - 5.9.0 + 5.9.1 test From 007bdd82ca234af97faab9d409e5c294e564fc68 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 22 Sep 2022 18:00:45 +0200 Subject: [PATCH 400/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.14 (#516) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.13` -> `0.9.14` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.14/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.14/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.14/compatibility-slim/0.9.13)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.14/confidence-slim/0.9.13)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.14`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.14) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.13...0.9.14) #### What's Changed Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog). - Fix how the GRAALVM_QUICK_BUILD env var is read by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/278](https://togithub.com/graalvm/native-build-tools/pull/278) - Make it possible to pass env vars to the builder process by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/280](https://togithub.com/graalvm/native-build-tools/pull/280) - Maven plugin fixes by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/274](https://togithub.com/graalvm/native-build-tools/pull/274) - Add support for `test-jar` artifacts by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/281](https://togithub.com/graalvm/native-build-tools/pull/281) - Add Gradle CLI options for quick build and debugging by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/286](https://togithub.com/graalvm/native-build-tools/pull/286) - Add a changelog and docs about build -> compile-no-fork changes by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/290](https://togithub.com/graalvm/native-build-tools/pull/290) - Do not filter out entry values starting with `java.` in the metadata post-processing action by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/289](https://togithub.com/graalvm/native-build-tools/pull/289) - Try to fix snapshot publishing by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/244](https://togithub.com/graalvm/native-build-tools/pull/244) - Fix javadoc and warnings by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/291](https://togithub.com/graalvm/native-build-tools/pull/291) - Bump the default metadata repository version to 0.1.2 by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/294](https://togithub.com/graalvm/native-build-tools/pull/294) - Fix metadata repository crash by [@​dnestoro](https://togithub.com/dnestoro) in [https://github.com/graalvm/native-build-tools/pull/295](https://togithub.com/graalvm/native-build-tools/pull/295) - Add support for override flag by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://github.com/graalvm/native-build-tools/pull/296](https://togithub.com/graalvm/native-build-tools/pull/296) - Fix build time initialization error with JUnit 5.9.0 by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/308](https://togithub.com/graalvm/native-build-tools/pull/308) - Fix compatibility with configuration cache by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/304](https://togithub.com/graalvm/native-build-tools/pull/304) - Bump metadata repository version by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/310](https://togithub.com/graalvm/native-build-tools/pull/310) #### New Contributors - [@​dnestoro](https://togithub.com/dnestoro) made their first contribution in [https://github.com/graalvm/native-build-tools/pull/295](https://togithub.com/graalvm/native-build-tools/pull/295) **Full Changelog**: https://github.com/graalvm/native-build-tools/compare/0.9.13...0.9.14
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 5c304ccb6442..edf9c8d82995 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -820,7 +820,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.13 + 0.9.14 true From 7e64e891f5296a2666a47855aa305f7f57ad9bee Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 26 Sep 2022 16:30:20 +0200 Subject: [PATCH 401/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.3.4 (#517) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `10.3.3` -> `10.3.4` | [![age](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.3.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.3.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.3.4/compatibility-slim/10.3.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.3.4/confidence-slim/10.3.3)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index edf9c8d82995..acaf0300180b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -643,7 +643,7 @@ com.puppycrawl.tools checkstyle - 10.3.3 + 10.3.4 From 0709ce4719712d53cd947c61959cc0465109b532 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 21:58:33 +0000 Subject: [PATCH 402/794] chore: pin versions of dependencies for compatibility with Python 3.6 (#1588) (#518) * chore: pin versions of dependencies for compatibility with Python 3.6 * fix path of requirements file in synthtool Source-Link: https://github.com/googleapis/synthtool/commit/69cdb47824170d0b02bf694649ce66613c889040 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:6566dc8226f20993af18e5a4e7a2b1ba85a292b02dedb6a1634cf10e1b418fa5 --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- .../.kokoro/release/publish_javadoc.sh | 2 +- .../.kokoro/release/publish_javadoc11.sh | 2 +- java-shared-config/.kokoro/release/stage.sh | 3 +- java-shared-config/.kokoro/requirements.in | 31 ++ java-shared-config/.kokoro/requirements.txt | 452 ++++++++++++++++++ 6 files changed, 488 insertions(+), 4 deletions(-) create mode 100644 java-shared-config/.kokoro/requirements.in create mode 100644 java-shared-config/.kokoro/requirements.txt diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 6259292301cb..791e842d2f88 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:8175681a918181d306d9c370d3262f16b4c724cc73d74111b7d42fc985ca7f93 + digest: sha256:6566dc8226f20993af18e5a4e7a2b1ba85a292b02dedb6a1634cf10e1b418fa5 diff --git a/java-shared-config/.kokoro/release/publish_javadoc.sh b/java-shared-config/.kokoro/release/publish_javadoc.sh index a05ceb717470..8a540db17a23 100755 --- a/java-shared-config/.kokoro/release/publish_javadoc.sh +++ b/java-shared-config/.kokoro/release/publish_javadoc.sh @@ -28,7 +28,7 @@ fi pushd $(dirname "$0")/../../ # install docuploader package -python3 -m pip install gcp-docuploader +python3 -m pip install --require-hashes -r .kokoro/requirements.txt # compile all packages mvn clean install -B -q -DskipTests=true diff --git a/java-shared-config/.kokoro/release/publish_javadoc11.sh b/java-shared-config/.kokoro/release/publish_javadoc11.sh index 5166678dad8f..3dc22d964b0d 100755 --- a/java-shared-config/.kokoro/release/publish_javadoc11.sh +++ b/java-shared-config/.kokoro/release/publish_javadoc11.sh @@ -28,7 +28,7 @@ fi pushd $(dirname "$0")/../../ # install docuploader package -python3 -m pip install gcp-docuploader +python3 -m pip install --require-hashes -r .kokoro/requirements.txt # compile all packages mvn clean install -B -q -DskipTests=true diff --git a/java-shared-config/.kokoro/release/stage.sh b/java-shared-config/.kokoro/release/stage.sh index 1dba8de10857..61e714d6ba56 100755 --- a/java-shared-config/.kokoro/release/stage.sh +++ b/java-shared-config/.kokoro/release/stage.sh @@ -16,7 +16,8 @@ set -eo pipefail # Start the releasetool reporter -python3 -m pip install gcp-releasetool +requirementsFile=$(realpath $(dirname "${BASH_SOURCE[0]}")/../requirements.txt) +python3 -m pip install --require-hashes -r $requirementsFile python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script source $(dirname "$0")/common.sh diff --git a/java-shared-config/.kokoro/requirements.in b/java-shared-config/.kokoro/requirements.in new file mode 100644 index 000000000000..cfdc2e7ed955 --- /dev/null +++ b/java-shared-config/.kokoro/requirements.in @@ -0,0 +1,31 @@ +gcp-docuploader==0.6.3 +google-crc32c==1.3.0 +googleapis-common-protos==1.56.3 +gcp-releasetool==1.8.7 +cachetools==4.2.4 +cffi==1.15.1 +jeepney==0.7.1 +jinja2==3.0.3 +markupsafe==2.0.1 +keyring==23.4.1 +packaging==21.3 +protobuf==3.19.5 +pyjwt==2.4.0 +pyparsing==3.0.9 +pycparser==2.21 +pyperclip==1.8.2 +python-dateutil==2.8.2 +requests==2.27.1 +importlib-metadata==4.8.3 +zipp==3.6.0 +google_api_core==2.8.2 +google-cloud-storage==2.0.0 +google-cloud-core==2.3.1 +typing-extensions==4.1.1 +urllib3==1.26.12 +zipp==3.6.0 +rsa==4.9 +six==1.16.0 +attrs==22.1.0 +google-auth==2.11.0 +idna==3.4 \ No newline at end of file diff --git a/java-shared-config/.kokoro/requirements.txt b/java-shared-config/.kokoro/requirements.txt new file mode 100644 index 000000000000..170f1c63abb7 --- /dev/null +++ b/java-shared-config/.kokoro/requirements.txt @@ -0,0 +1,452 @@ +# +# This file is autogenerated by pip-compile with python 3.10 +# To update, run: +# +# pip-compile --allow-unsafe --generate-hashes requirements.in +# +attrs==22.1.0 \ + --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \ + --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c + # via + # -r requirements.in + # gcp-releasetool +cachetools==4.2.4 \ + --hash=sha256:89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693 \ + --hash=sha256:92971d3cb7d2a97efff7c7bb1657f21a8f5fb309a37530537c71b1774189f2d1 + # via + # -r requirements.in + # google-auth +certifi==2022.9.14 \ + --hash=sha256:36973885b9542e6bd01dea287b2b4b3b21236307c56324fcc3f1160f2d655ed5 \ + --hash=sha256:e232343de1ab72c2aa521b625c80f699e356830fd0e2c620b465b304b17b0516 + # via requests +cffi==1.15.1 \ + --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ + --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \ + --hash=sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104 \ + --hash=sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426 \ + --hash=sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405 \ + --hash=sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375 \ + --hash=sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a \ + --hash=sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e \ + --hash=sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc \ + --hash=sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf \ + --hash=sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185 \ + --hash=sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497 \ + --hash=sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3 \ + --hash=sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35 \ + --hash=sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c \ + --hash=sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83 \ + --hash=sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21 \ + --hash=sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca \ + --hash=sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984 \ + --hash=sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac \ + --hash=sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd \ + --hash=sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee \ + --hash=sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a \ + --hash=sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2 \ + --hash=sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192 \ + --hash=sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7 \ + --hash=sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585 \ + --hash=sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f \ + --hash=sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e \ + --hash=sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27 \ + --hash=sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b \ + --hash=sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e \ + --hash=sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e \ + --hash=sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d \ + --hash=sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c \ + --hash=sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415 \ + --hash=sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82 \ + --hash=sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02 \ + --hash=sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314 \ + --hash=sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325 \ + --hash=sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c \ + --hash=sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3 \ + --hash=sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914 \ + --hash=sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045 \ + --hash=sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d \ + --hash=sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9 \ + --hash=sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5 \ + --hash=sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2 \ + --hash=sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c \ + --hash=sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3 \ + --hash=sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2 \ + --hash=sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8 \ + --hash=sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d \ + --hash=sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d \ + --hash=sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9 \ + --hash=sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162 \ + --hash=sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76 \ + --hash=sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4 \ + --hash=sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e \ + --hash=sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9 \ + --hash=sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6 \ + --hash=sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b \ + --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \ + --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0 + # via + # -r requirements.in + # cryptography +charset-normalizer==2.0.12 \ + --hash=sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597 \ + --hash=sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df + # via requests +click==8.0.4 \ + --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \ + --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb + # via + # gcp-docuploader + # gcp-releasetool +colorlog==6.7.0 \ + --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \ + --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5 + # via gcp-docuploader +cryptography==38.0.1 \ + --hash=sha256:0297ffc478bdd237f5ca3a7dc96fc0d315670bfa099c04dc3a4a2172008a405a \ + --hash=sha256:10d1f29d6292fc95acb597bacefd5b9e812099d75a6469004fd38ba5471a977f \ + --hash=sha256:16fa61e7481f4b77ef53991075de29fc5bacb582a1244046d2e8b4bb72ef66d0 \ + --hash=sha256:194044c6b89a2f9f169df475cc167f6157eb9151cc69af8a2a163481d45cc407 \ + --hash=sha256:1db3d807a14931fa317f96435695d9ec386be7b84b618cc61cfa5d08b0ae33d7 \ + --hash=sha256:3261725c0ef84e7592597606f6583385fed2a5ec3909f43bc475ade9729a41d6 \ + --hash=sha256:3b72c360427889b40f36dc214630e688c2fe03e16c162ef0aa41da7ab1455153 \ + --hash=sha256:3e3a2599e640927089f932295a9a247fc40a5bdf69b0484532f530471a382750 \ + --hash=sha256:3fc26e22840b77326a764ceb5f02ca2d342305fba08f002a8c1f139540cdfaad \ + --hash=sha256:5067ee7f2bce36b11d0e334abcd1ccf8c541fc0bbdaf57cdd511fdee53e879b6 \ + --hash=sha256:52e7bee800ec869b4031093875279f1ff2ed12c1e2f74923e8f49c916afd1d3b \ + --hash=sha256:64760ba5331e3f1794d0bcaabc0d0c39e8c60bf67d09c93dc0e54189dfd7cfe5 \ + --hash=sha256:765fa194a0f3372d83005ab83ab35d7c5526c4e22951e46059b8ac678b44fa5a \ + --hash=sha256:79473cf8a5cbc471979bd9378c9f425384980fcf2ab6534b18ed7d0d9843987d \ + --hash=sha256:896dd3a66959d3a5ddcfc140a53391f69ff1e8f25d93f0e2e7830c6de90ceb9d \ + --hash=sha256:89ed49784ba88c221756ff4d4755dbc03b3c8d2c5103f6d6b4f83a0fb1e85294 \ + --hash=sha256:ac7e48f7e7261207d750fa7e55eac2d45f720027d5703cd9007e9b37bbb59ac0 \ + --hash=sha256:ad7353f6ddf285aeadfaf79e5a6829110106ff8189391704c1d8801aa0bae45a \ + --hash=sha256:b0163a849b6f315bf52815e238bc2b2346604413fa7c1601eea84bcddb5fb9ac \ + --hash=sha256:b6c9b706316d7b5a137c35e14f4103e2115b088c412140fdbd5f87c73284df61 \ + --hash=sha256:c2e5856248a416767322c8668ef1845ad46ee62629266f84a8f007a317141013 \ + --hash=sha256:ca9f6784ea96b55ff41708b92c3f6aeaebde4c560308e5fbbd3173fbc466e94e \ + --hash=sha256:d1a5bd52d684e49a36582193e0b89ff267704cd4025abefb9e26803adeb3e5fb \ + --hash=sha256:d3971e2749a723e9084dd507584e2a2761f78ad2c638aa31e80bc7a15c9db4f9 \ + --hash=sha256:d4ef6cc305394ed669d4d9eebf10d3a101059bdcf2669c366ec1d14e4fb227bd \ + --hash=sha256:d9e69ae01f99abe6ad646947bba8941e896cb3aa805be2597a0400e0764b5818 + # via + # gcp-releasetool + # secretstorage +gcp-docuploader==0.6.3 \ + --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \ + --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b + # via -r requirements.in +gcp-releasetool==1.8.7 \ + --hash=sha256:3d2a67c9db39322194afb3b427e9cb0476ce8f2a04033695f0aeb63979fc2b37 \ + --hash=sha256:5e4d28f66e90780d77f3ecf1e9155852b0c3b13cbccb08ab07e66b2357c8da8d + # via -r requirements.in +google-api-core==2.8.2 \ + --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \ + --hash=sha256:93c6a91ccac79079ac6bbf8b74ee75db970cc899278b97d53bc012f35908cf50 + # via + # -r requirements.in + # google-cloud-core + # google-cloud-storage +google-auth==2.11.0 \ + --hash=sha256:be62acaae38d0049c21ca90f27a23847245c9f161ff54ede13af2cb6afecbac9 \ + --hash=sha256:ed65ecf9f681832298e29328e1ef0a3676e3732b2e56f41532d45f70a22de0fb + # via + # -r requirements.in + # gcp-releasetool + # google-api-core + # google-cloud-core + # google-cloud-storage +google-cloud-core==2.3.1 \ + --hash=sha256:113ba4f492467d5bd442c8d724c1a25ad7384045c3178369038840ecdd19346c \ + --hash=sha256:34334359cb04187bdc80ddcf613e462dfd7a3aabbc3fe4d118517ab4b9303d53 + # via + # -r requirements.in + # google-cloud-storage +google-cloud-storage==2.0.0 \ + --hash=sha256:a57a15aead0f9dfbd4381f1bfdbe8bf89818a4bd75bab846cafcefb2db846c47 \ + --hash=sha256:ec4be60bb223a3a960f0d01697d849b86d91cad815a84915a32ed3635e93a5e7 + # via + # -r requirements.in + # gcp-docuploader +google-crc32c==1.3.0 \ + --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \ + --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \ + --hash=sha256:12674a4c3b56b706153a358eaa1018c4137a5a04635b92b4652440d3d7386206 \ + --hash=sha256:127f9cc3ac41b6a859bd9dc4321097b1a4f6aa7fdf71b4f9227b9e3ebffb4422 \ + --hash=sha256:13af315c3a0eec8bb8b8d80b8b128cb3fcd17d7e4edafc39647846345a3f003a \ + --hash=sha256:1926fd8de0acb9d15ee757175ce7242e235482a783cd4ec711cc999fc103c24e \ + --hash=sha256:226f2f9b8e128a6ca6a9af9b9e8384f7b53a801907425c9a292553a3a7218ce0 \ + --hash=sha256:276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df \ + --hash=sha256:318f73f5484b5671f0c7f5f63741ab020a599504ed81d209b5c7129ee4667407 \ + --hash=sha256:3bbce1be3687bbfebe29abdb7631b83e6b25da3f4e1856a1611eb21854b689ea \ + --hash=sha256:42ae4781333e331a1743445931b08ebdad73e188fd554259e772556fc4937c48 \ + --hash=sha256:58be56ae0529c664cc04a9c76e68bb92b091e0194d6e3c50bea7e0f266f73713 \ + --hash=sha256:5da2c81575cc3ccf05d9830f9e8d3c70954819ca9a63828210498c0774fda1a3 \ + --hash=sha256:6311853aa2bba4064d0c28ca54e7b50c4d48e3de04f6770f6c60ebda1e975267 \ + --hash=sha256:650e2917660e696041ab3dcd7abac160b4121cd9a484c08406f24c5964099829 \ + --hash=sha256:6a4db36f9721fdf391646685ecffa404eb986cbe007a3289499020daf72e88a2 \ + --hash=sha256:779cbf1ce375b96111db98fca913c1f5ec11b1d870e529b1dc7354b2681a8c3a \ + --hash=sha256:7f6fe42536d9dcd3e2ffb9d3053f5d05221ae3bbcefbe472bdf2c71c793e3183 \ + --hash=sha256:891f712ce54e0d631370e1f4997b3f182f3368179198efc30d477c75d1f44942 \ + --hash=sha256:95c68a4b9b7828ba0428f8f7e3109c5d476ca44996ed9a5f8aac6269296e2d59 \ + --hash=sha256:96a8918a78d5d64e07c8ea4ed2bc44354e3f93f46a4866a40e8db934e4c0d74b \ + --hash=sha256:9c3cf890c3c0ecfe1510a452a165431b5831e24160c5fcf2071f0f85ca5a47cd \ + --hash=sha256:9f58099ad7affc0754ae42e6d87443299f15d739b0ce03c76f515153a5cda06c \ + --hash=sha256:a0b9e622c3b2b8d0ce32f77eba617ab0d6768b82836391e4f8f9e2074582bf02 \ + --hash=sha256:a7f9cbea4245ee36190f85fe1814e2d7b1e5f2186381b082f5d59f99b7f11328 \ + --hash=sha256:bab4aebd525218bab4ee615786c4581952eadc16b1ff031813a2fd51f0cc7b08 \ + --hash=sha256:c124b8c8779bf2d35d9b721e52d4adb41c9bfbde45e6a3f25f0820caa9aba73f \ + --hash=sha256:c9da0a39b53d2fab3e5467329ed50e951eb91386e9d0d5b12daf593973c3b168 \ + --hash=sha256:ca60076c388728d3b6ac3846842474f4250c91efbfe5afa872d3ffd69dd4b318 \ + --hash=sha256:cb6994fff247987c66a8a4e550ef374671c2b82e3c0d2115e689d21e511a652d \ + --hash=sha256:d1c1d6236feab51200272d79b3d3e0f12cf2cbb12b208c835b175a21efdb0a73 \ + --hash=sha256:dd7760a88a8d3d705ff562aa93f8445ead54f58fd482e4f9e2bafb7e177375d4 \ + --hash=sha256:dda4d8a3bb0b50f540f6ff4b6033f3a74e8bf0bd5320b70fab2c03e512a62812 \ + --hash=sha256:e0f1ff55dde0ebcfbef027edc21f71c205845585fffe30d4ec4979416613e9b3 \ + --hash=sha256:e7a539b9be7b9c00f11ef16b55486141bc2cdb0c54762f84e3c6fc091917436d \ + --hash=sha256:eb0b14523758e37802f27b7f8cd973f5f3d33be7613952c0df904b68c4842f0e \ + --hash=sha256:ed447680ff21c14aaceb6a9f99a5f639f583ccfe4ce1a5e1d48eb41c3d6b3217 \ + --hash=sha256:f52a4ad2568314ee713715b1e2d79ab55fab11e8b304fd1462ff5cccf4264b3e \ + --hash=sha256:fbd60c6aaa07c31d7754edbc2334aef50601b7f1ada67a96eb1eb57c7c72378f \ + --hash=sha256:fc28e0db232c62ca0c3600884933178f0825c99be4474cdd645e378a10588125 \ + --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \ + --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \ + --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3 + # via + # -r requirements.in + # google-resumable-media +google-resumable-media==2.3.3 \ + --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \ + --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5 + # via google-cloud-storage +googleapis-common-protos==1.56.3 \ + --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \ + --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461 + # via + # -r requirements.in + # google-api-core +idna==3.4 \ + --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \ + --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2 + # via + # -r requirements.in + # requests +importlib-metadata==4.8.3 \ + --hash=sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e \ + --hash=sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668 + # via + # -r requirements.in + # keyring +jeepney==0.7.1 \ + --hash=sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac \ + --hash=sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f + # via + # -r requirements.in + # keyring + # secretstorage +jinja2==3.0.3 \ + --hash=sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8 \ + --hash=sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 + # via + # -r requirements.in + # gcp-releasetool +keyring==23.4.1 \ + --hash=sha256:17e49fb0d6883c2b4445359434dba95aad84aabb29bbff044ad0ed7100232eca \ + --hash=sha256:89cbd74d4683ed164c8082fb38619341097741323b3786905c6dac04d6915a55 + # via + # -r requirements.in + # gcp-releasetool +markupsafe==2.0.1 \ + --hash=sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298 \ + --hash=sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64 \ + --hash=sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b \ + --hash=sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194 \ + --hash=sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567 \ + --hash=sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff \ + --hash=sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724 \ + --hash=sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74 \ + --hash=sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646 \ + --hash=sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35 \ + --hash=sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6 \ + --hash=sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a \ + --hash=sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6 \ + --hash=sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad \ + --hash=sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26 \ + --hash=sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38 \ + --hash=sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac \ + --hash=sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7 \ + --hash=sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6 \ + --hash=sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047 \ + --hash=sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75 \ + --hash=sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f \ + --hash=sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b \ + --hash=sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135 \ + --hash=sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8 \ + --hash=sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a \ + --hash=sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a \ + --hash=sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1 \ + --hash=sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9 \ + --hash=sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864 \ + --hash=sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914 \ + --hash=sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee \ + --hash=sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f \ + --hash=sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18 \ + --hash=sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8 \ + --hash=sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2 \ + --hash=sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d \ + --hash=sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b \ + --hash=sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b \ + --hash=sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86 \ + --hash=sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6 \ + --hash=sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f \ + --hash=sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb \ + --hash=sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833 \ + --hash=sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28 \ + --hash=sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e \ + --hash=sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415 \ + --hash=sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902 \ + --hash=sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f \ + --hash=sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d \ + --hash=sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9 \ + --hash=sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d \ + --hash=sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145 \ + --hash=sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066 \ + --hash=sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c \ + --hash=sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1 \ + --hash=sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a \ + --hash=sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207 \ + --hash=sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f \ + --hash=sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53 \ + --hash=sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd \ + --hash=sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134 \ + --hash=sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85 \ + --hash=sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9 \ + --hash=sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5 \ + --hash=sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94 \ + --hash=sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509 \ + --hash=sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51 \ + --hash=sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872 + # via + # -r requirements.in + # jinja2 +packaging==21.3 \ + --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ + --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 + # via + # -r requirements.in + # gcp-releasetool +protobuf==3.19.5 \ + --hash=sha256:1867f93b06a183f87696871bb8d1e99ee71dbb69d468ce1f0cc8bf3d30f982f3 \ + --hash=sha256:3c4160b601220627f7e91154e572baf5e161a9c3f445a8242d536ee3d0b7b17c \ + --hash=sha256:4ee2af7051d3b10c8a4fe6fd1a2c69f201fea36aeee7086cf202a692e1b99ee1 \ + --hash=sha256:5266c36cc0af3bb3dbf44f199d225b33da66a9a5c3bdc2b14865ad10eddf0e37 \ + --hash=sha256:5470f892961af464ae6eaf0f3099e2c1190ae8c7f36f174b89491281341f79ca \ + --hash=sha256:66d14b5b90090353efe75c9fb1bf65ef7267383034688d255b500822e37d5c2f \ + --hash=sha256:67efb5d20618020aa9596e17bfc37ca068c28ec0c1507d9507f73c93d46c9855 \ + --hash=sha256:696e6cfab94cc15a14946f2bf72719dced087d437adbd994fff34f38986628bc \ + --hash=sha256:6a02172b9650f819d01fb8e224fc69b0706458fc1ab4f1c669281243c71c1a5e \ + --hash=sha256:6eca9ae238ba615d702387a2ddea635d535d769994a9968c09a4ca920c487ab9 \ + --hash=sha256:950abd6c00e7b51f87ae8b18a0ce4d69fea217f62f171426e77de5061f6d9850 \ + --hash=sha256:9e1d74032f56ff25f417cfe84c8147047732e5059137ca42efad20cbbd25f5e0 \ + --hash=sha256:9e42b1cf2ecd8a1bd161239e693f22035ba99905ae6d7efeac8a0546c7ec1a27 \ + --hash=sha256:9f957ef53e872d58a0afd3bf6d80d48535d28c99b40e75e6634cbc33ea42fd54 \ + --hash=sha256:a89aa0c042e61e11ade320b802d6db4ee5391d8d973e46d3a48172c1597789f8 \ + --hash=sha256:c0f80876a8ff0ae7064084ed094eb86497bd5a3812e6fc96a05318b92301674e \ + --hash=sha256:c44e3282cff74ad18c7e8a0375f407f69ee50c2116364b44492a196293e08b21 \ + --hash=sha256:d249519ba5ecf5dd6b18150c9b6bcde510b273714b696f3923ff8308fc11ae49 \ + --hash=sha256:d3973a2d58aefc7d1230725c2447ce7f86a71cbc094b86a77c6ee1505ac7cdb1 \ + --hash=sha256:dca2284378a5f2a86ffed35c6ac147d14c48b525eefcd1083e5a9ce28dfa8657 \ + --hash=sha256:e63b0b3c42e51c94add62b010366cd4979cb6d5f06158bcae8faac4c294f91e1 \ + --hash=sha256:f2b599a21c9a32e171ec29a2ac54e03297736c578698e11b099d031f79da114b \ + --hash=sha256:f2bde37667b18c2b5280df83bc799204394a5d2d774e4deaf9de0eb741df6833 \ + --hash=sha256:f4f909f4dde413dec435a44b0894956d55bb928ded7d6e3c726556ca4c796e84 \ + --hash=sha256:f976234e20ab2785f54224bcdafa027674e23663b132fa3ca0caa291a6cfbde7 \ + --hash=sha256:f9cebda093c2f6bfed88f1c17cdade09d4d96096421b344026feee236532d4de + # via + # -r requirements.in + # gcp-docuploader + # gcp-releasetool + # google-api-core + # google-cloud-storage + # googleapis-common-protos +pyasn1==0.4.8 \ + --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \ + --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba + # via + # pyasn1-modules + # rsa +pyasn1-modules==0.2.8 \ + --hash=sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e \ + --hash=sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74 + # via google-auth +pycparser==2.21 \ + --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ + --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 + # via + # -r requirements.in + # cffi +pyjwt==2.4.0 \ + --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \ + --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba + # via + # -r requirements.in + # gcp-releasetool +pyparsing==3.0.9 \ + --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \ + --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc + # via + # -r requirements.in + # packaging +pyperclip==1.8.2 \ + --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57 + # via + # -r requirements.in + # gcp-releasetool +python-dateutil==2.8.2 \ + --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \ + --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 + # via + # -r requirements.in + # gcp-releasetool +requests==2.27.1 \ + --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \ + --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d + # via + # -r requirements.in + # gcp-releasetool + # google-api-core + # google-cloud-storage +rsa==4.9 \ + --hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \ + --hash=sha256:e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21 + # via + # -r requirements.in + # google-auth +secretstorage==3.3.3 \ + --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ + --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 + # via keyring +six==1.16.0 \ + --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ + --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 + # via + # -r requirements.in + # gcp-docuploader + # google-auth + # python-dateutil +typing-extensions==4.1.1 \ + --hash=sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42 \ + --hash=sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2 + # via -r requirements.in +urllib3==1.26.12 \ + --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \ + --hash=sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997 + # via + # -r requirements.in + # requests +zipp==3.6.0 \ + --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \ + --hash=sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc + # via + # -r requirements.in + # importlib-metadata From 7da2da9ab15f318f2d86403e633753c996803bae Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 28 Sep 2022 03:54:49 +0000 Subject: [PATCH 403/794] chore: exclude requirements.txt file from renovate-bot (#1594) (#519) Source-Link: https://github.com/googleapis/synthtool/commit/f58d3135a2fab20e225d98741dbc06d57459b816 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:f14e3fefe8e361e85752bd9890c8e56f2fe25f1e89cbb9597e4e3c7a429203a3 --- java-shared-config/.github/.OwlBot.lock.yaml | 3 ++- java-shared-config/renovate.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 791e842d2f88..2c3ef72011b4 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,4 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:6566dc8226f20993af18e5a4e7a2b1ba85a292b02dedb6a1634cf10e1b418fa5 + digest: sha256:f14e3fefe8e361e85752bd9890c8e56f2fe25f1e89cbb9597e4e3c7a429203a3 + diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index a9ec0209afa5..30bf089763df 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -10,6 +10,7 @@ ":maintainLockFilesDisabled", ":autodetectPinVersions" ], + "ignorePaths": [".kokoro/requirements.txt"], "packageRules": [ { "packagePatterns": [ From 452c80d6e3c5d429d035ecd8ba540b903a50d036 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 28 Sep 2022 21:04:14 +0200 Subject: [PATCH 404/794] deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.14 (#515) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.13` -> `0.9.14` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.14/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.14/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.14/compatibility-slim/0.9.13)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.14/confidence-slim/0.9.13)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.14`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.14) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.13...0.9.14) #### What's Changed Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog). - Fix how the GRAALVM_QUICK_BUILD env var is read by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/278](https://togithub.com/graalvm/native-build-tools/pull/278) - Make it possible to pass env vars to the builder process by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/280](https://togithub.com/graalvm/native-build-tools/pull/280) - Maven plugin fixes by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/274](https://togithub.com/graalvm/native-build-tools/pull/274) - Add support for `test-jar` artifacts by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/281](https://togithub.com/graalvm/native-build-tools/pull/281) - Add Gradle CLI options for quick build and debugging by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/286](https://togithub.com/graalvm/native-build-tools/pull/286) - Add a changelog and docs about build -> compile-no-fork changes by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/290](https://togithub.com/graalvm/native-build-tools/pull/290) - Do not filter out entry values starting with `java.` in the metadata post-processing action by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/289](https://togithub.com/graalvm/native-build-tools/pull/289) - Try to fix snapshot publishing by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/244](https://togithub.com/graalvm/native-build-tools/pull/244) - Fix javadoc and warnings by [@​lazar-mitrovic](https://togithub.com/lazar-mitrovic) in [https://github.com/graalvm/native-build-tools/pull/291](https://togithub.com/graalvm/native-build-tools/pull/291) - Bump the default metadata repository version to 0.1.2 by [@​gradinac](https://togithub.com/gradinac) in [https://github.com/graalvm/native-build-tools/pull/294](https://togithub.com/graalvm/native-build-tools/pull/294) - Fix metadata repository crash by [@​dnestoro](https://togithub.com/dnestoro) in [https://github.com/graalvm/native-build-tools/pull/295](https://togithub.com/graalvm/native-build-tools/pull/295) - Add support for override flag by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://github.com/graalvm/native-build-tools/pull/296](https://togithub.com/graalvm/native-build-tools/pull/296) - Fix build time initialization error with JUnit 5.9.0 by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/308](https://togithub.com/graalvm/native-build-tools/pull/308) - Fix compatibility with configuration cache by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/304](https://togithub.com/graalvm/native-build-tools/pull/304) - Bump metadata repository version by [@​melix](https://togithub.com/melix) in [https://github.com/graalvm/native-build-tools/pull/310](https://togithub.com/graalvm/native-build-tools/pull/310) #### New Contributors - [@​dnestoro](https://togithub.com/dnestoro) made their first contribution in [https://github.com/graalvm/native-build-tools/pull/295](https://togithub.com/graalvm/native-build-tools/pull/295) **Full Changelog**: https://github.com/graalvm/native-build-tools/compare/0.9.13...0.9.14
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index acaf0300180b..869f3b2d8dde 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -794,7 +794,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.13 + 0.9.14 test From fb4cccea0108a411b5cf813075a2992e9eb57af6 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 17 Oct 2022 21:35:35 -0400 Subject: [PATCH 405/794] chore: upgrade graalvm version to 22.2 (#524) --- .../.github/workflows/downstream-maven-plugins.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml index e15445400630..d6e1fec1bdc9 100644 --- a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml +++ b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml @@ -59,7 +59,7 @@ jobs: # In that case, you need to upgrade the Docker container used in the # tests in the downstream repositories (not just this value below). # Example: https://github.com/googleapis/testing-infra-docker/pull/195 - graalvm-version: 22.0.0.2 + graalvm-version: 22.2.0 native-image: true - run: java -version - run: sudo apt-get update -y From 9469ec33ef297628e1ec53e34c4b8636af6dad6b Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 18 Oct 2022 03:50:13 +0200 Subject: [PATCH 406/794] deps: update auto-value-annotation.version to v1.10 (#521) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.auto.value:auto-value](https://togithub.com/google/auto/tree/master/value) ([source](https://togithub.com/google/auto)) | `1.9` -> `1.10` | [![age](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/compatibility-slim/1.9)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value/1.10/confidence-slim/1.9)](https://docs.renovatebot.com/merge-confidence/) | | [com.google.auto.value:auto-value-annotations](https://togithub.com/google/auto/tree/master/value) ([source](https://togithub.com/google/auto)) | `1.9` -> `1.10` | [![age](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value-annotations/1.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value-annotations/1.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value-annotations/1.10/compatibility-slim/1.9)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.auto.value:auto-value-annotations/1.10/confidence-slim/1.9)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 869f3b2d8dde..6bb2c82818eb 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -63,7 +63,7 @@ ${project.artifactId} false true - 1.9 + 1.10 3.0.0-M7 /java/docs/reference/ From 6479f92e8b4f554eaf18b7d2ff570fcd38ed90d6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 18 Oct 2022 04:00:20 +0200 Subject: [PATCH 407/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.15 (#523) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.14` -> `0.9.15` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.15/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.15/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.15/compatibility-slim/0.9.14)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.15/confidence-slim/0.9.14)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.15`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.15) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.14...0.9.15) #### What's Changed Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog). - Move block from onTestClassRegistered to onLoad function by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/312](https://togithub.com/graalvm/native-build-tools/pull/312) - Add .sdkmanrc by [@​philwebb](https://togithub.com/philwebb) in [https://togithub.com/graalvm/native-build-tools/pull/320](https://togithub.com/graalvm/native-build-tools/pull/320) - Bump the default metadata repository version to 0.2.1 by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/323](https://togithub.com/graalvm/native-build-tools/pull/323) - Fix functional tests for MacOS users by [@​philwebb](https://togithub.com/philwebb) in [https://togithub.com/graalvm/native-build-tools/pull/321](https://togithub.com/graalvm/native-build-tools/pull/321) - Include buildtool support for bundling reachability metadata into jar files by [@​philwebb](https://togithub.com/philwebb) in [https://togithub.com/graalvm/native-build-tools/pull/322](https://togithub.com/graalvm/native-build-tools/pull/322) - Ship the GraalVM metadata repository as an artifact alongside NBT by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/331](https://togithub.com/graalvm/native-build-tools/pull/331) - Improve toolchain selection diagnostics by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/332](https://togithub.com/graalvm/native-build-tools/pull/332) - Bump metadata repository version by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/335](https://togithub.com/graalvm/native-build-tools/pull/335) - Fix ` NoSuchFileExceptionv in `collectReachabilityMetadata\` Gradle task by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://togithub.com/graalvm/native-build-tools/pull/336](https://togithub.com/graalvm/native-build-tools/pull/336) - Remove use of DependencyFilter by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/337](https://togithub.com/graalvm/native-build-tools/pull/337) #### New Contributors - [@​philwebb](https://togithub.com/philwebb) made their first contribution in [https://togithub.com/graalvm/native-build-tools/pull/320](https://togithub.com/graalvm/native-build-tools/pull/320) **Full Changelog**: https://togithub.com/graalvm/native-build-tools/compare/0.9.14...0.9.15
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 6bb2c82818eb..01b6a396a12c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -820,7 +820,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.14 + 0.9.15 true From 97639088b8773cc65a7a5d2a1a2917dc4bf7483e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 18 Oct 2022 04:02:13 +0200 Subject: [PATCH 408/794] deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.15 (#522) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.14` -> `0.9.15` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.15/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.15/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.15/compatibility-slim/0.9.14)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.15/confidence-slim/0.9.14)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.15`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.15) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.14...0.9.15) #### What's Changed Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog). - Move block from onTestClassRegistered to onLoad function by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/312](https://togithub.com/graalvm/native-build-tools/pull/312) - Add .sdkmanrc by [@​philwebb](https://togithub.com/philwebb) in [https://togithub.com/graalvm/native-build-tools/pull/320](https://togithub.com/graalvm/native-build-tools/pull/320) - Bump the default metadata repository version to 0.2.1 by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/323](https://togithub.com/graalvm/native-build-tools/pull/323) - Fix functional tests for MacOS users by [@​philwebb](https://togithub.com/philwebb) in [https://togithub.com/graalvm/native-build-tools/pull/321](https://togithub.com/graalvm/native-build-tools/pull/321) - Include buildtool support for bundling reachability metadata into jar files by [@​philwebb](https://togithub.com/philwebb) in [https://togithub.com/graalvm/native-build-tools/pull/322](https://togithub.com/graalvm/native-build-tools/pull/322) - Ship the GraalVM metadata repository as an artifact alongside NBT by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/331](https://togithub.com/graalvm/native-build-tools/pull/331) - Improve toolchain selection diagnostics by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/332](https://togithub.com/graalvm/native-build-tools/pull/332) - Bump metadata repository version by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/335](https://togithub.com/graalvm/native-build-tools/pull/335) - Fix ` NoSuchFileExceptionv in `collectReachabilityMetadata\` Gradle task by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://togithub.com/graalvm/native-build-tools/pull/336](https://togithub.com/graalvm/native-build-tools/pull/336) - Remove use of DependencyFilter by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/337](https://togithub.com/graalvm/native-build-tools/pull/337) #### New Contributors - [@​philwebb](https://togithub.com/philwebb) made their first contribution in [https://togithub.com/graalvm/native-build-tools/pull/320](https://togithub.com/graalvm/native-build-tools/pull/320) **Full Changelog**: https://togithub.com/graalvm/native-build-tools/compare/0.9.14...0.9.15
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 01b6a396a12c..e460ff5f87fe 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -794,7 +794,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.14 + 0.9.15 test From a4be356ee85462d972594bd6313e473926cb0911 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 13:38:24 -0400 Subject: [PATCH 409/794] chore: pin versions of certifi and google-resumable-media (#1660) (#526) chore: pin versions of certifi and google-resumable-media Source-Link: https://github.com/googleapis/synthtool/commit/09c4fcd0c6a0a880cf73662e118a8e8019da947c Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:264c6d5da60ff1684fbdd2b268d6a3ffca2038246e0948a06f15ca0c3cf28ce8 Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 3 +-- java-shared-config/.kokoro/requirements.in | 2 ++ java-shared-config/.kokoro/requirements.txt | 14 +++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 2c3ef72011b4..7649651ccd4b 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,5 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:f14e3fefe8e361e85752bd9890c8e56f2fe25f1e89cbb9597e4e3c7a429203a3 - + digest: sha256:264c6d5da60ff1684fbdd2b268d6a3ffca2038246e0948a06f15ca0c3cf28ce8 diff --git a/java-shared-config/.kokoro/requirements.in b/java-shared-config/.kokoro/requirements.in index cfdc2e7ed955..6aa7cf2b55ee 100644 --- a/java-shared-config/.kokoro/requirements.in +++ b/java-shared-config/.kokoro/requirements.in @@ -16,10 +16,12 @@ pycparser==2.21 pyperclip==1.8.2 python-dateutil==2.8.2 requests==2.27.1 +certifi==2022.9.24 importlib-metadata==4.8.3 zipp==3.6.0 google_api_core==2.8.2 google-cloud-storage==2.0.0 +google-resumable-media==2.3.3 google-cloud-core==2.3.1 typing-extensions==4.1.1 urllib3==1.26.12 diff --git a/java-shared-config/.kokoro/requirements.txt b/java-shared-config/.kokoro/requirements.txt index 170f1c63abb7..02ae42bb4039 100644 --- a/java-shared-config/.kokoro/requirements.txt +++ b/java-shared-config/.kokoro/requirements.txt @@ -16,10 +16,12 @@ cachetools==4.2.4 \ # via # -r requirements.in # google-auth -certifi==2022.9.14 \ - --hash=sha256:36973885b9542e6bd01dea287b2b4b3b21236307c56324fcc3f1160f2d655ed5 \ - --hash=sha256:e232343de1ab72c2aa521b625c80f699e356830fd0e2c620b465b304b17b0516 - # via requests +certifi==2022.9.24 \ + --hash=sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 \ + --hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382 + # via + # -r requirements.in + # requests cffi==1.15.1 \ --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \ @@ -218,7 +220,9 @@ google-crc32c==1.3.0 \ google-resumable-media==2.3.3 \ --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \ --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5 - # via google-cloud-storage + # via + # -r requirements.in + # google-cloud-storage googleapis-common-protos==1.56.3 \ --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \ --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461 From 31c5be31fc12908d7f2269fdd14168550d30b66b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 19 Oct 2022 18:42:14 +0000 Subject: [PATCH 410/794] chore(main): release 1.5.4 (#511) :robot: I have created a release *beep* *boop* --- ## [1.5.4](https://togithub.com/googleapis/java-shared-config/compare/v1.5.3...v1.5.4) (2022-10-19) ### Dependencies * Update auto-value-annotation.version to v1.10 ([#521](https://togithub.com/googleapis/java-shared-config/issues/521)) ([9469ec3](https://togithub.com/googleapis/java-shared-config/commit/9469ec33ef297628e1ec53e34c4b8636af6dad6b)) * Update dependency com.puppycrawl.tools:checkstyle to v10.3.2 ([#501](https://togithub.com/googleapis/java-shared-config/issues/501)) ([f186941](https://togithub.com/googleapis/java-shared-config/commit/f186941a00eaf44f4efd8e1981d09e287a5e675b)) * Update dependency com.puppycrawl.tools:checkstyle to v10.3.3 ([#510](https://togithub.com/googleapis/java-shared-config/issues/510)) ([34845eb](https://togithub.com/googleapis/java-shared-config/commit/34845eb760958adc6a12c3a0326ee1a538b72247)) * Update dependency com.puppycrawl.tools:checkstyle to v10.3.4 ([#517](https://togithub.com/googleapis/java-shared-config/issues/517)) ([7e64e89](https://togithub.com/googleapis/java-shared-config/commit/7e64e891f5296a2666a47855aa305f7f57ad9bee)) * Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.14 ([#515](https://togithub.com/googleapis/java-shared-config/issues/515)) ([452c80d](https://togithub.com/googleapis/java-shared-config/commit/452c80d6e3c5d429d035ecd8ba540b903a50d036)) * Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.15 ([#522](https://togithub.com/googleapis/java-shared-config/issues/522)) ([9763908](https://togithub.com/googleapis/java-shared-config/commit/97639088b8773cc65a7a5d2a1a2917dc4bf7483e)) * Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.14 ([#516](https://togithub.com/googleapis/java-shared-config/issues/516)) ([007bdd8](https://togithub.com/googleapis/java-shared-config/commit/007bdd82ca234af97faab9d409e5c294e564fc68)) * Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.15 ([#523](https://togithub.com/googleapis/java-shared-config/issues/523)) ([6479f92](https://togithub.com/googleapis/java-shared-config/commit/6479f92e8b4f554eaf18b7d2ff570fcd38ed90d6)) * Update dependency org.junit.vintage:junit-vintage-engine to v5.9.1 ([#514](https://togithub.com/googleapis/java-shared-config/issues/514)) ([9852245](https://togithub.com/googleapis/java-shared-config/commit/985224562094f0104a526a71d4e6d8fde09b78c8)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 15 +++++++++++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 00ee16af51f8..a16372e5d672 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## [1.5.4](https://github.com/googleapis/java-shared-config/compare/v1.5.3...v1.5.4) (2022-10-19) + + +### Dependencies + +* Update auto-value-annotation.version to v1.10 ([#521](https://github.com/googleapis/java-shared-config/issues/521)) ([601235c](https://github.com/googleapis/java-shared-config/commit/601235c32b6f1233d81a27788f6691cda05787af)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.3.2 ([#501](https://github.com/googleapis/java-shared-config/issues/501)) ([2b2c611](https://github.com/googleapis/java-shared-config/commit/2b2c611815cafd1809e27c769577ae55d481a170)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.3.3 ([#510](https://github.com/googleapis/java-shared-config/issues/510)) ([8d7f75d](https://github.com/googleapis/java-shared-config/commit/8d7f75de442cb3a274004faae430e9edf60730f3)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.3.4 ([#517](https://github.com/googleapis/java-shared-config/issues/517)) ([1119ba2](https://github.com/googleapis/java-shared-config/commit/1119ba29e4fe3a74a58c18961c3431570186cc27)) +* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.14 ([#515](https://github.com/googleapis/java-shared-config/issues/515)) ([779a239](https://github.com/googleapis/java-shared-config/commit/779a2398f1310a2f23555dc5c861a5203364d7a1)) +* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.15 ([#522](https://github.com/googleapis/java-shared-config/issues/522)) ([5dd225d](https://github.com/googleapis/java-shared-config/commit/5dd225dc5a66562c8496366986ef9dc401d9be92)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.14 ([#516](https://github.com/googleapis/java-shared-config/issues/516)) ([5605094](https://github.com/googleapis/java-shared-config/commit/56050943045d5e3d94c8598791c695d3fefcfef0)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.15 ([#523](https://github.com/googleapis/java-shared-config/issues/523)) ([45752ad](https://github.com/googleapis/java-shared-config/commit/45752ad7083f07d2ce81a23ea930aa9737473940)) +* Update dependency org.junit.vintage:junit-vintage-engine to v5.9.1 ([#514](https://github.com/googleapis/java-shared-config/issues/514)) ([60c000c](https://github.com/googleapis/java-shared-config/commit/60c000c3736288b98382aae79eb21a5cb15258fb)) + ## [1.5.3](https://github.com/googleapis/java-shared-config/compare/v1.5.2...v1.5.3) (2022-07-27) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e460ff5f87fe..25ab7a027603 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.4-SNAPSHOT + 1.5.4 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 47ae79389584..acc1da9b86de 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.3:1.5.4-SNAPSHOT +google-cloud-shared-config:1.5.4:1.5.4 From efc928bdf519b65cefc0c61e6031892a70b3b7cb Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 00:14:13 +0000 Subject: [PATCH 411/794] chore(main): release 1.5.5-SNAPSHOT (#527) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 25ab7a027603..e86de29ace03 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.4 + 1.5.5-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index acc1da9b86de..3b96c52d3334 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.4:1.5.4 +google-cloud-shared-config:1.5.4:1.5.5-SNAPSHOT From 40e2fc320276da6a398c541a85f26acaa09e5dbc Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 24 Oct 2022 12:11:47 -0400 Subject: [PATCH 412/794] ci: adding flatten plugin check (#530) Fixes https://github.com/googleapis/java-shared-config/issues/525 --- .../workflows/downstream-dependencies.yaml | 16 +++++++++ .../.kokoro/client-library-check.sh | 23 ++++++++++++- ...v2.9.3-expected-flattened-dependencies.txt | 33 +++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt diff --git a/java-shared-config/.github/workflows/downstream-dependencies.yaml b/java-shared-config/.github/workflows/downstream-dependencies.yaml index 5911098d844b..c6f5e91d1350 100644 --- a/java-shared-config/.github/workflows/downstream-dependencies.yaml +++ b/java-shared-config/.github/workflows/downstream-dependencies.yaml @@ -27,3 +27,19 @@ jobs: - run: sudo apt-get update -y - run: sudo apt-get install libxml2-utils - run: .kokoro/client-library-check.sh ${{matrix.repo}} dependencies + + flatten-plugin-check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: zulu + java-version: 11 + - run: java -version + - run: sudo apt-get update -y + - run: sudo apt-get install libxml2-utils + - run: .kokoro/client-library-check.sh java-storage flatten-plugin + env: + REPO_TAG: v2.9.3 + EXPECTED_DEPENDENCIES_LIST: java-storage-v2.9.3-expected-flattened-dependencies.txt diff --git a/java-shared-config/.kokoro/client-library-check.sh b/java-shared-config/.kokoro/client-library-check.sh index 3cddeb10f6c4..bbc8470ec59b 100755 --- a/java-shared-config/.kokoro/client-library-check.sh +++ b/java-shared-config/.kokoro/client-library-check.sh @@ -52,7 +52,12 @@ echo "Version: ${VERSION}" # Check this BOM against a few java client libraries # java-bigquery -git clone "https://github.com/googleapis/${REPO}.git" --depth=1 +if [ -z "${REPO_TAG}" ]; then + git clone "https://github.com/googleapis/${REPO}.git" --depth=1 +else + git clone "https://github.com/googleapis/${REPO}.git" --depth=1 --branch "${REPO_TAG}" +fi + pushd ${REPO} # replace version @@ -69,6 +74,22 @@ dependencies) .kokoro/dependencies.sh RETURN_CODE=$? ;; +flatten-plugin) + # This creates .flattened-pom.xml + .kokoro/build.sh + pushd google-cloud-* + mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true \ + | grep '\[INFO] .*:.*:.*:.*:.*' |awk '{print $2}' > .actual-flattened-dependencies-list.txt + echo "Diff from the expected file (${EXPECTED_DEPENDENCIES_LIST}):" + diff "${scriptDir}/${EXPECTED_DEPENDENCIES_LIST}" .actual-flattened-dependencies-list.txt + RETURN_CODE=$? + if [ "${RETURN_CODE}" == 0 ]; then + echo "No diff." + else + echo "There was a diff." + fi + popd + ;; *) # This reads the JOB_TYPE environmental variable .kokoro/build.sh diff --git a/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt b/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt new file mode 100644 index 000000000000..c71db6f6d821 --- /dev/null +++ b/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt @@ -0,0 +1,33 @@ +com.fasterxml.jackson.core:jackson-core:jar:2.13.3:compile +com.google.api-client:google-api-client:jar:1.35.1:compile +com.google.api.grpc:proto-google-common-protos:jar:2.9.0:compile +com.google.api.grpc:proto-google-iam-v1:jar:1.4.1:compile +com.google.api:api-common:jar:2.2.1:compile +com.google.api:gax-httpjson:jar:0.103.2:compile +com.google.api:gax:jar:2.18.2:compile +com.google.apis:google-api-services-storage:jar:v1-rev20220705-1.32.1:compile +com.google.auth:google-auth-library-credentials:jar:1.7.0:compile +com.google.auth:google-auth-library-oauth2-http:jar:1.7.0:compile +com.google.auto.value:auto-value-annotations:jar:1.10:compile +com.google.cloud:google-cloud-core-http:jar:2.8.0:compile +com.google.cloud:google-cloud-core:jar:2.8.0:compile +com.google.code.findbugs:jsr305:jar:3.0.2:compile +com.google.code.gson:gson:jar:2.9.0:compile +com.google.guava:failureaccess:jar:1.0.1:compile +com.google.guava:guava:jar:31.1-jre:compile +com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:compile +com.google.http-client:google-http-client-apache-v2:jar:1.42.0:compile +com.google.http-client:google-http-client-appengine:jar:1.42.0:compile +com.google.http-client:google-http-client-gson:jar:1.42.0:compile +com.google.http-client:google-http-client-jackson2:jar:1.42.0:compile +com.google.http-client:google-http-client:jar:1.42.0:compile +com.google.j2objc:j2objc-annotations:jar:1.3:compile +com.google.oauth-client:google-oauth-client:jar:1.34.1:compile +com.google.protobuf:protobuf-java-util:jar:3.21.1:compile +com.google.protobuf:protobuf-java:jar:3.21.1:compile +io.grpc:grpc-context:jar:1.47.0:compile +io.opencensus:opencensus-api:jar:0.31.1:compile +io.opencensus:opencensus-contrib-http-util:jar:0.31.1:compile +javax.annotation:javax.annotation-api:jar:1.3.2:compile +org.checkerframework:checker-qual:jar:3.22.2:compile +org.threeten:threetenbp:jar:1.6.0:compile From e8c360752ece36a2a1d2faa326dad6759f003520 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 24 Oct 2022 19:48:03 +0200 Subject: [PATCH 413/794] build(deps): update dependency org.codehaus.mojo:flatten-maven-plugin to v1.3.0 (#507) * build(deps): update dependency org.codehaus.mojo:flatten-maven-plugin to v1.3.0 * error prone to be in expected list. * flatten-plugin-check as required Co-authored-by: Tomo Suzuki --- java-shared-config/.github/sync-repo-settings.yaml | 1 + .../java-storage-v2.9.3-expected-flattened-dependencies.txt | 1 + java-shared-config/pom.xml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index ca2e4cf14085..a764192e63c7 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -40,6 +40,7 @@ branchProtectionRules: - "dependencies (11, java-spanner)" - "dependencies (11, java-storage)" - "dependencies (11, java-pubsub)" + - "flatten-plugin-check" - "build (8, java-trace, test)" - "build (8, java-trace, lint)" - "build (8, java-trace, clirr)" diff --git a/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt b/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt index c71db6f6d821..7df75fc1c693 100644 --- a/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt +++ b/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt @@ -13,6 +13,7 @@ com.google.cloud:google-cloud-core-http:jar:2.8.0:compile com.google.cloud:google-cloud-core:jar:2.8.0:compile com.google.code.findbugs:jsr305:jar:3.0.2:compile com.google.code.gson:gson:jar:2.9.0:compile +com.google.errorprone:error_prone_annotations:jar:2.14.0:compile com.google.guava:failureaccess:jar:1.0.1:compile com.google.guava:guava:jar:31.1-jre:compile com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:compile diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e86de29ace03..34494ceaef6a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -243,7 +243,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.2.7 + 1.3.0 From 6dea6971375033aa8b51d8b03adb248240c92add Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 21:08:22 +0000 Subject: [PATCH 414/794] chore: [java] remove flatten plugin dependency check (#1663) (#531) chore: remove check for flatten plugin We have had the check for the flatten-maven-plugin in each Cloud Java client repository. However, the behavior of the plugin has been stable and its not each repository's responsibility to assert the plugin's behavior. A new check is going to be added at the googleapis/java-shared-config repository to assert the plugin's behavior when we upgrade its version. Source-Link: https://togithub.com/googleapis/synthtool/commit/9266ddc3b17fc15f34d2fb88ce8c5f1a4bfe64b0 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:ae72564aa9c368b9ccd96f4af21f87889fd83b9e60635b80844deb5a2ccd08aa --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.kokoro/dependencies.sh | 51 -------------------- 2 files changed, 1 insertion(+), 52 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 7649651ccd4b..459487d38827 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:264c6d5da60ff1684fbdd2b268d6a3ffca2038246e0948a06f15ca0c3cf28ce8 + digest: sha256:ae72564aa9c368b9ccd96f4af21f87889fd83b9e60635b80844deb5a2ccd08aa diff --git a/java-shared-config/.kokoro/dependencies.sh b/java-shared-config/.kokoro/dependencies.sh index d7476cfe9727..bd8960246f66 100755 --- a/java-shared-config/.kokoro/dependencies.sh +++ b/java-shared-config/.kokoro/dependencies.sh @@ -57,54 +57,3 @@ retry_with_backoff 3 10 \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true - -echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************" -## Run dependency list completeness check -function completenessCheck() { - # Output dep list with compile scope generated using the original pom - # Running mvn dependency:list on Java versions that support modules will also include the module of the dependency. - # This is stripped from the output as it is not present in the flattened pom. - # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list. - msg "Generating dependency list using original pom..." - mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt - - # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) - msg "Generating dependency list using flattened pom..." - mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt - - # Compare two dependency lists - msg "Comparing dependency lists..." - diff .org-list.txt .new-list.txt >.diff.txt - if [[ $? == 0 ]] - then - msg "Success. No diff!" - else - msg "Diff found. See below: " - msg "You can also check .diff.txt file located in $1." - cat .diff.txt - return 1 - fi -} - -# Allow failures to continue running the script -set +e - -error_count=0 -for path in **/.flattened-pom.xml -do - # Check flattened pom in each dir that contains it for completeness - dir=$(dirname "$path") - pushd "$dir" - completenessCheck "$dir" - error_count=$(($error_count + $?)) - popd -done - -if [[ $error_count == 0 ]] -then - msg "All checks passed." - exit 0 -else - msg "Errors found. See log statements above." - exit 1 -fi From c7a8d0daf88bfb0dec98df050e894126e27565ca Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 26 Oct 2022 23:59:31 +0200 Subject: [PATCH 415/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.16 (#529) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 34494ceaef6a..d5d020a76432 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -820,7 +820,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.15 + 0.9.16 true From 639ff5a92423729e755e5377ca8e1112287cdd4e Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 26 Oct 2022 23:59:45 +0200 Subject: [PATCH 416/794] deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.16 (#528) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d5d020a76432..78b8947e3bf6 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -794,7 +794,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.15 + 0.9.16 test From 5d836e3299cdd2d10b72ad6214a0225a04099e04 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 8 Nov 2022 16:06:31 +0000 Subject: [PATCH 417/794] chore(java): update dependencies in java requirements file (#1695) (#539) * chore(java): update gcp-releasetool and cryptography in java requirements file Source-Link: https://togithub.com/googleapis/synthtool/commit/74d0956884c1bb9dc901b52de35ca2bca025a74e Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:142286d973c7b6d58186070f203b50058a20a7d7b42147996db24921a18da1b0 --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.kokoro/requirements.in | 7 +- java-shared-config/.kokoro/requirements.txt | 75 ++++++++++---------- 3 files changed, 43 insertions(+), 41 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 459487d38827..c8316751ebd3 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:ae72564aa9c368b9ccd96f4af21f87889fd83b9e60635b80844deb5a2ccd08aa + digest: sha256:142286d973c7b6d58186070f203b50058a20a7d7b42147996db24921a18da1b0 diff --git a/java-shared-config/.kokoro/requirements.in b/java-shared-config/.kokoro/requirements.in index 6aa7cf2b55ee..9cc4a1baae11 100644 --- a/java-shared-config/.kokoro/requirements.in +++ b/java-shared-config/.kokoro/requirements.in @@ -1,7 +1,8 @@ -gcp-docuploader==0.6.3 +gcp-docuploader==0.6.4 google-crc32c==1.3.0 googleapis-common-protos==1.56.3 -gcp-releasetool==1.8.7 +gcp-releasetool==1.9.1 +cryptography==38.0.3 cachetools==4.2.4 cffi==1.15.1 jeepney==0.7.1 @@ -29,5 +30,5 @@ zipp==3.6.0 rsa==4.9 six==1.16.0 attrs==22.1.0 -google-auth==2.11.0 +google-auth==2.14.0 idna==3.4 \ No newline at end of file diff --git a/java-shared-config/.kokoro/requirements.txt b/java-shared-config/.kokoro/requirements.txt index 02ae42bb4039..2dce197bf45a 100644 --- a/java-shared-config/.kokoro/requirements.txt +++ b/java-shared-config/.kokoro/requirements.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile with python 3.10 # To update, run: # -# pip-compile --allow-unsafe --generate-hashes requirements.in +# pip-compile --generate-hashes requirements.in # attrs==22.1.0 \ --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \ @@ -104,43 +104,44 @@ colorlog==6.7.0 \ --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \ --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5 # via gcp-docuploader -cryptography==38.0.1 \ - --hash=sha256:0297ffc478bdd237f5ca3a7dc96fc0d315670bfa099c04dc3a4a2172008a405a \ - --hash=sha256:10d1f29d6292fc95acb597bacefd5b9e812099d75a6469004fd38ba5471a977f \ - --hash=sha256:16fa61e7481f4b77ef53991075de29fc5bacb582a1244046d2e8b4bb72ef66d0 \ - --hash=sha256:194044c6b89a2f9f169df475cc167f6157eb9151cc69af8a2a163481d45cc407 \ - --hash=sha256:1db3d807a14931fa317f96435695d9ec386be7b84b618cc61cfa5d08b0ae33d7 \ - --hash=sha256:3261725c0ef84e7592597606f6583385fed2a5ec3909f43bc475ade9729a41d6 \ - --hash=sha256:3b72c360427889b40f36dc214630e688c2fe03e16c162ef0aa41da7ab1455153 \ - --hash=sha256:3e3a2599e640927089f932295a9a247fc40a5bdf69b0484532f530471a382750 \ - --hash=sha256:3fc26e22840b77326a764ceb5f02ca2d342305fba08f002a8c1f139540cdfaad \ - --hash=sha256:5067ee7f2bce36b11d0e334abcd1ccf8c541fc0bbdaf57cdd511fdee53e879b6 \ - --hash=sha256:52e7bee800ec869b4031093875279f1ff2ed12c1e2f74923e8f49c916afd1d3b \ - --hash=sha256:64760ba5331e3f1794d0bcaabc0d0c39e8c60bf67d09c93dc0e54189dfd7cfe5 \ - --hash=sha256:765fa194a0f3372d83005ab83ab35d7c5526c4e22951e46059b8ac678b44fa5a \ - --hash=sha256:79473cf8a5cbc471979bd9378c9f425384980fcf2ab6534b18ed7d0d9843987d \ - --hash=sha256:896dd3a66959d3a5ddcfc140a53391f69ff1e8f25d93f0e2e7830c6de90ceb9d \ - --hash=sha256:89ed49784ba88c221756ff4d4755dbc03b3c8d2c5103f6d6b4f83a0fb1e85294 \ - --hash=sha256:ac7e48f7e7261207d750fa7e55eac2d45f720027d5703cd9007e9b37bbb59ac0 \ - --hash=sha256:ad7353f6ddf285aeadfaf79e5a6829110106ff8189391704c1d8801aa0bae45a \ - --hash=sha256:b0163a849b6f315bf52815e238bc2b2346604413fa7c1601eea84bcddb5fb9ac \ - --hash=sha256:b6c9b706316d7b5a137c35e14f4103e2115b088c412140fdbd5f87c73284df61 \ - --hash=sha256:c2e5856248a416767322c8668ef1845ad46ee62629266f84a8f007a317141013 \ - --hash=sha256:ca9f6784ea96b55ff41708b92c3f6aeaebde4c560308e5fbbd3173fbc466e94e \ - --hash=sha256:d1a5bd52d684e49a36582193e0b89ff267704cd4025abefb9e26803adeb3e5fb \ - --hash=sha256:d3971e2749a723e9084dd507584e2a2761f78ad2c638aa31e80bc7a15c9db4f9 \ - --hash=sha256:d4ef6cc305394ed669d4d9eebf10d3a101059bdcf2669c366ec1d14e4fb227bd \ - --hash=sha256:d9e69ae01f99abe6ad646947bba8941e896cb3aa805be2597a0400e0764b5818 +cryptography==38.0.3 \ + --hash=sha256:068147f32fa662c81aebab95c74679b401b12b57494872886eb5c1139250ec5d \ + --hash=sha256:06fc3cc7b6f6cca87bd56ec80a580c88f1da5306f505876a71c8cfa7050257dd \ + --hash=sha256:25c1d1f19729fb09d42e06b4bf9895212292cb27bb50229f5aa64d039ab29146 \ + --hash=sha256:402852a0aea73833d982cabb6d0c3bb582c15483d29fb7085ef2c42bfa7e38d7 \ + --hash=sha256:4e269dcd9b102c5a3d72be3c45d8ce20377b8076a43cbed6f660a1afe365e436 \ + --hash=sha256:5419a127426084933076132d317911e3c6eb77568a1ce23c3ac1e12d111e61e0 \ + --hash=sha256:554bec92ee7d1e9d10ded2f7e92a5d70c1f74ba9524947c0ba0c850c7b011828 \ + --hash=sha256:5e89468fbd2fcd733b5899333bc54d0d06c80e04cd23d8c6f3e0542358c6060b \ + --hash=sha256:65535bc550b70bd6271984d9863a37741352b4aad6fb1b3344a54e6950249b55 \ + --hash=sha256:6ab9516b85bebe7aa83f309bacc5f44a61eeb90d0b4ec125d2d003ce41932d36 \ + --hash=sha256:6addc3b6d593cd980989261dc1cce38263c76954d758c3c94de51f1e010c9a50 \ + --hash=sha256:728f2694fa743a996d7784a6194da430f197d5c58e2f4e278612b359f455e4a2 \ + --hash=sha256:785e4056b5a8b28f05a533fab69febf5004458e20dad7e2e13a3120d8ecec75a \ + --hash=sha256:78cf5eefac2b52c10398a42765bfa981ce2372cbc0457e6bf9658f41ec3c41d8 \ + --hash=sha256:7f836217000342d448e1c9a342e9163149e45d5b5eca76a30e84503a5a96cab0 \ + --hash=sha256:8d41a46251bf0634e21fac50ffd643216ccecfaf3701a063257fe0b2be1b6548 \ + --hash=sha256:984fe150f350a3c91e84de405fe49e688aa6092b3525f407a18b9646f6612320 \ + --hash=sha256:9b24bcff7853ed18a63cfb0c2b008936a9554af24af2fb146e16d8e1aed75748 \ + --hash=sha256:b1b35d9d3a65542ed2e9d90115dfd16bbc027b3f07ee3304fc83580f26e43249 \ + --hash=sha256:b1b52c9e5f8aa2b802d48bd693190341fae201ea51c7a167d69fc48b60e8a959 \ + --hash=sha256:bbf203f1a814007ce24bd4d51362991d5cb90ba0c177a9c08825f2cc304d871f \ + --hash=sha256:be243c7e2bfcf6cc4cb350c0d5cdf15ca6383bbcb2a8ef51d3c9411a9d4386f0 \ + --hash=sha256:bfbe6ee19615b07a98b1d2287d6a6073f734735b49ee45b11324d85efc4d5cbd \ + --hash=sha256:c46837ea467ed1efea562bbeb543994c2d1f6e800785bd5a2c98bc096f5cb220 \ + --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \ + --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722 # via + # -r requirements.in # gcp-releasetool # secretstorage -gcp-docuploader==0.6.3 \ - --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \ - --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b +gcp-docuploader==0.6.4 \ + --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \ + --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf # via -r requirements.in -gcp-releasetool==1.8.7 \ - --hash=sha256:3d2a67c9db39322194afb3b427e9cb0476ce8f2a04033695f0aeb63979fc2b37 \ - --hash=sha256:5e4d28f66e90780d77f3ecf1e9155852b0c3b13cbccb08ab07e66b2357c8da8d +gcp-releasetool==1.9.1 \ + --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \ + --hash=sha256:d0d3c814a97c1a237517e837d8cfa668ced8df4b882452578ecef4a4e79c583b # via -r requirements.in google-api-core==2.8.2 \ --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \ @@ -149,9 +150,9 @@ google-api-core==2.8.2 \ # -r requirements.in # google-cloud-core # google-cloud-storage -google-auth==2.11.0 \ - --hash=sha256:be62acaae38d0049c21ca90f27a23847245c9f161ff54ede13af2cb6afecbac9 \ - --hash=sha256:ed65ecf9f681832298e29328e1ef0a3676e3732b2e56f41532d45f70a22de0fb +google-auth==2.14.0 \ + --hash=sha256:1ad5b0e6eba5f69645971abb3d2c197537d5914070a8c6d30299dfdb07c5c700 \ + --hash=sha256:cf24817855d874ede2efd071aa22125445f555de1685b739a9782fcf408c2a3d # via # -r requirements.in # gcp-releasetool From 5610d256c1e0ae680173b44b6b8c8f3154d6d6de Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 8 Nov 2022 18:26:27 +0100 Subject: [PATCH 418/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.17 (#538) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.16` -> `0.9.17` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.17/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.17/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.17/compatibility-slim/0.9.16)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.17/confidence-slim/0.9.16)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.17`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.17) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.16...0.9.17) #### What's Changed Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog). - Make GraalVM installation check lazy by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://togithub.com/graalvm/native-build-tools/pull/345](https://togithub.com/graalvm/native-build-tools/pull/345) - Add a check for the minimal GraalVM version by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://togithub.com/graalvm/native-build-tools/pull/353](https://togithub.com/graalvm/native-build-tools/pull/353) - Bump metadata repo version to 0.2.4 by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/356](https://togithub.com/graalvm/native-build-tools/pull/356) **Full Changelog**: https://togithub.com/graalvm/native-build-tools/compare/0.9.16...0.9.17
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 78b8947e3bf6..79dfb1513e7c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -820,7 +820,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.16 + 0.9.17 true From 5e34d487f8ac50717f101a9abc97abdb2cc8ceb8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 8 Nov 2022 18:48:24 +0100 Subject: [PATCH 419/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.4 (#535) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `10.3.4` -> `10.4` | [![age](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.4/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.4/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.4/compatibility-slim/10.3.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.4/confidence-slim/10.3.4)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 79dfb1513e7c..b833c99f8df1 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -643,7 +643,7 @@ com.puppycrawl.tools checkstyle - 10.3.4 + 10.4 From 037c3ed275097b0fe19d2819e1588d417dde51d9 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 8 Nov 2022 21:20:16 +0100 Subject: [PATCH 420/794] deps: update dependency org.graalvm.buildtools:junit-platform-native to v0.9.17 (#537) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.16` -> `0.9.17` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.17/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.17/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.17/compatibility-slim/0.9.16)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.17/confidence-slim/0.9.16)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.17`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.17) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.16...0.9.17) #### What's Changed Read what's new in the [documentation](https://graalvm.github.io/native-build-tools/latest/index.html#changelog). - Make GraalVM installation check lazy by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://togithub.com/graalvm/native-build-tools/pull/345](https://togithub.com/graalvm/native-build-tools/pull/345) - Add a check for the minimal GraalVM version by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://togithub.com/graalvm/native-build-tools/pull/353](https://togithub.com/graalvm/native-build-tools/pull/353) - Bump metadata repo version to 0.2.4 by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/356](https://togithub.com/graalvm/native-build-tools/pull/356) **Full Changelog**: https://togithub.com/graalvm/native-build-tools/compare/0.9.16...0.9.17
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b833c99f8df1..db6bf270a92e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -794,7 +794,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.16 + 0.9.17 test From 7eabdcb2ba1d147e95838b7f6e2476a5293b07c3 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Wed, 9 Nov 2022 11:08:50 -0500 Subject: [PATCH 421/794] deps: updata java-docfx-doclet to v1.8.0 (#540) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index db6bf270a92e..9fbdd9956196 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -694,7 +694,7 @@ - java-docfx-doclet-1.6.0 + java-docfx-doclet-1.8.0 ${env.KOKORO_GFILE_DIR}/${docletName}.jar ${project.build.directory}/docfx-yml ${project.artifactId} From 2a46891d54ac6ee72ff474ee43bafb7f838ce2b9 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 12:27:39 -0500 Subject: [PATCH 422/794] chore: update google-auth to 2.14.1 (#1703) (#541) Co-authored-by: Anthonios Partheniou Source-Link: https://github.com/googleapis/synthtool/commit/9457e69470097f8e71b6b497ceece5bc423eaf3a Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:a3fe0b4c75f322520f548e535ed329df1e475ace3cb4a979b78e003cb822636a Co-authored-by: Owl Bot Co-authored-by: Anthonios Partheniou --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.kokoro/requirements.in | 2 +- java-shared-config/.kokoro/requirements.txt | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index c8316751ebd3..676aaea0c74d 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:142286d973c7b6d58186070f203b50058a20a7d7b42147996db24921a18da1b0 + digest: sha256:a3fe0b4c75f322520f548e535ed329df1e475ace3cb4a979b78e003cb822636a diff --git a/java-shared-config/.kokoro/requirements.in b/java-shared-config/.kokoro/requirements.in index 9cc4a1baae11..ae1d92e68084 100644 --- a/java-shared-config/.kokoro/requirements.in +++ b/java-shared-config/.kokoro/requirements.in @@ -30,5 +30,5 @@ zipp==3.6.0 rsa==4.9 six==1.16.0 attrs==22.1.0 -google-auth==2.14.0 +google-auth==2.14.1 idna==3.4 \ No newline at end of file diff --git a/java-shared-config/.kokoro/requirements.txt b/java-shared-config/.kokoro/requirements.txt index 2dce197bf45a..9c82529c84ff 100644 --- a/java-shared-config/.kokoro/requirements.txt +++ b/java-shared-config/.kokoro/requirements.txt @@ -150,9 +150,8 @@ google-api-core==2.8.2 \ # -r requirements.in # google-cloud-core # google-cloud-storage -google-auth==2.14.0 \ - --hash=sha256:1ad5b0e6eba5f69645971abb3d2c197537d5914070a8c6d30299dfdb07c5c700 \ - --hash=sha256:cf24817855d874ede2efd071aa22125445f555de1685b739a9782fcf408c2a3d +google-auth==2.14.1 \ + --hash=sha256:f5d8701633bebc12e0deea4df8abd8aff31c28b355360597f7f2ee60f2e4d016 # via # -r requirements.in # gcp-releasetool From c6b46580e180e1c185a38854bfa32a4393698bdc Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 11 Nov 2022 10:03:29 -0500 Subject: [PATCH 423/794] chore: use gcp-docuploader 0.6.3 (#1708) (#542) Source-Link: https://github.com/googleapis/synthtool/commit/fbc8bfe364d70c38fbffbf68ebe1cfdae54d3447 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:e76136cc48f90aa19ba29cdfbd4002111467e44a1c9d905867d98dafafbd03bb Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.kokoro/requirements.in | 2 +- java-shared-config/.kokoro/requirements.txt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 676aaea0c74d..0f0647b00ef2 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:a3fe0b4c75f322520f548e535ed329df1e475ace3cb4a979b78e003cb822636a + digest: sha256:e76136cc48f90aa19ba29cdfbd4002111467e44a1c9d905867d98dafafbd03bb diff --git a/java-shared-config/.kokoro/requirements.in b/java-shared-config/.kokoro/requirements.in index ae1d92e68084..924f94ae6fa1 100644 --- a/java-shared-config/.kokoro/requirements.in +++ b/java-shared-config/.kokoro/requirements.in @@ -1,4 +1,4 @@ -gcp-docuploader==0.6.4 +gcp-docuploader==0.6.3 google-crc32c==1.3.0 googleapis-common-protos==1.56.3 gcp-releasetool==1.9.1 diff --git a/java-shared-config/.kokoro/requirements.txt b/java-shared-config/.kokoro/requirements.txt index 9c82529c84ff..71fcafc70316 100644 --- a/java-shared-config/.kokoro/requirements.txt +++ b/java-shared-config/.kokoro/requirements.txt @@ -135,9 +135,9 @@ cryptography==38.0.3 \ # -r requirements.in # gcp-releasetool # secretstorage -gcp-docuploader==0.6.4 \ - --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \ - --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf +gcp-docuploader==0.6.3 \ + --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \ + --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b # via -r requirements.in gcp-releasetool==1.9.1 \ --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \ From c20c150e58baa77afce8f3f788200b48cceb0247 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 14 Nov 2022 14:10:07 -0500 Subject: [PATCH 424/794] chore: group GraalVM native image deps (#532) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: group GraalVM native image deps * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * renovate.json excluded by owlbot.py Co-authored-by: Owl Bot --- java-shared-config/owlbot.py | 1 + java-shared-config/renovate.json | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/java-shared-config/owlbot.py b/java-shared-config/owlbot.py index 095f961b2413..2e12a271138c 100644 --- a/java-shared-config/owlbot.py +++ b/java-shared-config/owlbot.py @@ -28,5 +28,6 @@ ".github/workflows/auto-release.yaml", ".github/workflows/samples.yaml", "samples/*", + "renovate.json" ] ) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index 30bf089763df..e0b754bdfeeb 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -68,6 +68,12 @@ "^com.fasterxml.jackson.core" ], "groupName": "jackson dependencies" + }, + { + "packagePatterns": [ + "^org.graalvm.buildtools" + ], + "groupName": "GraalVM native-image dependencies" } ], "semanticCommits": true, From a38c278e934443ed0d13d18bce895bbc9edbd6d9 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 21 Nov 2022 22:13:54 +0100 Subject: [PATCH 425/794] deps: update graalvm native-image dependencies to v0.9.18 (#544) --- java-shared-config/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9fbdd9956196..9ed1fd0eded6 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -794,7 +794,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.17 + 0.9.18 test @@ -820,7 +820,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.17 + 0.9.18 true From 9c4246fb0404b82b4833900a102e640b87b9c871 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 28 Nov 2022 18:04:14 +0100 Subject: [PATCH 426/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.5.0 (#545) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `10.4` -> `10.5.0` | [![age](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.5.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.5.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.5.0/compatibility-slim/10.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.5.0/confidence-slim/10.4)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9ed1fd0eded6..8d127baca244 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -643,7 +643,7 @@ com.puppycrawl.tools checkstyle - 10.4 + 10.5.0 From 4968711461c8338efb19f89a4498328a1dfbd548 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 28 Nov 2022 12:12:06 -0500 Subject: [PATCH 427/794] chore: upgrade native image downstream check to 22.3.0 (#546) --- .../.github/workflows/downstream-maven-plugins.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml index d6e1fec1bdc9..4aafc53695ce 100644 --- a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml +++ b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml @@ -59,7 +59,7 @@ jobs: # In that case, you need to upgrade the Docker container used in the # tests in the downstream repositories (not just this value below). # Example: https://github.com/googleapis/testing-infra-docker/pull/195 - graalvm-version: 22.2.0 + graalvm-version: 22.3.0 native-image: true - run: java -version - run: sudo apt-get update -y From d9551593197294044c4c4d5f2e64f6afe3d858c0 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 28 Nov 2022 19:39:29 +0100 Subject: [PATCH 428/794] deps: update auto-value-annotation.version to v1.10.1 (#543) * deps: update auto-value-annotation.version to v1.10.1 * chore: Update expected flattened pom.xml Co-authored-by: Lawrence Qiu --- .../java-storage-v2.9.3-expected-flattened-dependencies.txt | 2 +- java-shared-config/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt b/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt index 7df75fc1c693..b4999c31e7de 100644 --- a/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt +++ b/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt @@ -8,7 +8,7 @@ com.google.api:gax:jar:2.18.2:compile com.google.apis:google-api-services-storage:jar:v1-rev20220705-1.32.1:compile com.google.auth:google-auth-library-credentials:jar:1.7.0:compile com.google.auth:google-auth-library-oauth2-http:jar:1.7.0:compile -com.google.auto.value:auto-value-annotations:jar:1.10:compile +com.google.auto.value:auto-value-annotations:jar:1.10.1:compile com.google.cloud:google-cloud-core-http:jar:2.8.0:compile com.google.cloud:google-cloud-core:jar:2.8.0:compile com.google.code.findbugs:jsr305:jar:3.0.2:compile diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 8d127baca244..7d569ba16f9a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -63,7 +63,7 @@ ${project.artifactId} false true - 1.10 + 1.10.1 3.0.0-M7 /java/docs/reference/ From a325129a82abe61f1c6a6b7758a3fad0ad41d0ad Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 30 Nov 2022 18:23:20 -0500 Subject: [PATCH 429/794] chore(main): release 1.5.5 (#533) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 16 ++++++++++++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index a16372e5d672..e07c8f0a60ce 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +## [1.5.5](https://github.com/googleapis/java-shared-config/compare/v1.5.4...v1.5.5) (2022-11-28) + + +### Dependencies + +* Updata java-docfx-doclet to v1.8.0 ([#540](https://github.com/googleapis/java-shared-config/issues/540)) ([29e20eb](https://github.com/googleapis/java-shared-config/commit/29e20eb8809fc3dc985111bbaecd09c281222484)) +* Update auto-value-annotation.version to v1.10.1 ([#543](https://github.com/googleapis/java-shared-config/issues/543)) ([b83ac8b](https://github.com/googleapis/java-shared-config/commit/b83ac8b0d0b121f522d850983421d9a7a31a8627)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.4 ([#535](https://github.com/googleapis/java-shared-config/issues/535)) ([eeeda5d](https://github.com/googleapis/java-shared-config/commit/eeeda5d41a4e2d3632afa95cede3174b44a135eb)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.5.0 ([#545](https://github.com/googleapis/java-shared-config/issues/545)) ([30c48d1](https://github.com/googleapis/java-shared-config/commit/30c48d17a4d2b0e86cac2f58bf6b6df2865a0fbd)) +* update dependency org.codehaus.mojo:flatten-maven-plugin to v1.3.0 ([ce1a04e](https://github.com/googleapis/java-shared-config/commit/ce1a04e5a319754963a6da6f9da0055e53449b3c)) +* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.16 ([#528](https://github.com/googleapis/java-shared-config/issues/528)) ([a6db032](https://github.com/googleapis/java-shared-config/commit/a6db032d261ec1534e9b54a055adde1c7b3ebdd6)) +* Update dependency org.graalvm.buildtools:junit-platform-native to v0.9.17 ([#537](https://github.com/googleapis/java-shared-config/issues/537)) ([5d34fff](https://github.com/googleapis/java-shared-config/commit/5d34fff2d487f5b88614c076df1928ae8f7ef810)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.16 ([#529](https://github.com/googleapis/java-shared-config/issues/529)) ([e802be9](https://github.com/googleapis/java-shared-config/commit/e802be90f2ff121e403fdc8cc590ec29e4b98729)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.17 ([#538](https://github.com/googleapis/java-shared-config/issues/538)) ([bf7fd02](https://github.com/googleapis/java-shared-config/commit/bf7fd02be0bb5934664d35d7e8e4effb4716f58e)) +* Update graalvm native-image dependencies to v0.9.18 ([#544](https://github.com/googleapis/java-shared-config/issues/544)) ([59a7b6d](https://github.com/googleapis/java-shared-config/commit/59a7b6d612aee531342410d0adc3ea161c26fea0)) + ## [1.5.4](https://github.com/googleapis/java-shared-config/compare/v1.5.3...v1.5.4) (2022-10-19) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 7d569ba16f9a..21bf87c8da94 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.5-SNAPSHOT + 1.5.5 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 3b96c52d3334..32f6907a09de 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.4:1.5.5-SNAPSHOT +google-cloud-shared-config:1.5.5:1.5.5 From bb95f0ecba4a91ee5e43fa3617c3471697e31ad2 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 20 Dec 2022 21:30:14 +0000 Subject: [PATCH 430/794] chore: upgrade native image checks to graalvm-22.3.0 (#1718) (#547) chore: upgrade native image checks to graalvm-22.3.0 Source-Link: https://togithub.com/googleapis/synthtool/commit/5e52896b69b145a3fac6827e4e75e617abdc9dd8 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:27b1b1884dce60460d7521b23c2a73376cba90c0ef3d9f0d32e4bdb786959cfd --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg | 2 +- java-shared-config/.kokoro/presubmit/graalvm-native.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 0f0647b00ef2..4ca0036da327 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:e76136cc48f90aa19ba29cdfbd4002111467e44a1c9d905867d98dafafbd03bb + digest: sha256:27b1b1884dce60460d7521b23c2a73376cba90c0ef3d9f0d32e4bdb786959cfd diff --git a/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg b/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg index a3f7fb9d4943..e20330c3ca60 100644 --- a/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg +++ b/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0" } env_vars: { diff --git a/java-shared-config/.kokoro/presubmit/graalvm-native.cfg b/java-shared-config/.kokoro/presubmit/graalvm-native.cfg index 4c7225ec924e..0fd6ba2fa0ce 100644 --- a/java-shared-config/.kokoro/presubmit/graalvm-native.cfg +++ b/java-shared-config/.kokoro/presubmit/graalvm-native.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.0" } env_vars: { From 45ec74d123c8deacab9765dc62e5e2f795642fbf Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 20 Dec 2022 22:32:35 +0100 Subject: [PATCH 431/794] build(deps): update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.4.0 (#548) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-dependency-plugin](https://maven.apache.org/plugins/) | `3.3.0` -> `3.4.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-dependency-plugin/3.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-dependency-plugin/3.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-dependency-plugin/3.4.0/compatibility-slim/3.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-dependency-plugin/3.4.0/confidence-slim/3.3.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 21bf87c8da94..41298c250d53 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -197,7 +197,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.3.0 + 3.4.0 javax.annotation:javax.annotation-api From 4187b72a3184b243d7f89b27c2a263b75374e46e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 20 Dec 2022 22:36:29 +0100 Subject: [PATCH 432/794] deps: update graalvm native-image dependencies to v0.9.19 (#550) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.18` -> `0.9.19` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.19/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.19/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.19/compatibility-slim/0.9.18)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.19/confidence-slim/0.9.18)](https://docs.renovatebot.com/merge-confidence/) | | [org.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.18` -> `0.9.19` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.19/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.19/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.19/compatibility-slim/0.9.18)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.19/confidence-slim/0.9.18)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.19`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.19) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.18...0.9.19) #### What's Changed - Remove dev version from workflow by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/370](https://togithub.com/graalvm/native-build-tools/pull/370) - Fix compile task out of date when runtime args change by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/372](https://togithub.com/graalvm/native-build-tools/pull/372) - Fix repository not downloaded from Maven Central by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/374](https://togithub.com/graalvm/native-build-tools/pull/374) **Full Changelog**: https://togithub.com/graalvm/native-build-tools/compare/0.9.18...0.9.19
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 41298c250d53..6c368837e027 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -794,7 +794,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.18 + 0.9.19 test @@ -820,7 +820,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.18 + 0.9.19 true From d79d2a380bd81a8a3866fafe1eb9b9bd43800249 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 20 Dec 2022 22:30:21 +0000 Subject: [PATCH 433/794] build(deps): bump certifi from 2022.9.24 to 2022.12.7 in /synthtool/gcp/templates/java_library/.kokoro (#1732) (#552) build(deps): bump certifi Bumps [certifi](https://togithub.com/certifi/python-certifi) from 2022.9.24 to 2022.12.7. - [Release notes](https://togithub.com/certifi/python-certifi/releases) - [Commits](https://togithub.com/certifi/python-certifi/compare/2022.09.24...2022.12.07) --- updated-dependencies: - dependency-name: certifi dependency-type: direct:production ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jeff Ching Source-Link: https://togithub.com/googleapis/synthtool/commit/ae0d43e5f17972981fe501ecf5a5d20055128bea Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:9de537d592b60e5eac73b374a28263969bae91ecdb29b445e894576fbf54851c --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.kokoro/requirements.in | 2 +- java-shared-config/.kokoro/requirements.txt | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 4ca0036da327..288e394897e6 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:27b1b1884dce60460d7521b23c2a73376cba90c0ef3d9f0d32e4bdb786959cfd + digest: sha256:9de537d592b60e5eac73b374a28263969bae91ecdb29b445e894576fbf54851c diff --git a/java-shared-config/.kokoro/requirements.in b/java-shared-config/.kokoro/requirements.in index 924f94ae6fa1..a5010f77d413 100644 --- a/java-shared-config/.kokoro/requirements.in +++ b/java-shared-config/.kokoro/requirements.in @@ -17,7 +17,7 @@ pycparser==2.21 pyperclip==1.8.2 python-dateutil==2.8.2 requests==2.27.1 -certifi==2022.9.24 +certifi==2022.12.7 importlib-metadata==4.8.3 zipp==3.6.0 google_api_core==2.8.2 diff --git a/java-shared-config/.kokoro/requirements.txt b/java-shared-config/.kokoro/requirements.txt index 71fcafc70316..15c404aa5a8c 100644 --- a/java-shared-config/.kokoro/requirements.txt +++ b/java-shared-config/.kokoro/requirements.txt @@ -16,9 +16,9 @@ cachetools==4.2.4 \ # via # -r requirements.in # google-auth -certifi==2022.9.24 \ - --hash=sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 \ - --hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382 +certifi==2022.12.7 \ + --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \ + --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18 # via # -r requirements.in # requests From 886a92558b68525a3d9a7fb030792fabe727d8a0 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 3 Jan 2023 15:46:32 +0100 Subject: [PATCH 434/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.6.0 (#554) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `10.5.0` -> `10.6.0` | [![age](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.6.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.6.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.6.0/compatibility-slim/10.5.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.6.0/confidence-slim/10.5.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 6c368837e027..9fb44685d0f1 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -643,7 +643,7 @@ com.puppycrawl.tools checkstyle - 10.5.0 + 10.6.0 From 3d742863fd9eb2434387ce9f878e121d01330094 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 13 Feb 2023 17:00:17 +0000 Subject: [PATCH 435/794] build(deps): update surefire.version to v3.0.0-m8 (#559) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.surefire:surefire-junit47](https://maven.apache.org/surefire/) | `3.0.0-M7` -> `3.0.0-M8` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.surefire:surefire-junit47/3.0.0-M8/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.surefire:surefire-junit47/3.0.0-M8/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.surefire:surefire-junit47/3.0.0-M8/compatibility-slim/3.0.0-M7)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.surefire:surefire-junit47/3.0.0-M8/confidence-slim/3.0.0-M7)](https://docs.renovatebot.com/merge-confidence/) | | [org.apache.maven.plugins:maven-failsafe-plugin](https://maven.apache.org/surefire/) | `3.0.0-M7` -> `3.0.0-M8` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-failsafe-plugin/3.0.0-M8/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-failsafe-plugin/3.0.0-M8/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-failsafe-plugin/3.0.0-M8/compatibility-slim/3.0.0-M7)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-failsafe-plugin/3.0.0-M8/confidence-slim/3.0.0-M7)](https://docs.renovatebot.com/merge-confidence/) | | [org.apache.maven.plugins:maven-surefire-plugin](https://maven.apache.org/surefire/) | `3.0.0-M7` -> `3.0.0-M8` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.0.0-M8/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.0.0-M8/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.0.0-M8/compatibility-slim/3.0.0-M7)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.0.0-M8/confidence-slim/3.0.0-M7)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9fb44685d0f1..87d758a08025 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -64,7 +64,7 @@ false true 1.10.1 - 3.0.0-M7 + 3.0.0-M8 /java/docs/reference/ From f7a97d8b29ea76b6e986b5cc21736f9d5e6f2755 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 13 Feb 2023 17:00:23 +0000 Subject: [PATCH 436/794] build(deps): update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.2.1 (#557) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-checkstyle-plugin](https://maven.apache.org/plugins/) | `3.2.0` -> `3.2.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-checkstyle-plugin/3.2.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-checkstyle-plugin/3.2.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-checkstyle-plugin/3.2.1/compatibility-slim/3.2.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-checkstyle-plugin/3.2.1/confidence-slim/3.2.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 87d758a08025..03c69fe5a683 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -638,7 +638,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.2.0 + 3.2.1 com.puppycrawl.tools From 70a9253eba2af57c5c4119f447df29c50375d7a8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 13 Feb 2023 17:02:12 +0000 Subject: [PATCH 437/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.4.2 (#558) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-project-info-reports-plugin](https://maven.apache.org/plugins/) | `3.4.1` -> `3.4.2` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.2/compatibility-slim/3.4.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.2/confidence-slim/3.4.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 03c69fe5a683..be2a7f3dbac8 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -449,7 +449,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.1 + 3.4.2 From 2d3a1178daa540e024a3b865bafe6e9e07d7f9c1 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 17:54:12 -0500 Subject: [PATCH 438/794] chore: Upgrade to later version of gcp-uploader and protobuf (#1741) (#555) * chore: Upgrade to later version of gcp-uploader and protobuf * chore: Add secretstorage version * chore: Use python 3.9.13 * chore: Unpin all python versions * chore: Rerun pipcompile tool * chore: Rerun pipcompile tool with --allow-unsafe * chore: Add --require-hashes * chore: Update requirements file * chore: Remove --require-hashes * chore: Print python version * chore: Add new generated hashes for requirements.txt * chore: Remove python version check in cloud build * chore: Allow synthtool to update python dependencies * chore: Add typing-extensions into requirements * chore: Unpin docker requirements.in file * chore: Add java synthtool validation * chore: Add check to import java synthtool python package Source-Link: https://github.com/googleapis/synthtool/commit/91904bfb986c51516389fb591c67053cdf4de104 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:4566cf7fcd0eece77705330267b2b61a70165711c7829d049b60bc2f1bbcd74e Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 4 +- java-shared-config/.kokoro/requirements.in | 40 +--- java-shared-config/.kokoro/requirements.txt | 186 +++++++------------ 3 files changed, 78 insertions(+), 152 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 288e394897e6..2b48c81e3722 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 Google LLC +# Copyright 2023 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:9de537d592b60e5eac73b374a28263969bae91ecdb29b445e894576fbf54851c + digest: sha256:4566cf7fcd0eece77705330267b2b61a70165711c7829d049b60bc2f1bbcd74e diff --git a/java-shared-config/.kokoro/requirements.in b/java-shared-config/.kokoro/requirements.in index a5010f77d413..b19a8dbfdd5e 100644 --- a/java-shared-config/.kokoro/requirements.in +++ b/java-shared-config/.kokoro/requirements.in @@ -1,34 +1,6 @@ -gcp-docuploader==0.6.3 -google-crc32c==1.3.0 -googleapis-common-protos==1.56.3 -gcp-releasetool==1.9.1 -cryptography==38.0.3 -cachetools==4.2.4 -cffi==1.15.1 -jeepney==0.7.1 -jinja2==3.0.3 -markupsafe==2.0.1 -keyring==23.4.1 -packaging==21.3 -protobuf==3.19.5 -pyjwt==2.4.0 -pyparsing==3.0.9 -pycparser==2.21 -pyperclip==1.8.2 -python-dateutil==2.8.2 -requests==2.27.1 -certifi==2022.12.7 -importlib-metadata==4.8.3 -zipp==3.6.0 -google_api_core==2.8.2 -google-cloud-storage==2.0.0 -google-resumable-media==2.3.3 -google-cloud-core==2.3.1 -typing-extensions==4.1.1 -urllib3==1.26.12 -zipp==3.6.0 -rsa==4.9 -six==1.16.0 -attrs==22.1.0 -google-auth==2.14.1 -idna==3.4 \ No newline at end of file +gcp-docuploader +gcp-releasetool +wheel +setuptools +typing-extensions +click<8.1.0 \ No newline at end of file diff --git a/java-shared-config/.kokoro/requirements.txt b/java-shared-config/.kokoro/requirements.txt index 15c404aa5a8c..1dfe630412d9 100644 --- a/java-shared-config/.kokoro/requirements.txt +++ b/java-shared-config/.kokoro/requirements.txt @@ -1,27 +1,21 @@ # -# This file is autogenerated by pip-compile with python 3.10 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: # -# pip-compile --generate-hashes requirements.in +# pip-compile --allow-unsafe --generate-hashes requirements.in # attrs==22.1.0 \ --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \ --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool cachetools==4.2.4 \ --hash=sha256:89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693 \ --hash=sha256:92971d3cb7d2a97efff7c7bb1657f21a8f5fb309a37530537c71b1774189f2d1 - # via - # -r requirements.in - # google-auth + # via google-auth certifi==2022.12.7 \ --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \ --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18 - # via - # -r requirements.in - # requests + # via requests cffi==1.15.1 \ --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \ @@ -87,9 +81,7 @@ cffi==1.15.1 \ --hash=sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b \ --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \ --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0 - # via - # -r requirements.in - # cryptography + # via cryptography charset-normalizer==2.0.12 \ --hash=sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597 \ --hash=sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df @@ -98,6 +90,7 @@ click==8.0.4 \ --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \ --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb # via + # -r requirements.in # gcp-docuploader # gcp-releasetool colorlog==6.7.0 \ @@ -132,12 +125,11 @@ cryptography==38.0.3 \ --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \ --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722 # via - # -r requirements.in # gcp-releasetool # secretstorage -gcp-docuploader==0.6.3 \ - --hash=sha256:ba8c9d76b3bbac54b0311c503a373b00edc2dc02d6d54ea9507045adb8e870f7 \ - --hash=sha256:c0f5aaa82ce1854a386197e4e359b120ad6d4e57ae2c812fce42219a3288026b +gcp-docuploader==0.6.4 \ + --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \ + --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf # via -r requirements.in gcp-releasetool==1.9.1 \ --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \ @@ -147,13 +139,12 @@ google-api-core==2.8.2 \ --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \ --hash=sha256:93c6a91ccac79079ac6bbf8b74ee75db970cc899278b97d53bc012f35908cf50 # via - # -r requirements.in # google-cloud-core # google-cloud-storage google-auth==2.14.1 \ + --hash=sha256:ccaa901f31ad5cbb562615eb8b664b3dd0bf5404a67618e642307f00613eda4d \ --hash=sha256:f5d8701633bebc12e0deea4df8abd8aff31c28b355360597f7f2ee60f2e4d016 # via - # -r requirements.in # gcp-releasetool # google-api-core # google-cloud-core @@ -161,15 +152,11 @@ google-auth==2.14.1 \ google-cloud-core==2.3.1 \ --hash=sha256:113ba4f492467d5bd442c8d724c1a25ad7384045c3178369038840ecdd19346c \ --hash=sha256:34334359cb04187bdc80ddcf613e462dfd7a3aabbc3fe4d118517ab4b9303d53 - # via - # -r requirements.in - # google-cloud-storage + # via google-cloud-storage google-cloud-storage==2.0.0 \ --hash=sha256:a57a15aead0f9dfbd4381f1bfdbe8bf89818a4bd75bab846cafcefb2db846c47 \ --hash=sha256:ec4be60bb223a3a960f0d01697d849b86d91cad815a84915a32ed3635e93a5e7 - # via - # -r requirements.in - # gcp-docuploader + # via gcp-docuploader google-crc32c==1.3.0 \ --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \ --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \ @@ -214,52 +201,37 @@ google-crc32c==1.3.0 \ --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \ --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \ --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3 - # via - # -r requirements.in - # google-resumable-media + # via google-resumable-media google-resumable-media==2.3.3 \ --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \ --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5 - # via - # -r requirements.in - # google-cloud-storage + # via google-cloud-storage googleapis-common-protos==1.56.3 \ --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \ --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461 - # via - # -r requirements.in - # google-api-core + # via google-api-core idna==3.4 \ --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \ --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2 - # via - # -r requirements.in - # requests + # via requests importlib-metadata==4.8.3 \ --hash=sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e \ --hash=sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668 + # via keyring +jeepney==0.8.0 \ + --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \ + --hash=sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755 # via - # -r requirements.in - # keyring -jeepney==0.7.1 \ - --hash=sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac \ - --hash=sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f - # via - # -r requirements.in # keyring # secretstorage jinja2==3.0.3 \ --hash=sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8 \ --hash=sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool keyring==23.4.1 \ --hash=sha256:17e49fb0d6883c2b4445359434dba95aad84aabb29bbff044ad0ed7100232eca \ --hash=sha256:89cbd74d4683ed164c8082fb38619341097741323b3786905c6dac04d6915a55 - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool markupsafe==2.0.1 \ --hash=sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298 \ --hash=sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64 \ @@ -330,49 +302,41 @@ markupsafe==2.0.1 \ --hash=sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509 \ --hash=sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51 \ --hash=sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872 - # via - # -r requirements.in - # jinja2 + # via jinja2 packaging==21.3 \ --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 + # via gcp-releasetool +protobuf==3.20.1 \ + --hash=sha256:06059eb6953ff01e56a25cd02cca1a9649a75a7e65397b5b9b4e929ed71d10cf \ + --hash=sha256:097c5d8a9808302fb0da7e20edf0b8d4703274d140fd25c5edabddcde43e081f \ + --hash=sha256:284f86a6207c897542d7e956eb243a36bb8f9564c1742b253462386e96c6b78f \ + --hash=sha256:32ca378605b41fd180dfe4e14d3226386d8d1b002ab31c969c366549e66a2bb7 \ + --hash=sha256:3cc797c9d15d7689ed507b165cd05913acb992d78b379f6014e013f9ecb20996 \ + --hash=sha256:62f1b5c4cd6c5402b4e2d63804ba49a327e0c386c99b1675c8a0fefda23b2067 \ + --hash=sha256:69ccfdf3657ba59569c64295b7d51325f91af586f8d5793b734260dfe2e94e2c \ + --hash=sha256:6f50601512a3d23625d8a85b1638d914a0970f17920ff39cec63aaef80a93fb7 \ + --hash=sha256:7403941f6d0992d40161aa8bb23e12575637008a5a02283a930addc0508982f9 \ + --hash=sha256:755f3aee41354ae395e104d62119cb223339a8f3276a0cd009ffabfcdd46bb0c \ + --hash=sha256:77053d28427a29987ca9caf7b72ccafee011257561259faba8dd308fda9a8739 \ + --hash=sha256:7e371f10abe57cee5021797126c93479f59fccc9693dafd6bd5633ab67808a91 \ + --hash=sha256:9016d01c91e8e625141d24ec1b20fed584703e527d28512aa8c8707f105a683c \ + --hash=sha256:9be73ad47579abc26c12024239d3540e6b765182a91dbc88e23658ab71767153 \ + --hash=sha256:adc31566d027f45efe3f44eeb5b1f329da43891634d61c75a5944e9be6dd42c9 \ + --hash=sha256:adfc6cf69c7f8c50fd24c793964eef18f0ac321315439d94945820612849c388 \ + --hash=sha256:af0ebadc74e281a517141daad9d0f2c5d93ab78e9d455113719a45a49da9db4e \ + --hash=sha256:cb29edb9eab15742d791e1025dd7b6a8f6fcb53802ad2f6e3adcb102051063ab \ + --hash=sha256:cd68be2559e2a3b84f517fb029ee611546f7812b1fdd0aa2ecc9bc6ec0e4fdde \ + --hash=sha256:cdee09140e1cd184ba9324ec1df410e7147242b94b5f8b0c64fc89e38a8ba531 \ + --hash=sha256:db977c4ca738dd9ce508557d4fce0f5aebd105e158c725beec86feb1f6bc20d8 \ + --hash=sha256:dd5789b2948ca702c17027c84c2accb552fc30f4622a98ab5c51fcfe8c50d3e7 \ + --hash=sha256:e250a42f15bf9d5b09fe1b293bdba2801cd520a9f5ea2d7fb7536d4441811d20 \ + --hash=sha256:ff8d8fa42675249bb456f5db06c00de6c2f4c27a065955917b28c4f15978b9c3 # via - # -r requirements.in - # gcp-releasetool -protobuf==3.19.5 \ - --hash=sha256:1867f93b06a183f87696871bb8d1e99ee71dbb69d468ce1f0cc8bf3d30f982f3 \ - --hash=sha256:3c4160b601220627f7e91154e572baf5e161a9c3f445a8242d536ee3d0b7b17c \ - --hash=sha256:4ee2af7051d3b10c8a4fe6fd1a2c69f201fea36aeee7086cf202a692e1b99ee1 \ - --hash=sha256:5266c36cc0af3bb3dbf44f199d225b33da66a9a5c3bdc2b14865ad10eddf0e37 \ - --hash=sha256:5470f892961af464ae6eaf0f3099e2c1190ae8c7f36f174b89491281341f79ca \ - --hash=sha256:66d14b5b90090353efe75c9fb1bf65ef7267383034688d255b500822e37d5c2f \ - --hash=sha256:67efb5d20618020aa9596e17bfc37ca068c28ec0c1507d9507f73c93d46c9855 \ - --hash=sha256:696e6cfab94cc15a14946f2bf72719dced087d437adbd994fff34f38986628bc \ - --hash=sha256:6a02172b9650f819d01fb8e224fc69b0706458fc1ab4f1c669281243c71c1a5e \ - --hash=sha256:6eca9ae238ba615d702387a2ddea635d535d769994a9968c09a4ca920c487ab9 \ - --hash=sha256:950abd6c00e7b51f87ae8b18a0ce4d69fea217f62f171426e77de5061f6d9850 \ - --hash=sha256:9e1d74032f56ff25f417cfe84c8147047732e5059137ca42efad20cbbd25f5e0 \ - --hash=sha256:9e42b1cf2ecd8a1bd161239e693f22035ba99905ae6d7efeac8a0546c7ec1a27 \ - --hash=sha256:9f957ef53e872d58a0afd3bf6d80d48535d28c99b40e75e6634cbc33ea42fd54 \ - --hash=sha256:a89aa0c042e61e11ade320b802d6db4ee5391d8d973e46d3a48172c1597789f8 \ - --hash=sha256:c0f80876a8ff0ae7064084ed094eb86497bd5a3812e6fc96a05318b92301674e \ - --hash=sha256:c44e3282cff74ad18c7e8a0375f407f69ee50c2116364b44492a196293e08b21 \ - --hash=sha256:d249519ba5ecf5dd6b18150c9b6bcde510b273714b696f3923ff8308fc11ae49 \ - --hash=sha256:d3973a2d58aefc7d1230725c2447ce7f86a71cbc094b86a77c6ee1505ac7cdb1 \ - --hash=sha256:dca2284378a5f2a86ffed35c6ac147d14c48b525eefcd1083e5a9ce28dfa8657 \ - --hash=sha256:e63b0b3c42e51c94add62b010366cd4979cb6d5f06158bcae8faac4c294f91e1 \ - --hash=sha256:f2b599a21c9a32e171ec29a2ac54e03297736c578698e11b099d031f79da114b \ - --hash=sha256:f2bde37667b18c2b5280df83bc799204394a5d2d774e4deaf9de0eb741df6833 \ - --hash=sha256:f4f909f4dde413dec435a44b0894956d55bb928ded7d6e3c726556ca4c796e84 \ - --hash=sha256:f976234e20ab2785f54224bcdafa027674e23663b132fa3ca0caa291a6cfbde7 \ - --hash=sha256:f9cebda093c2f6bfed88f1c17cdade09d4d96096421b344026feee236532d4de - # via - # -r requirements.in # gcp-docuploader # gcp-releasetool # google-api-core # google-cloud-storage - # googleapis-common-protos pyasn1==0.4.8 \ --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \ --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba @@ -386,71 +350,61 @@ pyasn1-modules==0.2.8 \ pycparser==2.21 \ --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 - # via - # -r requirements.in - # cffi + # via cffi pyjwt==2.4.0 \ --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \ --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool pyparsing==3.0.9 \ --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \ --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc - # via - # -r requirements.in - # packaging + # via packaging pyperclip==1.8.2 \ --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57 - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool python-dateutil==2.8.2 \ --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \ --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 - # via - # -r requirements.in - # gcp-releasetool + # via gcp-releasetool requests==2.27.1 \ --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \ --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d # via - # -r requirements.in # gcp-releasetool # google-api-core # google-cloud-storage rsa==4.9 \ --hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \ --hash=sha256:e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21 - # via - # -r requirements.in - # google-auth + # via google-auth secretstorage==3.3.3 \ --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 # via keyring +setuptools==65.6.3 \ + --hash=sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54 \ + --hash=sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75 + # via -r requirements.in six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 # via - # -r requirements.in # gcp-docuploader # google-auth # python-dateutil -typing-extensions==4.1.1 \ - --hash=sha256:1a9462dcc3347a79b1f1c0271fbe79e844580bb598bafa1ed208b94da3cdcd42 \ - --hash=sha256:21c85e0fe4b9a155d0799430b0ad741cdce7e359660ccbd8b530613e8df88ce2 +typing-extensions==4.4.0 \ + --hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \ + --hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e # via -r requirements.in urllib3==1.26.12 \ --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \ --hash=sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997 - # via - # -r requirements.in - # requests + # via requests +wheel==0.38.4 \ + --hash=sha256:965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac \ + --hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8 + # via -r requirements.in zipp==3.6.0 \ --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \ --hash=sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc - # via - # -r requirements.in - # importlib-metadata + # via importlib-metadata From 42a065cc863b7191c68d6226f7f9982ba137f382 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 23:06:16 +0000 Subject: [PATCH 439/794] fix(java): skip fixing poms for special modules (#1744) (#556) fix(java): handle empty modules Fixes https://togithub.com/googleapis/synthtool/issues/1743 Source-Link: https://togithub.com/googleapis/synthtool/commit/482d649d5d705c18028076985f64b214f6b6c14e Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:bd5071596a47614d1fe15eb766c4255bae330f823b606e1196a3b0c8d2e96fd1 --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.kokoro/requirements.txt | 48 ++++++++++---------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 2b48c81e3722..f8a8575314cc 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:4566cf7fcd0eece77705330267b2b61a70165711c7829d049b60bc2f1bbcd74e + digest: sha256:bd5071596a47614d1fe15eb766c4255bae330f823b606e1196a3b0c8d2e96fd1 diff --git a/java-shared-config/.kokoro/requirements.txt b/java-shared-config/.kokoro/requirements.txt index 1dfe630412d9..4895c9631fd8 100644 --- a/java-shared-config/.kokoro/requirements.txt +++ b/java-shared-config/.kokoro/requirements.txt @@ -307,31 +307,29 @@ packaging==21.3 \ --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 # via gcp-releasetool -protobuf==3.20.1 \ - --hash=sha256:06059eb6953ff01e56a25cd02cca1a9649a75a7e65397b5b9b4e929ed71d10cf \ - --hash=sha256:097c5d8a9808302fb0da7e20edf0b8d4703274d140fd25c5edabddcde43e081f \ - --hash=sha256:284f86a6207c897542d7e956eb243a36bb8f9564c1742b253462386e96c6b78f \ - --hash=sha256:32ca378605b41fd180dfe4e14d3226386d8d1b002ab31c969c366549e66a2bb7 \ - --hash=sha256:3cc797c9d15d7689ed507b165cd05913acb992d78b379f6014e013f9ecb20996 \ - --hash=sha256:62f1b5c4cd6c5402b4e2d63804ba49a327e0c386c99b1675c8a0fefda23b2067 \ - --hash=sha256:69ccfdf3657ba59569c64295b7d51325f91af586f8d5793b734260dfe2e94e2c \ - --hash=sha256:6f50601512a3d23625d8a85b1638d914a0970f17920ff39cec63aaef80a93fb7 \ - --hash=sha256:7403941f6d0992d40161aa8bb23e12575637008a5a02283a930addc0508982f9 \ - --hash=sha256:755f3aee41354ae395e104d62119cb223339a8f3276a0cd009ffabfcdd46bb0c \ - --hash=sha256:77053d28427a29987ca9caf7b72ccafee011257561259faba8dd308fda9a8739 \ - --hash=sha256:7e371f10abe57cee5021797126c93479f59fccc9693dafd6bd5633ab67808a91 \ - --hash=sha256:9016d01c91e8e625141d24ec1b20fed584703e527d28512aa8c8707f105a683c \ - --hash=sha256:9be73ad47579abc26c12024239d3540e6b765182a91dbc88e23658ab71767153 \ - --hash=sha256:adc31566d027f45efe3f44eeb5b1f329da43891634d61c75a5944e9be6dd42c9 \ - --hash=sha256:adfc6cf69c7f8c50fd24c793964eef18f0ac321315439d94945820612849c388 \ - --hash=sha256:af0ebadc74e281a517141daad9d0f2c5d93ab78e9d455113719a45a49da9db4e \ - --hash=sha256:cb29edb9eab15742d791e1025dd7b6a8f6fcb53802ad2f6e3adcb102051063ab \ - --hash=sha256:cd68be2559e2a3b84f517fb029ee611546f7812b1fdd0aa2ecc9bc6ec0e4fdde \ - --hash=sha256:cdee09140e1cd184ba9324ec1df410e7147242b94b5f8b0c64fc89e38a8ba531 \ - --hash=sha256:db977c4ca738dd9ce508557d4fce0f5aebd105e158c725beec86feb1f6bc20d8 \ - --hash=sha256:dd5789b2948ca702c17027c84c2accb552fc30f4622a98ab5c51fcfe8c50d3e7 \ - --hash=sha256:e250a42f15bf9d5b09fe1b293bdba2801cd520a9f5ea2d7fb7536d4441811d20 \ - --hash=sha256:ff8d8fa42675249bb456f5db06c00de6c2f4c27a065955917b28c4f15978b9c3 +protobuf==3.20.2 \ + --hash=sha256:03d76b7bd42ac4a6e109742a4edf81ffe26ffd87c5993126d894fe48a120396a \ + --hash=sha256:09e25909c4297d71d97612f04f41cea8fa8510096864f2835ad2f3b3df5a5559 \ + --hash=sha256:18e34a10ae10d458b027d7638a599c964b030c1739ebd035a1dfc0e22baa3bfe \ + --hash=sha256:291fb4307094bf5ccc29f424b42268640e00d5240bf0d9b86bf3079f7576474d \ + --hash=sha256:2c0b040d0b5d5d207936ca2d02f00f765906622c07d3fa19c23a16a8ca71873f \ + --hash=sha256:384164994727f274cc34b8abd41a9e7e0562801361ee77437099ff6dfedd024b \ + --hash=sha256:3cb608e5a0eb61b8e00fe641d9f0282cd0eedb603be372f91f163cbfbca0ded0 \ + --hash=sha256:5d9402bf27d11e37801d1743eada54372f986a372ec9679673bfcc5c60441151 \ + --hash=sha256:712dca319eee507a1e7df3591e639a2b112a2f4a62d40fe7832a16fd19151750 \ + --hash=sha256:7a5037af4e76c975b88c3becdf53922b5ffa3f2cddf657574a4920a3b33b80f3 \ + --hash=sha256:8228e56a865c27163d5d1d1771d94b98194aa6917bcfb6ce139cbfa8e3c27334 \ + --hash=sha256:84a1544252a933ef07bb0b5ef13afe7c36232a774affa673fc3636f7cee1db6c \ + --hash=sha256:84fe5953b18a383fd4495d375fe16e1e55e0a3afe7b4f7b4d01a3a0649fcda9d \ + --hash=sha256:9c673c8bfdf52f903081816b9e0e612186684f4eb4c17eeb729133022d6032e3 \ + --hash=sha256:a9e5ae5a8e8985c67e8944c23035a0dff2c26b0f5070b2f55b217a1c33bbe8b1 \ + --hash=sha256:b4fdb29c5a7406e3f7ef176b2a7079baa68b5b854f364c21abe327bbeec01cdb \ + --hash=sha256:c184485e0dfba4dfd451c3bd348c2e685d6523543a0f91b9fd4ae90eb09e8422 \ + --hash=sha256:c9cdf251c582c16fd6a9f5e95836c90828d51b0069ad22f463761d27c6c19019 \ + --hash=sha256:e39cf61bb8582bda88cdfebc0db163b774e7e03364bbf9ce1ead13863e81e359 \ + --hash=sha256:e8fbc522303e09036c752a0afcc5c0603e917222d8bedc02813fd73b4b4ed804 \ + --hash=sha256:f34464ab1207114e73bba0794d1257c150a2b89b7a9faf504e00af7c9fd58978 \ + --hash=sha256:f52dabc96ca99ebd2169dadbe018824ebda08a795c7684a0b7d203a290f3adb0 # via # gcp-docuploader # gcp-releasetool From 819a1509c57beb91e75d8de75979a2f49d0187c7 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 23:16:15 +0000 Subject: [PATCH 440/794] chore(java): omit `-Penable-integration-tests` parameter from native image test run command (#1757) (#564) Source-Link: https://togithub.com/googleapis/synthtool/commit/df311d1a70b53e86cfeaf0fccf4ded8202deaa6d Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:ff1a5832623e1b694203b89253dbfe4c2d4a33aae1baf60d323b1245672331eb --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.kokoro/build.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index f8a8575314cc..31923bd133a8 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:bd5071596a47614d1fe15eb766c4255bae330f823b606e1196a3b0c8d2e96fd1 + digest: sha256:ff1a5832623e1b694203b89253dbfe4c2d4a33aae1baf60d323b1245672331eb diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index 81635ed0c337..1c63330b0be2 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -71,12 +71,12 @@ integration) ;; graalvm) # Run Unit and Integration Tests with Native Image - mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test RETURN_CODE=$? ;; graalvm17) # Run Unit and Integration Tests with Native Image - mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test RETURN_CODE=$? ;; samples) From 08bb538cb8bf6063d6d416e4293fb197c68c2b8b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 23:30:15 +0000 Subject: [PATCH 441/794] build(deps): bump cryptography from 38.0.3 to 39.0.1 in /synthtool/gcp/templates/java_library/.kokoro (#1761) (#566) * build(deps): bump cryptography Bumps [cryptography](https://togithub.com/pyca/cryptography) from 38.0.3 to 39.0.1. - [Release notes](https://togithub.com/pyca/cryptography/releases) - [Changelog](https://togithub.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://togithub.com/pyca/cryptography/compare/38.0.3...39.0.1) --- updated-dependencies: - dependency-name: cryptography dependency-type: indirect ... Signed-off-by: dependabot[bot] * chore: disabling dependabot --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tomo Suzuki Co-authored-by: ddixit14 Source-Link: https://togithub.com/googleapis/synthtool/commit/0c6f8d4ac5358553ee734e26574f390bc43a736e Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:5ee35ee919254a3d1e7d4f8abbf1b8c8869ade317ceb2e4df709af1b4b3e9ca1 --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.github/dependabot.yml | 14 ++++++ java-shared-config/.kokoro/requirements.txt | 53 ++++++++------------ 3 files changed, 37 insertions(+), 32 deletions(-) create mode 100644 java-shared-config/.github/dependabot.yml diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 31923bd133a8..090264303f34 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:ff1a5832623e1b694203b89253dbfe4c2d4a33aae1baf60d323b1245672331eb + digest: sha256:5ee35ee919254a3d1e7d4f8abbf1b8c8869ade317ceb2e4df709af1b4b3e9ca1 diff --git a/java-shared-config/.github/dependabot.yml b/java-shared-config/.github/dependabot.yml new file mode 100644 index 000000000000..c8f413b0da30 --- /dev/null +++ b/java-shared-config/.github/dependabot.yml @@ -0,0 +1,14 @@ +version: 2 +updates: + - package-ecosystem: "maven" + directory: "/" + schedule: + interval: "daily" + # Disable version updates for Maven dependencies + open-pull-requests-limit: 0 + - package-ecosystem: "pip" + directory: "/" + schedule: + interval: "daily" + # Disable version updates for pip dependencies + open-pull-requests-limit: 0 \ No newline at end of file diff --git a/java-shared-config/.kokoro/requirements.txt b/java-shared-config/.kokoro/requirements.txt index 4895c9631fd8..cfadd22ce9b9 100644 --- a/java-shared-config/.kokoro/requirements.txt +++ b/java-shared-config/.kokoro/requirements.txt @@ -97,33 +97,28 @@ colorlog==6.7.0 \ --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \ --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5 # via gcp-docuploader -cryptography==38.0.3 \ - --hash=sha256:068147f32fa662c81aebab95c74679b401b12b57494872886eb5c1139250ec5d \ - --hash=sha256:06fc3cc7b6f6cca87bd56ec80a580c88f1da5306f505876a71c8cfa7050257dd \ - --hash=sha256:25c1d1f19729fb09d42e06b4bf9895212292cb27bb50229f5aa64d039ab29146 \ - --hash=sha256:402852a0aea73833d982cabb6d0c3bb582c15483d29fb7085ef2c42bfa7e38d7 \ - --hash=sha256:4e269dcd9b102c5a3d72be3c45d8ce20377b8076a43cbed6f660a1afe365e436 \ - --hash=sha256:5419a127426084933076132d317911e3c6eb77568a1ce23c3ac1e12d111e61e0 \ - --hash=sha256:554bec92ee7d1e9d10ded2f7e92a5d70c1f74ba9524947c0ba0c850c7b011828 \ - --hash=sha256:5e89468fbd2fcd733b5899333bc54d0d06c80e04cd23d8c6f3e0542358c6060b \ - --hash=sha256:65535bc550b70bd6271984d9863a37741352b4aad6fb1b3344a54e6950249b55 \ - --hash=sha256:6ab9516b85bebe7aa83f309bacc5f44a61eeb90d0b4ec125d2d003ce41932d36 \ - --hash=sha256:6addc3b6d593cd980989261dc1cce38263c76954d758c3c94de51f1e010c9a50 \ - --hash=sha256:728f2694fa743a996d7784a6194da430f197d5c58e2f4e278612b359f455e4a2 \ - --hash=sha256:785e4056b5a8b28f05a533fab69febf5004458e20dad7e2e13a3120d8ecec75a \ - --hash=sha256:78cf5eefac2b52c10398a42765bfa981ce2372cbc0457e6bf9658f41ec3c41d8 \ - --hash=sha256:7f836217000342d448e1c9a342e9163149e45d5b5eca76a30e84503a5a96cab0 \ - --hash=sha256:8d41a46251bf0634e21fac50ffd643216ccecfaf3701a063257fe0b2be1b6548 \ - --hash=sha256:984fe150f350a3c91e84de405fe49e688aa6092b3525f407a18b9646f6612320 \ - --hash=sha256:9b24bcff7853ed18a63cfb0c2b008936a9554af24af2fb146e16d8e1aed75748 \ - --hash=sha256:b1b35d9d3a65542ed2e9d90115dfd16bbc027b3f07ee3304fc83580f26e43249 \ - --hash=sha256:b1b52c9e5f8aa2b802d48bd693190341fae201ea51c7a167d69fc48b60e8a959 \ - --hash=sha256:bbf203f1a814007ce24bd4d51362991d5cb90ba0c177a9c08825f2cc304d871f \ - --hash=sha256:be243c7e2bfcf6cc4cb350c0d5cdf15ca6383bbcb2a8ef51d3c9411a9d4386f0 \ - --hash=sha256:bfbe6ee19615b07a98b1d2287d6a6073f734735b49ee45b11324d85efc4d5cbd \ - --hash=sha256:c46837ea467ed1efea562bbeb543994c2d1f6e800785bd5a2c98bc096f5cb220 \ - --hash=sha256:dfb4f4dd568de1b6af9f4cda334adf7d72cf5bc052516e1b2608b683375dd95c \ - --hash=sha256:ed7b00096790213e09eb11c97cc6e2b757f15f3d2f85833cd2d3ec3fe37c1722 +cryptography==39.0.1 \ + --hash=sha256:0f8da300b5c8af9f98111ffd512910bc792b4c77392a9523624680f7956a99d4 \ + --hash=sha256:35f7c7d015d474f4011e859e93e789c87d21f6f4880ebdc29896a60403328f1f \ + --hash=sha256:5aa67414fcdfa22cf052e640cb5ddc461924a045cacf325cd164e65312d99502 \ + --hash=sha256:5d2d8b87a490bfcd407ed9d49093793d0f75198a35e6eb1a923ce1ee86c62b41 \ + --hash=sha256:6687ef6d0a6497e2b58e7c5b852b53f62142cfa7cd1555795758934da363a965 \ + --hash=sha256:6f8ba7f0328b79f08bdacc3e4e66fb4d7aab0c3584e0bd41328dce5262e26b2e \ + --hash=sha256:706843b48f9a3f9b9911979761c91541e3d90db1ca905fd63fee540a217698bc \ + --hash=sha256:807ce09d4434881ca3a7594733669bd834f5b2c6d5c7e36f8c00f691887042ad \ + --hash=sha256:83e17b26de248c33f3acffb922748151d71827d6021d98c70e6c1a25ddd78505 \ + --hash=sha256:96f1157a7c08b5b189b16b47bc9db2332269d6680a196341bf30046330d15388 \ + --hash=sha256:aec5a6c9864be7df2240c382740fcf3b96928c46604eaa7f3091f58b878c0bb6 \ + --hash=sha256:b0afd054cd42f3d213bf82c629efb1ee5f22eba35bf0eec88ea9ea7304f511a2 \ + --hash=sha256:ced4e447ae29ca194449a3f1ce132ded8fcab06971ef5f618605aacaa612beac \ + --hash=sha256:d1f6198ee6d9148405e49887803907fe8962a23e6c6f83ea7d98f1c0de375695 \ + --hash=sha256:e124352fd3db36a9d4a21c1aa27fd5d051e621845cb87fb851c08f4f75ce8be6 \ + --hash=sha256:e422abdec8b5fa8462aa016786680720d78bdce7a30c652b7fadf83a4ba35336 \ + --hash=sha256:ef8b72fa70b348724ff1218267e7f7375b8de4e8194d1636ee60510aae104cd0 \ + --hash=sha256:f0c64d1bd842ca2633e74a1a28033d139368ad959872533b1bab8c80e8240a0c \ + --hash=sha256:f24077a3b5298a5a06a8e0536e3ea9ec60e4c7ac486755e5fb6e6ea9b3500106 \ + --hash=sha256:fdd188c8a6ef8769f148f88f859884507b954cc64db6b52f66ef199bb9ad660a \ + --hash=sha256:fe913f20024eb2cb2f323e42a64bdf2911bb9738a15dba7d3cce48151034e3a8 # via # gcp-releasetool # secretstorage @@ -379,10 +374,6 @@ secretstorage==3.3.3 \ --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 # via keyring -setuptools==65.6.3 \ - --hash=sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54 \ - --hash=sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75 - # via -r requirements.in six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 From bc0b6bdb1a3c144c15f93a99c4c59e3ca6fc8750 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 23:44:16 +0000 Subject: [PATCH 442/794] build(deps): update releasetool version for release scripts (#1768) (#570) This should fix release script reporting back to the release PRs Source-Link: https://togithub.com/googleapis/synthtool/commit/4c15ec0960687db8e6da43535fa1ee0e92fbb817 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:e62f3ea524b11c1cd6ff7f80362736d86c0056631346b5b106a421686fce2726 --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.kokoro/requirements.in | 2 +- java-shared-config/.kokoro/requirements.txt | 12 ++++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 090264303f34..a5361a30a366 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:5ee35ee919254a3d1e7d4f8abbf1b8c8869ade317ceb2e4df709af1b4b3e9ca1 + digest: sha256:e62f3ea524b11c1cd6ff7f80362736d86c0056631346b5b106a421686fce2726 diff --git a/java-shared-config/.kokoro/requirements.in b/java-shared-config/.kokoro/requirements.in index b19a8dbfdd5e..2092cc741d9c 100644 --- a/java-shared-config/.kokoro/requirements.in +++ b/java-shared-config/.kokoro/requirements.in @@ -1,5 +1,5 @@ gcp-docuploader -gcp-releasetool +gcp-releasetool>=1.10.5 # required for compatibility with cryptography>=39.x wheel setuptools typing-extensions diff --git a/java-shared-config/.kokoro/requirements.txt b/java-shared-config/.kokoro/requirements.txt index cfadd22ce9b9..c80f0a87cc53 100644 --- a/java-shared-config/.kokoro/requirements.txt +++ b/java-shared-config/.kokoro/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.9 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --allow-unsafe --generate-hashes requirements.in @@ -126,9 +126,9 @@ gcp-docuploader==0.6.4 \ --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \ --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf # via -r requirements.in -gcp-releasetool==1.9.1 \ - --hash=sha256:952f4055d5d986b070ae2a71c4410b250000f9cc5a1e26398fcd55a5bbc5a15f \ - --hash=sha256:d0d3c814a97c1a237517e837d8cfa668ced8df4b882452578ecef4a4e79c583b +gcp-releasetool==1.10.5 \ + --hash=sha256:174b7b102d704b254f2a26a3eda2c684fd3543320ec239baf771542a2e58e109 \ + --hash=sha256:e29d29927fe2ca493105a82958c6873bb2b90d503acac56be2c229e74de0eec9 # via -r requirements.in google-api-core==2.8.2 \ --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \ @@ -374,6 +374,10 @@ secretstorage==3.3.3 \ --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 # via keyring +setuptools==67.3.2 \ + --hash=sha256:95f00380ef2ffa41d9bba85d95b27689d923c93dfbafed4aecd7cf988a25e012 \ + --hash=sha256:bb6d8e508de562768f2027902929f8523932fcd1fb784e6d573d2cafac995a48 + # via -r requirements.in six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 From e49a3ee29fdc95656b8ae39b5c6f575f73e6ac7d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 22 Feb 2023 16:22:16 +0000 Subject: [PATCH 443/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.5.0 (#569) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-javadoc-plugin](https://maven.apache.org/plugins/) | `3.4.1` -> `3.5.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.5.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.5.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.5.0/compatibility-slim/3.4.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-javadoc-plugin/3.5.0/confidence-slim/3.4.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index be2a7f3dbac8..2db54ab448d6 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -476,7 +476,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.5.0 html @@ -576,7 +576,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.5.0 attach-javadocs @@ -708,7 +708,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.5.0 com.microsoft.doclet.DocFxDoclet false From 942f26b6682c6906467206410d1b2e358b5eff21 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 22 Feb 2023 16:22:28 +0000 Subject: [PATCH 444/794] build(deps): update dependency org.apache.maven.plugins:maven-enforcer-plugin to v3.2.1 (#562) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-enforcer-plugin](https://maven.apache.org/enforcer/) | `3.1.0` -> `3.2.1` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-enforcer-plugin/3.2.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-enforcer-plugin/3.2.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-enforcer-plugin/3.2.1/compatibility-slim/3.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-enforcer-plugin/3.2.1/confidence-slim/3.1.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2db54ab448d6..b95c4f5475ef 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -106,7 +106,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + 3.2.1 org.codehaus.mojo From 7cf6dbec77c87d235669b3402c5849b7a69ee0f4 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 22 Feb 2023 16:22:34 +0000 Subject: [PATCH 445/794] build(deps): update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.5.0 (#561) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-dependency-plugin](https://maven.apache.org/plugins/) | `3.4.0` -> `3.5.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-dependency-plugin/3.5.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-dependency-plugin/3.5.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-dependency-plugin/3.5.0/compatibility-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-dependency-plugin/3.5.0/confidence-slim/3.4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b95c4f5475ef..dd7f4e47c097 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -197,7 +197,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.4.0 + 3.5.0 javax.annotation:javax.annotation-api From e39eb102c11a5ccd0a0a31aea311bd2be6a2f957 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 22 Feb 2023 16:22:37 +0000 Subject: [PATCH 446/794] deps: update dependency org.junit.vintage:junit-vintage-engine to v5.9.2 (#560) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.junit.vintage:junit-vintage-engine](https://junit.org/junit5/) ([source](https://togithub.com/junit-team/junit5)) | `5.9.1` -> `5.9.2` | [![age](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.2/compatibility-slim/5.9.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.2/confidence-slim/5.9.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index dd7f4e47c097..6f40ac963634 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -787,7 +787,7 @@ org.junit.vintage junit-vintage-engine - 5.9.1 + 5.9.2 test From 314300fb8a2969e88e49031d01f1815deb14576c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 22 Feb 2023 16:24:17 +0000 Subject: [PATCH 447/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.7.0 (#563) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `10.6.0` -> `10.7.0` | [![age](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.7.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.7.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.7.0/compatibility-slim/10.6.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.7.0/confidence-slim/10.6.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 6f40ac963634..a0dbef3566b2 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -643,7 +643,7 @@ com.puppycrawl.tools checkstyle - 10.6.0 + 10.7.0 From 9b81784ae43c3e9819a2bf96ac79992674dba0d9 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 22 Feb 2023 16:24:23 +0000 Subject: [PATCH 448/794] deps: update graalvm native-image dependencies to v0.9.20 (#568) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.19` -> `0.9.20` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.20/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.20/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.20/compatibility-slim/0.9.19)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.20/confidence-slim/0.9.19)](https://docs.renovatebot.com/merge-confidence/) | | [org.graalvm.buildtools:junit-platform-native](https://togithub.com/graalvm/native-build-tools) | `0.9.19` -> `0.9.20` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.20/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.20/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.20/compatibility-slim/0.9.19)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:junit-platform-native/0.9.20/confidence-slim/0.9.19)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.20`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.20) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.19...0.9.20) #### What's Changed - Introduce a `showPublications` task by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/375](https://togithub.com/graalvm/native-build-tools/pull/375) - Quickstart guides for Native Image Build Tools Maven/Gradle plugins. by [@​olyagpl](https://togithub.com/olyagpl) in [https://togithub.com/graalvm/native-build-tools/pull/381](https://togithub.com/graalvm/native-build-tools/pull/381) - Fix `NativeImageUtils#checkVersion` by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://togithub.com/graalvm/native-build-tools/pull/386](https://togithub.com/graalvm/native-build-tools/pull/386) - Clarify bug report templates by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/392](https://togithub.com/graalvm/native-build-tools/pull/392) - Fix deadlock when collecting metadata by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/391](https://togithub.com/graalvm/native-build-tools/pull/391) - Add maven support for agent by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/343](https://togithub.com/graalvm/native-build-tools/pull/343) - Update metadataRepository version by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/394](https://togithub.com/graalvm/native-build-tools/pull/394) - Make max parallel native image builds configurable by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/395](https://togithub.com/graalvm/native-build-tools/pull/395) - Set regex to accept both GraalVM and native-image as version names by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/396](https://togithub.com/graalvm/native-build-tools/pull/396) - Add missing notes in index by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/399](https://togithub.com/graalvm/native-build-tools/pull/399) #### New Contributors - [@​olyagpl](https://togithub.com/olyagpl) made their first contribution in [https://togithub.com/graalvm/native-build-tools/pull/381](https://togithub.com/graalvm/native-build-tools/pull/381) **Full Changelog**: https://togithub.com/graalvm/native-build-tools/compare/0.9.19...0.9.20
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index a0dbef3566b2..ae2459f4448d 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -794,7 +794,7 @@ org.graalvm.buildtools junit-platform-native - 0.9.19 + 0.9.20 test @@ -820,7 +820,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.19 + 0.9.20 true From f2c824cc00624b7fab97488531919bcd40636e58 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 9 Mar 2023 22:03:40 +0000 Subject: [PATCH 449/794] build(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.11.0 (#574) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ae2459f4448d..aa711e1558b0 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -171,7 +171,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.11.0 1.8 1.8 From 314c414a4ca79505586c1ca29e4a50f1f2ca0efb Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 9 Mar 2023 22:04:10 +0000 Subject: [PATCH 450/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.8.1 (#573) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index aa711e1558b0..436ccc8f38f5 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -643,7 +643,7 @@ com.puppycrawl.tools checkstyle - 10.7.0 + 10.8.1 From 7f7787ba51b544af29032fbe37c763c2de81cb83 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 9 Mar 2023 22:22:36 +0000 Subject: [PATCH 451/794] build(deps): update surefire.version to v3.0.0-m9 (#567) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 436ccc8f38f5..297a24d7178a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -64,7 +64,7 @@ false true 1.10.1 - 3.0.0-M8 + 3.0.0-M9 /java/docs/reference/ From a3cb7671636d7f290ea071e899e11f4997e57a1b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 14 Mar 2023 22:13:10 +0000 Subject: [PATCH 452/794] build(deps): update surefire.version to v3.0.0 (#575) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 297a24d7178a..4c644acac56a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -64,7 +64,7 @@ false true 1.10.1 - 3.0.0-M9 + 3.0.0 /java/docs/reference/ From d82262d6130307da4eedeb05e69ea0d7d568f0ba Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 21 Mar 2023 14:21:58 +0000 Subject: [PATCH 453/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.9.2 (#579) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 4c644acac56a..60c03de1b515 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -643,7 +643,7 @@ com.puppycrawl.tools checkstyle - 10.8.1 + 10.9.2 From 18534fde0dfa80abd1cd39e85381f022cdd36f68 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 27 Mar 2023 15:34:14 +0100 Subject: [PATCH 454/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.9.3 (#582) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 60c03de1b515..ead41006e69c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -643,7 +643,7 @@ com.puppycrawl.tools checkstyle - 10.9.2 + 10.9.3 From 7623db0fcf2ec95fdd8d3c5fd8df8dc48ac4388e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 27 Mar 2023 16:40:11 +0100 Subject: [PATCH 455/794] build(deps): update dependency org.codehaus.mojo:animal-sniffer-maven-plugin to v1.23 (#581) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ead41006e69c..7b0a59784cb6 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -424,7 +424,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.22 + 1.23 java8 From 75727fe409cb6d0dd67d7007869fa449cb5955db Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Wed, 29 Mar 2023 17:50:18 +0000 Subject: [PATCH 456/794] chore: update maven surefire plugin (#580) * chore: update maven surefire plugin * add junit 5 dep * add execution * add junit dep inside surefire plugin * import jupiter api dep * change phase to integreation test * change graalvm17 params * remove one execution * change back to test phase * remove junit dep * add junit engine inside plugin * restore graalvm dep * add an execution in package phase * remove dep * change setup-graalvm * format * change to google-cloud-java * Revert "change to google-cloud-java" This reverts commit b5164c5655b3129776a9a1a7667caf9fa36bc5c5. * add jupiter dep * remove test scope * remove junt47 * remove junt47 * add opentest4j * restore graalvm setup * add comment * trigger build * trigger build * trigger build --- java-shared-config/pom.xml | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 7b0a59784cb6..a3292efa528c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -95,13 +95,6 @@ sponge_log - - - org.apache.maven.surefire - surefire-junit47 - ${surefire.version} - - org.apache.maven.plugins @@ -781,31 +774,26 @@ native - - + - org.junit.vintage - junit-vintage-engine - 5.9.2 - test - - - - org.graalvm.buildtools - junit-platform-native - 0.9.20 - test + org.opentest4j + opentest4j + 1.2.0 - org.apache.maven.plugins maven-surefire-plugin - - 2.22.2 + + + org.junit.vintage + junit-vintage-engine + 5.9.2 + + @@ -841,6 +829,7 @@ + If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index a3292efa528c..d7aeb27ea62d 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -631,7 +631,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.2.1 + 3.2.2 com.puppycrawl.tools From 2882b81ffdc18635d8c1b232bc15a3c09d10d7e5 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 4 May 2023 22:38:18 +0200 Subject: [PATCH 458/794] build(deps): update dependency org.codehaus.mojo:extra-enforcer-rules to v1.6.2 (#591) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.codehaus.mojo:extra-enforcer-rules](https://www.mojohaus.org/extra-enforcer-rules/) ([source](https://togithub.com/mojohaus/extra-enforcer-rules)) | `1.6.1` -> `1.6.2` | [![age](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:extra-enforcer-rules/1.6.2/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:extra-enforcer-rules/1.6.2/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:extra-enforcer-rules/1.6.2/compatibility-slim/1.6.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:extra-enforcer-rules/1.6.2/confidence-slim/1.6.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
mojohaus/extra-enforcer-rules ### [`v1.6.2`](https://togithub.com/mojohaus/extra-enforcer-rules/releases/tag/1.6.2) #### 🐛 Bug Fixes - Fix [#​231](https://togithub.com/mojohaus/extra-enforcer-rules/issues/231) - Use Resolver Api for resolving artifacts ([#​238](https://togithub.com/mojohaus/extra-enforcer-rules/pull/238)) [@​slawekjaranowski](https://togithub.com/slawekjaranowski) #### 📦 Dependency updates - Bump mojo-parent from 73 to 74 ([#​252](https://togithub.com/mojohaus/extra-enforcer-rules/pull/252)) [@​dependabot](https://togithub.com/dependabot) - Bump parent from 70 to 73 ([#​248](https://togithub.com/mojohaus/extra-enforcer-rules/pull/248)) [@​slawekjaranowski](https://togithub.com/slawekjaranowski) - Bump enforcer-api from 3.1.0 to 3.2.1 ([#​246](https://togithub.com/mojohaus/extra-enforcer-rules/pull/246)) [@​dependabot](https://togithub.com/dependabot) - Bump mockito-core from 4.10.0 to 4.11.0 ([#​242](https://togithub.com/mojohaus/extra-enforcer-rules/pull/242)) [@​dependabot](https://togithub.com/dependabot) - Bump mockito-core from 4.9.0 to 4.10.0 ([#​241](https://togithub.com/mojohaus/extra-enforcer-rules/pull/241)) [@​dependabot](https://togithub.com/dependabot) - Bump mockito-core from 4.8.1 to 4.9.0 ([#​236](https://togithub.com/mojohaus/extra-enforcer-rules/pull/236)) [@​dependabot](https://togithub.com/dependabot) - Bump maven-dependency-tree from 3.2.0 to 3.2.1 ([#​237](https://togithub.com/mojohaus/extra-enforcer-rules/pull/237)) [@​dependabot](https://togithub.com/dependabot) - Bump mockito-core from 4.8.0 to 4.8.1 ([#​235](https://togithub.com/mojohaus/extra-enforcer-rules/pull/235)) [@​dependabot](https://togithub.com/dependabot) - Bump maven-common-artifact-filters from 3.3.1 to 3.3.2 ([#​234](https://togithub.com/mojohaus/extra-enforcer-rules/pull/234)) [@​dependabot](https://togithub.com/dependabot) - Bump mockito-core from 4.7.0 to 4.8.0 ([#​233](https://togithub.com/mojohaus/extra-enforcer-rules/pull/233)) [@​dependabot](https://togithub.com/dependabot) - Bump maven-dependency-tree from 3.1.1 to 3.2.0 ([#​232](https://togithub.com/mojohaus/extra-enforcer-rules/pull/232)) [@​dependabot](https://togithub.com/dependabot) - Bump mojo-parent from 69 to 70 ([#​230](https://togithub.com/mojohaus/extra-enforcer-rules/pull/230)) [@​dependabot](https://togithub.com/dependabot) - Bump mockito-core from 4.6.1 to 4.7.0 ([#​229](https://togithub.com/mojohaus/extra-enforcer-rules/pull/229)) [@​dependabot](https://togithub.com/dependabot) #### 👻 Maintenance - Fix broken links in documentation ([#​255](https://togithub.com/mojohaus/extra-enforcer-rules/pull/255)) [@​slawekjaranowski](https://togithub.com/slawekjaranowski) - Use Maven 3.9.1 on GitHub ([#​254](https://togithub.com/mojohaus/extra-enforcer-rules/pull/254)) [@​slawekjaranowski](https://togithub.com/slawekjaranowski) - Bump spring-core from 5.3.20 to 5.3.26 in /src/it/banduplicate-classes-wildcard-exclusion ([#​253](https://togithub.com/mojohaus/extra-enforcer-rules/pull/253)) [@​dependabot](https://togithub.com/dependabot) - Enable checkstyle and spotless plugins ([#​250](https://togithub.com/mojohaus/extra-enforcer-rules/pull/250)) [@​slawekjaranowski](https://togithub.com/slawekjaranowski) - Use Maven 3.9.0 for build on GitHub ([#​249](https://togithub.com/mojohaus/extra-enforcer-rules/pull/249)) [@​slawekjaranowski](https://togithub.com/slawekjaranowski) - Configure m-compiler-p to use release flag for earlier JDKs ([#​239](https://togithub.com/mojohaus/extra-enforcer-rules/pull/239)) [@​pzygielo](https://togithub.com/pzygielo)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d7aeb27ea62d..0de937dbe9f3 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -104,7 +104,7 @@ org.codehaus.mojo extra-enforcer-rules - 1.6.1 + 1.6.2 From c62e43985195d6373c60578ba3b8b4307db68087 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 4 May 2023 22:38:23 +0200 Subject: [PATCH 459/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.4.3 (#590) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-project-info-reports-plugin](https://maven.apache.org/plugins/) | `3.4.2` -> `3.4.3` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.3/compatibility-slim/3.4.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.3/confidence-slim/3.4.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 0de937dbe9f3..2f130626a5f5 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -442,7 +442,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.2 + 3.4.3 From 3126d842acfdae7f593a379f87b5058872c058db Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 4 May 2023 22:40:51 +0200 Subject: [PATCH 460/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.21 (#593) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.20` -> `0.9.21` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.21/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.21/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.21/compatibility-slim/0.9.20)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.21/confidence-slim/0.9.20)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.21`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.21) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.20...0.9.21) #### What's Changed - Change samples link, add quickstarts by [@​alina-yur](https://togithub.com/alina-yur) in [https://togithub.com/graalvm/native-build-tools/pull/405](https://togithub.com/graalvm/native-build-tools/pull/405) - Fix typo by [@​alvarosanchez](https://togithub.com/alvarosanchez) in [https://togithub.com/graalvm/native-build-tools/pull/406](https://togithub.com/graalvm/native-build-tools/pull/406) - Add a new write-args-file goal by [@​alvarosanchez](https://togithub.com/alvarosanchez) in [https://togithub.com/graalvm/native-build-tools/pull/408](https://togithub.com/graalvm/native-build-tools/pull/408) - Enable metadata copy when agent is enabled from cmd by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/407](https://togithub.com/graalvm/native-build-tools/pull/407) - Fix compatibility with Gradle's configuration cache by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/339](https://togithub.com/graalvm/native-build-tools/pull/339) - Run the native tests in the submodule folder by [@​alvarosanchez](https://togithub.com/alvarosanchez) in [https://togithub.com/graalvm/native-build-tools/pull/414](https://togithub.com/graalvm/native-build-tools/pull/414) - Disable toolchain detection by default by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/420](https://togithub.com/graalvm/native-build-tools/pull/420) - Deprecate `requiredVersion`. by [@​fniephaus](https://togithub.com/fniephaus) in [https://togithub.com/graalvm/native-build-tools/pull/421](https://togithub.com/graalvm/native-build-tools/pull/421) - Bump metadata repo version by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/423](https://togithub.com/graalvm/native-build-tools/pull/423) #### New Contributors - [@​alina-yur](https://togithub.com/alina-yur) made their first contribution in [https://togithub.com/graalvm/native-build-tools/pull/405](https://togithub.com/graalvm/native-build-tools/pull/405) - [@​fniephaus](https://togithub.com/fniephaus) made their first contribution in [https://togithub.com/graalvm/native-build-tools/pull/421](https://togithub.com/graalvm/native-build-tools/pull/421) **Full Changelog**: https://togithub.com/graalvm/native-build-tools/compare/0.9.20...0.9.21
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2f130626a5f5..b9811d937677 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -808,7 +808,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.20 + 0.9.21 true From 634522cf01fff3583c0e0b7e4343a52c17670b4a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 4 May 2023 22:40:56 +0200 Subject: [PATCH 461/794] build(deps): update dependency org.jacoco:jacoco-maven-plugin to v0.8.10 (#592) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.jacoco:jacoco-maven-plugin](https://www.jacoco.org/jacoco/trunk/doc/maven.html) ([source](https://togithub.com/jacoco/jacoco)) | `0.8.8` -> `0.8.10` | [![age](https://badges.renovateapi.com/packages/maven/org.jacoco:jacoco-maven-plugin/0.8.10/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.jacoco:jacoco-maven-plugin/0.8.10/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.jacoco:jacoco-maven-plugin/0.8.10/compatibility-slim/0.8.8)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.jacoco:jacoco-maven-plugin/0.8.10/confidence-slim/0.8.8)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
jacoco/jacoco ### [`v0.8.10`](https://togithub.com/jacoco/jacoco/releases/tag/v0.8.10): 0.8.10 [Compare Source](https://togithub.com/jacoco/jacoco/compare/v0.8.9...v0.8.10) #### Fixed bugs - Agent should not require configuration of permissions for `SecurityManager` outside of its `codeBase` (GitHub [#​1425](https://togithub.com/jacoco/jacoco/issues/1425)). ### [`v0.8.9`](https://togithub.com/jacoco/jacoco/releases/tag/v0.8.9): 0.8.9 [Compare Source](https://togithub.com/jacoco/jacoco/compare/v0.8.8...v0.8.9) #### New Features - JaCoCo now officially supports Java 19 and 20 (GitHub [#​1371](https://togithub.com/jacoco/jacoco/issues/1371), [#​1386](https://togithub.com/jacoco/jacoco/issues/1386)). - Experimental support for Java 21 class files (GitHub [#​1386](https://togithub.com/jacoco/jacoco/issues/1386)). - Add parameter to include the current project in the `report-aggregate` Maven goal (GitHub [#​1007](https://togithub.com/jacoco/jacoco/issues/1007)). - Component accessors generated by the Java compilers for records are filtered out during generation of report. Contributed by Tesla Zhang (GitHub [#​1393](https://togithub.com/jacoco/jacoco/issues/1393)). #### Fixed bugs - Agent should not open `java.lang` package to unnamed module of the application class loader (GitHub [#​1334](https://togithub.com/jacoco/jacoco/issues/1334)). #### Non-functional Changes - JaCoCo now depends on ASM 9.5 (GitHub [#​1299](https://togithub.com/jacoco/jacoco/issues/1299), [#​1368](https://togithub.com/jacoco/jacoco/issues/1368), [#​1416](https://togithub.com/jacoco/jacoco/issues/1416)). - JaCoCo build now requires JDK 11 (GitHub [#​1413](https://togithub.com/jacoco/jacoco/issues/1413)).
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b9811d937677..818ceb6ad2b0 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -185,7 +185,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + 0.8.10 org.apache.maven.plugins From cb12d4974173cdc84669b6b9701122a0410efebb Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 4 May 2023 22:42:13 +0200 Subject: [PATCH 462/794] build(deps): update dependency org.apache.maven.plugins:maven-enforcer-plugin to v3.3.0 (#594) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-enforcer-plugin](https://maven.apache.org/enforcer/) | `3.2.1` -> `3.3.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-enforcer-plugin/3.3.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-enforcer-plugin/3.3.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-enforcer-plugin/3.3.0/compatibility-slim/3.2.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-enforcer-plugin/3.3.0/confidence-slim/3.2.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 818ceb6ad2b0..9193e2b7ee7e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -99,7 +99,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.2.1 + 3.3.0 org.codehaus.mojo From a8740c07e7a461602ee78684f1c91684e15c2066 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 4 May 2023 22:44:15 +0200 Subject: [PATCH 463/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.10.0 (#598) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `10.9.3` -> `10.10.0` | [![age](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.10.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.10.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.10.0/compatibility-slim/10.9.3)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.10.0/confidence-slim/10.9.3)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9193e2b7ee7e..ac48b2b4d323 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -636,7 +636,7 @@ com.puppycrawl.tools checkstyle - 10.9.3 + 10.10.0 From ff244421cfb4431683189d7aa11b4bdacf9462c9 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 4 May 2023 22:46:14 +0200 Subject: [PATCH 464/794] deps: update dependency org.junit.vintage:junit-vintage-engine to v5.9.3 (#597) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.junit.vintage:junit-vintage-engine](https://junit.org/junit5/) ([source](https://togithub.com/junit-team/junit5)) | `5.9.2` -> `5.9.3` | [![age](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.3/compatibility-slim/5.9.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.3/confidence-slim/5.9.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ac48b2b4d323..9025193fb8d2 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -791,7 +791,7 @@ org.junit.vintage junit-vintage-engine - 5.9.2 + 5.9.3 From e7a48bfb1b31641cf1322cbff4f94ed90c20b53c Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 9 May 2023 15:26:15 +0000 Subject: [PATCH 465/794] chore(deps): update ghcr.io/graalvm/graalvm-ce docker tag to v22.3.2 (#1793) (#601) Co-authored-by: Mridula <66699525+mpeddada1@users.noreply.github.com> Source-Link: https://togithub.com/googleapis/synthtool/commit/99ad07938fb6bcddcc7b1b586be699d72440758b Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:8dd8395defb6a5069b0b10c435058bf13980606ba1967e2b3925ed50fc3cb22f --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg | 2 +- java-shared-config/.kokoro/presubmit/graalvm-native.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index a5361a30a366..35478afe3fdd 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:e62f3ea524b11c1cd6ff7f80362736d86c0056631346b5b106a421686fce2726 + digest: sha256:8dd8395defb6a5069b0b10c435058bf13980606ba1967e2b3925ed50fc3cb22f diff --git a/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg b/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg index e20330c3ca60..f52533545896 100644 --- a/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg +++ b/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.0" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.2" } env_vars: { diff --git a/java-shared-config/.kokoro/presubmit/graalvm-native.cfg b/java-shared-config/.kokoro/presubmit/graalvm-native.cfg index 0fd6ba2fa0ce..44b1004875b6 100644 --- a/java-shared-config/.kokoro/presubmit/graalvm-native.cfg +++ b/java-shared-config/.kokoro/presubmit/graalvm-native.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.0" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.2" } env_vars: { From 30f33a046acdb56010e89b1740e17bf48c100d3a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 9 May 2023 17:26:21 +0200 Subject: [PATCH 466/794] build(deps): update surefire.version to v3.1.0 (#600) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.surefire:surefire-junit47](https://maven.apache.org/surefire/) | `3.0.0` -> `3.1.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.surefire:surefire-junit47/3.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.surefire:surefire-junit47/3.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.surefire:surefire-junit47/3.1.0/compatibility-slim/3.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.surefire:surefire-junit47/3.1.0/confidence-slim/3.0.0)](https://docs.renovatebot.com/merge-confidence/) | | [org.apache.maven.plugins:maven-failsafe-plugin](https://maven.apache.org/surefire/) | `3.0.0` -> `3.1.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-failsafe-plugin/3.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-failsafe-plugin/3.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-failsafe-plugin/3.1.0/compatibility-slim/3.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-failsafe-plugin/3.1.0/confidence-slim/3.0.0)](https://docs.renovatebot.com/merge-confidence/) | | [org.apache.maven.plugins:maven-surefire-plugin](https://maven.apache.org/surefire/) | `3.0.0` -> `3.1.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.1.0/compatibility-slim/3.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-surefire-plugin/3.1.0/confidence-slim/3.0.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9025193fb8d2..31ba515e4d20 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -64,7 +64,7 @@ false true 1.10.1 - 3.0.0 + 3.1.0 /java/docs/reference/ From 27e506e953f9b5448571c73cab85f99a1e5c6817 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 9 May 2023 17:30:14 +0200 Subject: [PATCH 467/794] build(deps): update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.1.0 (#599) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-gpg-plugin](https://maven.apache.org/plugins/) | `3.0.1` -> `3.1.0` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-gpg-plugin/3.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-gpg-plugin/3.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-gpg-plugin/3.1.0/compatibility-slim/3.0.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-gpg-plugin/3.1.0/confidence-slim/3.0.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 31ba515e4d20..effb1b7e0fb3 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -585,7 +585,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 sign-artifacts From 507ace74267b4f565d5cf3e47706f83dd761d140 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 10 May 2023 18:54:14 +0200 Subject: [PATCH 468/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.11.0 (#602) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `10.10.0` -> `10.11.0` | [![age](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.11.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.11.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.11.0/compatibility-slim/10.10.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.11.0/confidence-slim/10.10.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index effb1b7e0fb3..e28a3c8331cf 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -636,7 +636,7 @@ com.puppycrawl.tools checkstyle - 10.10.0 + 10.11.0 From b232abcb05cd912a099ec4ebd72e990ac5b80cbf Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 11 May 2023 22:20:28 +0200 Subject: [PATCH 469/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.22 (#603) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.21` -> `0.9.22` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.22/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.22/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.22/compatibility-slim/0.9.21)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.22/confidence-slim/0.9.21)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.22`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.22) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.21...0.9.22) #### What's Changed - Fix lookup of metadata repository by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/425](https://togithub.com/graalvm/native-build-tools/pull/425) - Add support for `default-for` attribute by [@​sdeleuze](https://togithub.com/sdeleuze) in [https://togithub.com/graalvm/native-build-tools/pull/432](https://togithub.com/graalvm/native-build-tools/pull/432) - Bump metadata version to 0.3.0 by [@​dnestoro](https://togithub.com/dnestoro) in [https://togithub.com/graalvm/native-build-tools/pull/434](https://togithub.com/graalvm/native-build-tools/pull/434) **Full Changelog**: https://togithub.com/graalvm/native-build-tools/compare/0.9.21...0.9.22
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e28a3c8331cf..4320a483ce35 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -808,7 +808,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.21 + 0.9.22 true From e40b192a7562bfb44896b07d04c183259d4b9ecd Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 12 May 2023 15:34:36 +0200 Subject: [PATCH 470/794] build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.4.0 (#604) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.codehaus.mojo:build-helper-maven-plugin](https://www.mojohaus.org/build-helper-maven-plugin/) ([source](https://togithub.com/mojohaus/build-helper-maven-plugin)) | `3.3.0` -> `3.4.0` | [![age](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:build-helper-maven-plugin/3.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:build-helper-maven-plugin/3.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:build-helper-maven-plugin/3.4.0/compatibility-slim/3.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.codehaus.mojo:build-helper-maven-plugin/3.4.0/confidence-slim/3.3.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
mojohaus/build-helper-maven-plugin ### [`v3.4.0`](https://togithub.com/mojohaus/build-helper-maven-plugin/releases/tag/3.4.0) ##### Changes ##### 🚀 New features and improvements - Get rid of ArtifactRepository - ${localRepository} ([#​179](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/179)) [@​slawekjaranowski](https://togithub.com/slawekjaranowski) - Added a property name to the "sources" parameter for CLI usage ([#​157](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/157)) [@​gjd6640](https://togithub.com/gjd6640) ##### 🐛 Bug Fixes - Use UTF-8 for the pom ([#​173](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/173)) [@​gnodet](https://togithub.com/gnodet) ##### 📦 Dependency updates - Bump maven-plugin-annotations from 3.8.1 to 3.8.2 ([#​177](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/177)) [@​dependabot](https://togithub.com/dependabot) - Bump parent from 72 to 74 ([#​175](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/175)) [@​slawekjaranowski](https://togithub.com/slawekjaranowski) - Bump maven-invoker-plugin to 3.5.1 - add support to run its with Java 20 ([#​172](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/172)) [@​slachiewicz](https://togithub.com/slachiewicz) - Bump actions/stale from 7 to 8 ([#​171](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/171)) [@​dependabot](https://togithub.com/dependabot) - Bump maven-plugin-annotations from 3.7.1 to 3.8.1 ([#​169](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/169)) [@​dependabot](https://togithub.com/dependabot) - Bump plexus-utils from 3.5.0 to 3.5.1 ([#​170](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/170)) [@​dependabot](https://togithub.com/dependabot) - Bump mojo-parent from 70 to 72 ([#​165](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/165)) [@​dependabot](https://togithub.com/dependabot) - Bump assertj-core from 3.24.1 to 3.24.2 ([#​164](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/164)) [@​dependabot](https://togithub.com/dependabot) - Bump maven-plugin-annotations from 3.7.0 to 3.7.1 ([#​163](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/163)) [@​dependabot](https://togithub.com/dependabot) - Bump assertj-core from 3.24.0 to 3.24.1 ([#​162](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/162)) [@​dependabot](https://togithub.com/dependabot) - Bump assertj-core from 3.23.1 to 3.24.0 ([#​161](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/161)) [@​dependabot](https://togithub.com/dependabot) - Bump actions/stale from 6 to 7 ([#​160](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/160)) [@​dependabot](https://togithub.com/dependabot) - Bump maven-plugin-annotations from 3.6.4 to 3.7.0 ([#​158](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/158)) [@​dependabot](https://togithub.com/dependabot) - Bump plexus-utils from 3.4.2 to 3.5.0 ([#​151](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/151)) [@​dependabot](https://togithub.com/dependabot) - Bump mojo-parent from 69 to 70 ([#​141](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/141)) [@​dependabot](https://togithub.com/dependabot) - Bump mojo-parent from 68 to 69 ([#​140](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/140)) [@​dependabot](https://togithub.com/dependabot) - Bump mojo-parent from 67 to 68 ([#​138](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/138)) [@​dependabot](https://togithub.com/dependabot) - Bump assertj-core from 3.22.0 to 3.23.1 ([#​137](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/137)) [@​dependabot](https://togithub.com/dependabot) - Bump plexus-utils from 3.4.1 to 3.4.2 ([#​135](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/135)) [@​dependabot](https://togithub.com/dependabot) - Bump actions/stale from 4 to 5 ([#​132](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/132)) [@​dependabot](https://togithub.com/dependabot) - Bump actions/setup-java from 2 to 3 ([#​133](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/133)) [@​dependabot](https://togithub.com/dependabot) - Bump mojo-parent from 65 to 67 ([#​130](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/130)) [@​dependabot](https://togithub.com/dependabot) - Bump actions/checkout from 2 to 3 ([#​128](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/128)) [@​dependabot](https://togithub.com/dependabot) - Bump maven-plugin-annotations from 3.6.2 to 3.6.4 ([#​126](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/126)) [@​dependabot](https://togithub.com/dependabot) - Bump release-drafter/release-drafter from 5.15.0 to 5.16.1 ([#​123](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/123)) [@​dependabot](https://togithub.com/dependabot) - Bump testng from 7.4.0 to 7.5 ([#​122](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/122)) [@​dependabot](https://togithub.com/dependabot) - Bump plexus-utils from 3.0.24 to 3.4.1 ([#​121](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/121)) [@​dependabot](https://togithub.com/dependabot) ##### 👻 Maintenance - Enable spotless for code formatting ([#​180](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/180)) [@​slawekjaranowski](https://togithub.com/slawekjaranowski) - Move tests to Junit 5 ([#​174](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/174)) [@​slachiewicz](https://togithub.com/slachiewicz) - Declare Maven Core dependencies as provided ([#​125](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/125)) [@​stefanseifert](https://togithub.com/stefanseifert) - Use only major version (v5) of release drafter ([#​124](https://togithub.com/mojohaus/build-helper-maven-plugin/pull/124)) [@​stefanseifert](https://togithub.com/stefanseifert)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 4320a483ce35..ae7c9d7bc88f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -210,7 +210,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.4.0 org.codehaus.mojo From ee2ba8ca101330b918e3ddd506a1903e8b1b5a7e Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 19 May 2023 16:50:43 +0000 Subject: [PATCH 471/794] build: migrate release scripts (#1799) (#605) Source-Link: https://togithub.com/googleapis/synthtool/commit/1fd6dff029bb3d873a4780e616388f802f086907 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:ad9cabee4c022f1aab04a71332369e0c23841062124818a4490f73337f790337 --- java-shared-config/.github/.OwlBot.lock.yaml | 2 +- java-shared-config/.github/release-trigger.yml | 1 + .../.github/workflows/downstream-maven-plugins.yaml | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 35478afe3fdd..aadf54f6438e 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.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:8dd8395defb6a5069b0b10c435058bf13980606ba1967e2b3925ed50fc3cb22f + digest: sha256:ad9cabee4c022f1aab04a71332369e0c23841062124818a4490f73337f790337 diff --git a/java-shared-config/.github/release-trigger.yml b/java-shared-config/.github/release-trigger.yml index d4ca94189e16..10e4a73b309b 100644 --- a/java-shared-config/.github/release-trigger.yml +++ b/java-shared-config/.github/release-trigger.yml @@ -1 +1,2 @@ enabled: true +multiScmName: java-shared-config diff --git a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml index 4aafc53695ce..64f1e31a64d3 100644 --- a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml +++ b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml @@ -16,9 +16,6 @@ jobs: matrix: java: [8, 11] repo: - # GAPIC library - - java-trace - # Handwritten library - java-bigquery job-type: - test # maven-surefire-plugin From bab2b8db331ba046e38f194779581bfb33fa2d78 Mon Sep 17 00:00:00 2001 From: Alice <65933803+alicejli@users.noreply.github.com> Date: Thu, 25 May 2023 10:09:52 -0400 Subject: [PATCH 472/794] fix: remove java-trace checks (#612) --- java-shared-config/.github/sync-repo-settings.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index a764192e63c7..5c8a54f91f4c 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -41,15 +41,9 @@ branchProtectionRules: - "dependencies (11, java-storage)" - "dependencies (11, java-pubsub)" - "flatten-plugin-check" - - "build (8, java-trace, test)" - - "build (8, java-trace, lint)" - - "build (8, java-trace, clirr)" - "build (8, java-bigquery, test)" - "build (8, java-bigquery, lint)" - "build (8, java-bigquery, clirr)" - - "build (11, java-trace, test)" - - "build (11, java-trace, lint)" - - "build (11, java-trace, clirr)" - "build (11, java-bigquery, test)" - "build (11, java-bigquery, lint)" - "build (11, java-bigquery, clirr)" From dc9fe4300a5ffe5500f4da45d6f0de581aba2332 Mon Sep 17 00:00:00 2001 From: Alice <65933803+alicejli@users.noreply.github.com> Date: Thu, 25 May 2023 10:10:21 -0400 Subject: [PATCH 473/794] deps: update doclet version to 1.9.0 (#611) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ae7c9d7bc88f..0eac3fba54a4 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -687,7 +687,7 @@ - java-docfx-doclet-1.8.0 + java-docfx-doclet-1.9.0 ${env.KOKORO_GFILE_DIR}/${docletName}.jar ${project.build.directory}/docfx-yml ${project.artifactId} From a000a26d372229117becea630c9284346e2a991d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 25 May 2023 10:57:10 -0400 Subject: [PATCH 474/794] chore(main): release 1.5.6-SNAPSHOT (#549) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 0eac3fba54a4..9fb7a17cbab1 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.5 + 1.5.6-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 32f6907a09de..bea5b6e9c684 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.5:1.5.5 +google-cloud-shared-config:1.5.5:1.5.6-SNAPSHOT From fb627c9191f4c6c34079a111fda39dbac4d7a8ef Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 25 May 2023 17:15:38 +0200 Subject: [PATCH 475/794] build(deps): update dependency org.apache.maven.plugins:maven-source-plugin to v3.3.0 (#606) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9fb7a17cbab1..c0ba74978b06 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -556,7 +556,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources From 5580972c85f94db89756aaa3a4987f8a3143d5ff Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 25 May 2023 17:15:58 +0200 Subject: [PATCH 476/794] build(deps): update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.3.0 (#607) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index c0ba74978b06..2d658b3399cb 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -631,7 +631,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.2.2 + 3.3.0 com.puppycrawl.tools From 1e538d4a9b7e1bbe7acbf1c2f05950250858dc19 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 25 May 2023 17:20:13 +0200 Subject: [PATCH 477/794] deps: update dependency com.google.auto.service:auto-service-annotations to v1.1.0 (#610) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.auto.service:auto-service-annotations](https://togithub.com/google/auto/tree/main/service) ([source](https://togithub.com/google/auto)) | `1.0.1` -> `1.1.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.auto.service:auto-service-annotations/1.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.auto.service:auto-service-annotations/1.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.auto.service:auto-service-annotations/1.1.0/compatibility-slim/1.0.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.auto.service:auto-service-annotations/1.1.0/confidence-slim/1.0.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2d658b3399cb..c58f90c045d7 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -762,7 +762,7 @@ com.google.auto.service auto-service-annotations - 1.0.1 + 1.1.0 From cad570bba284f483fd3e73bb3e5e50119d1c9e34 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Tue, 30 May 2023 14:11:27 +0000 Subject: [PATCH 478/794] fix: add junit-vintage dep to avoid skipping post-compilation native tests (#586) --- java-shared-config/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index c58f90c045d7..c55be234c54a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -781,6 +781,12 @@ opentest4j 1.2.0 + + org.junit.vintage + junit-vintage-engine + 5.9.2 + test + From 582f38b49fd605bf1b8ec79989bb200b7d4fcf94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 May 2023 13:43:36 -0400 Subject: [PATCH 479/794] build(deps): bump requests from 2.27.1 to 2.31.0 in /.kokoro (#609) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build(deps): bump requests from 2.27.1 to 2.31.0 in /.kokoro Bumps [requests](https://github.com/psf/requests) from 2.27.1 to 2.31.0. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.27.1...v2.31.0) --- updated-dependencies: - dependency-name: requests dependency-type: indirect ... Signed-off-by: dependabot[bot] * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Owl Bot From 9b46e75c988a3a16d4bcdc7e4f58b3d4c33b6231 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 30 May 2023 19:45:01 +0200 Subject: [PATCH 480/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.4.4 (#615) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index c55be234c54a..ce9962886ce3 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -442,7 +442,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.3 + 3.4.4 From 5695940c2571e665ff113edcb6f35b6e667cb5e2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 30 May 2023 19:45:14 +0200 Subject: [PATCH 481/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.12.0 (#614) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ce9962886ce3..a98698bd86b5 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -636,7 +636,7 @@ com.puppycrawl.tools checkstyle - 10.11.0 + 10.12.0 From 8896558db2eb32c96efa2120475826bdc9f44173 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Fri, 2 Jun 2023 00:32:28 +0000 Subject: [PATCH 482/794] chore: remove graalvm GA check (#618) --- java-shared-config/.github/sync-repo-settings.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index 5c8a54f91f4c..8837380d172a 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -47,7 +47,6 @@ branchProtectionRules: - "build (11, java-bigquery, test)" - "build (11, java-bigquery, lint)" - "build (11, java-bigquery, clirr)" - - "graalvm (11, java-orgpolicy)" - "cla/google" - pattern: java7 # Can admins overwrite branch protection. From 48b470d74959eb22b93cfab4fa8f886ac2818719 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Fri, 2 Jun 2023 00:34:27 +0000 Subject: [PATCH 483/794] chore: migrate check to kokoro and add native image check for monorepo library (#616) * chore: migrate native image check to Kokoro and test with google-cloud-java --- .../.github/sync-repo-settings.yaml | 2 + .../workflows/downstream-maven-plugins.yaml | 31 --------- .../.kokoro/presubmit/downstream-build.sh | 63 +++++++++++++++++++ .../.kokoro/presubmit/graalvm-native-17.cfg | 34 +++++++--- .../.kokoro/presubmit/graalvm-native.cfg | 34 +++++++--- java-shared-config/owlbot.py | 5 +- java-shared-config/settings.xml | 32 ++++++++++ 7 files changed, 149 insertions(+), 52 deletions(-) create mode 100755 java-shared-config/.kokoro/presubmit/downstream-build.sh create mode 100644 java-shared-config/settings.xml diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index 8837380d172a..16f529990440 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -35,6 +35,8 @@ branchProtectionRules: - "units (8)" - "units (11)" - "Kokoro - Test: Integration" + - "Kokoro - Test: Java GraalVM Native Image" + - "Kokoro - Test: Java 17 GraalVM Native Image" - "dependencies (11, java-bigquery)" - "dependencies (11, java-bigqueryconnection)" - "dependencies (11, java-spanner)" diff --git a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml index 64f1e31a64d3..ca29cd3d7eaf 100644 --- a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml +++ b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml @@ -31,34 +31,3 @@ jobs: - run: sudo apt-get update -y - run: sudo apt-get install libxml2-utils - run: .kokoro/client-library-check.sh ${{matrix.repo}} ${{matrix.job-type}} - - # GraalVM job ensures the compatibility of GraaVM version above and the - # native-maven-plugin version. - graalvm: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - java: [11] - repo: - # GAPIC library that doesn't use a real GCP project in integration tests - - java-orgpolicy - steps: - - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - - uses: ayltai/setup-graalvm@v1 - with: - java-version: ${{matrix.java}} - # When a new version of native-maven-plugin fails to run in a downstream - # library, it's likely to be an incompatibility with the GraalVM version. - # In that case, you need to upgrade the Docker container used in the - # tests in the downstream repositories (not just this value below). - # Example: https://github.com/googleapis/testing-infra-docker/pull/195 - graalvm-version: 22.3.0 - native-image: true - - run: java -version - - run: sudo apt-get update -y - - run: sudo apt-get install libxml2-utils - - run: .kokoro/client-library-check.sh ${{matrix.repo}} graalvm diff --git a/java-shared-config/.kokoro/presubmit/downstream-build.sh b/java-shared-config/.kokoro/presubmit/downstream-build.sh new file mode 100755 index 000000000000..6019e3a55273 --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/downstream-build.sh @@ -0,0 +1,63 @@ +#!/bin/bash +# 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. +# 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. + +set -eo pipefail + + +function modify_shared_config() { + xmllint --shell pom.xml < + + + + + + google-maven-central + GCS Maven Central mirror + https://maven-central.storage-download.googleapis.com/maven2/ + central + + + \ No newline at end of file From 19c4c66d22c64e91abffde0ca5937d4477471317 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 2 Jun 2023 16:21:53 +0200 Subject: [PATCH 484/794] build(deps): update dependency org.codehaus.mojo:extra-enforcer-rules to v1.7.0 (#617) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index a98698bd86b5..20ff1836bd58 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -104,7 +104,7 @@ org.codehaus.mojo extra-enforcer-rules - 1.6.2 + 1.7.0 From d5a164d76f6c504b67453d03f1d2549b834c13f5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 2 Jun 2023 13:53:48 -0400 Subject: [PATCH 485/794] chore(main): release 1.5.6 (#613) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 29 +++++++++++++++++++++++++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index e07c8f0a60ce..68e377ae3c15 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,34 @@ # Changelog +## [1.5.6](https://github.com/googleapis/java-shared-config/compare/v1.5.5...v1.5.6) (2023-06-02) + + +### Bug Fixes + +* Add junit-vintage dep to avoid skipping post-compilation native tests ([#586](https://github.com/googleapis/java-shared-config/issues/586)) ([f6e6f69](https://github.com/googleapis/java-shared-config/commit/f6e6f690d58e2a86db721926049b0132310724bf)) +* **java:** Skip fixing poms for special modules ([#1744](https://github.com/googleapis/java-shared-config/issues/1744)) ([#556](https://github.com/googleapis/java-shared-config/issues/556)) ([cc433c2](https://github.com/googleapis/java-shared-config/commit/cc433c246f1b6edbc093e6af37aced652d884a65)) +* Remove java-trace checks ([#612](https://github.com/googleapis/java-shared-config/issues/612)) ([cfcdba8](https://github.com/googleapis/java-shared-config/commit/cfcdba834f27b6bb03460cd09f076068f67a892b)) + + +### Dependencies + +* Update dependency com.google.auto.service:auto-service-annotations to v1.1.0 ([#610](https://github.com/googleapis/java-shared-config/issues/610)) ([aeefcbe](https://github.com/googleapis/java-shared-config/commit/aeefcbec212dc102bd15027984895a4ba51d045f)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.10.0 ([#598](https://github.com/googleapis/java-shared-config/issues/598)) ([29309c3](https://github.com/googleapis/java-shared-config/commit/29309c36cb6ffe2aea221d3cc8cde036441d21b1)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.11.0 ([#602](https://github.com/googleapis/java-shared-config/issues/602)) ([61b9c5f](https://github.com/googleapis/java-shared-config/commit/61b9c5f04422bc8edf8a249e3dfb7290bd188a8d)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.12.0 ([#614](https://github.com/googleapis/java-shared-config/issues/614)) ([8559d0d](https://github.com/googleapis/java-shared-config/commit/8559d0dc634e238ee640d68439839f50a938ce76)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.6.0 ([#554](https://github.com/googleapis/java-shared-config/issues/554)) ([44a77b0](https://github.com/googleapis/java-shared-config/commit/44a77b0faf5b4f3f9208117ccab0a3717d059efd)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.7.0 ([#563](https://github.com/googleapis/java-shared-config/issues/563)) ([5c51e07](https://github.com/googleapis/java-shared-config/commit/5c51e07af8e37019d462211d47307155c630adb9)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.8.1 ([#573](https://github.com/googleapis/java-shared-config/issues/573)) ([e5c6e54](https://github.com/googleapis/java-shared-config/commit/e5c6e5406488c0a204ef2afcbe8582176fa373e4)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.9.2 ([#579](https://github.com/googleapis/java-shared-config/issues/579)) ([a67a7c8](https://github.com/googleapis/java-shared-config/commit/a67a7c8d05bab4c8dbeaf5b5874170084e75abb7)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.9.3 ([#582](https://github.com/googleapis/java-shared-config/issues/582)) ([c87ff96](https://github.com/googleapis/java-shared-config/commit/c87ff962304efd82e2f79458976c627d1ff622d8)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.21 ([#593](https://github.com/googleapis/java-shared-config/issues/593)) ([12ac165](https://github.com/googleapis/java-shared-config/commit/12ac165f36b6b5257f7928f8a2c21ae936af3794)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.22 ([#603](https://github.com/googleapis/java-shared-config/issues/603)) ([9ea7833](https://github.com/googleapis/java-shared-config/commit/9ea783312cc9e136f8bdb6f4dae5591221e42773)) +* Update dependency org.junit.vintage:junit-vintage-engine to v5.9.2 ([#560](https://github.com/googleapis/java-shared-config/issues/560)) ([60a80bd](https://github.com/googleapis/java-shared-config/commit/60a80bd272dd7483db8e4a5773125a9c57b9899e)) +* Update dependency org.junit.vintage:junit-vintage-engine to v5.9.3 ([#597](https://github.com/googleapis/java-shared-config/issues/597)) ([61064b9](https://github.com/googleapis/java-shared-config/commit/61064b9c767c528139b025e3d629d12fc64d7809)) +* Update doclet version to 1.9.0 ([#611](https://github.com/googleapis/java-shared-config/issues/611)) ([cd8c762](https://github.com/googleapis/java-shared-config/commit/cd8c76208ab3d10ab451545a180474c6270368d3)) +* Update graalvm native-image dependencies to v0.9.19 ([#550](https://github.com/googleapis/java-shared-config/issues/550)) ([3313229](https://github.com/googleapis/java-shared-config/commit/3313229155be704b50e499379936e16598a348a6)) +* Update graalvm native-image dependencies to v0.9.20 ([#568](https://github.com/googleapis/java-shared-config/issues/568)) ([79d7b4b](https://github.com/googleapis/java-shared-config/commit/79d7b4be908cc9e24a48d89eeb97b0c6155493d1)) + ## [1.5.5](https://github.com/googleapis/java-shared-config/compare/v1.5.4...v1.5.5) (2022-11-28) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 20ff1836bd58..3c5fa3b4d15b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.6-SNAPSHOT + 1.5.6 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index bea5b6e9c684..f87b2156f8f3 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.5:1.5.6-SNAPSHOT +google-cloud-shared-config:1.5.6:1.5.6 From 4bcb8c7e668148ea825c8e3a32a1a3da9e8fad1e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 19 Jun 2023 16:54:18 +0200 Subject: [PATCH 486/794] deps: update dependency org.junit.vintage:junit-vintage-engine to v5.9.3 (#624) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.junit.vintage:junit-vintage-engine](https://junit.org/junit5/) ([source](https://togithub.com/junit-team/junit5)) | `5.9.2` -> `5.9.3` | [![age](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.3/compatibility-slim/5.9.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.junit.vintage:junit-vintage-engine/5.9.3/confidence-slim/5.9.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 3c5fa3b4d15b..b79f18597cec 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -784,7 +784,7 @@ org.junit.vintage junit-vintage-engine - 5.9.2 + 5.9.3 test From 20b66c4d7c86190588d2f7371f59911430dcf841 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 19 Jun 2023 16:54:23 +0200 Subject: [PATCH 487/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.23 (#627) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.graalvm.buildtools:native-maven-plugin](https://togithub.com/graalvm/native-build-tools) | `0.9.22` -> `0.9.23` | [![age](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.23/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.23/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.23/compatibility-slim/0.9.22)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.graalvm.buildtools:native-maven-plugin/0.9.23/confidence-slim/0.9.22)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
graalvm/native-build-tools ### [`v0.9.23`](https://togithub.com/graalvm/native-build-tools/releases/tag/0.9.23) [Compare Source](https://togithub.com/graalvm/native-build-tools/compare/0.9.22...0.9.23) #### What's Changed - Fix "collect reachability metadata" with config cache by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/438](https://togithub.com/graalvm/native-build-tools/pull/438) - Remove use of GFileUtils by [@​melix](https://togithub.com/melix) in [https://togithub.com/graalvm/native-build-tools/pull/437](https://togithub.com/graalvm/native-build-tools/pull/437) - Display the GraalVM logo on the generated NBT docs by [@​gradinac](https://togithub.com/gradinac) in [https://togithub.com/graalvm/native-build-tools/pull/447](https://togithub.com/graalvm/native-build-tools/pull/447) **Full Changelog**: https://togithub.com/graalvm/native-build-tools/compare/0.9.22...0.9.23
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b79f18597cec..4e273c2ba24f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -814,7 +814,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.22 + 0.9.23 true From 22982f0f95619e56752658a9d4da444c7123354d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 19 Jun 2023 16:56:13 +0200 Subject: [PATCH 488/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.4.5 (#621) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-project-info-reports-plugin](https://maven.apache.org/plugins/) | `3.4.4` -> `3.4.5` | [![age](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.5/compatibility-slim/3.4.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/org.apache.maven.plugins:maven-project-info-reports-plugin/3.4.5/confidence-slim/3.4.4)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 4e273c2ba24f..162dae6d94bb 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -442,7 +442,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.4 + 3.4.5 From 817c849cc1fd18e530d7496e3190ac7394b4767e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 19 Jun 2023 16:56:18 +0200 Subject: [PATCH 489/794] deps: update dependency com.google.auto.service:auto-service-annotations to v1.1.1 (#623) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.auto.service:auto-service-annotations](https://togithub.com/google/auto/tree/main/service) ([source](https://togithub.com/google/auto)) | `1.1.0` -> `1.1.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.auto.service:auto-service-annotations/1.1.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.auto.service:auto-service-annotations/1.1.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.auto.service:auto-service-annotations/1.1.1/compatibility-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.auto.service:auto-service-annotations/1.1.1/confidence-slim/1.1.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 162dae6d94bb..b7a2a1c0731f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -762,7 +762,7 @@ com.google.auto.service auto-service-annotations - 1.1.0 + 1.1.1 From 82c23143f08652d716b524d47fbe7c312fa4d137 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 26 Jun 2023 22:14:18 +0200 Subject: [PATCH 490/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.12.1 (#630) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `10.12.0` -> `10.12.1` | [![age](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.12.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.12.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.12.1/compatibility-slim/10.12.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/10.12.1/confidence-slim/10.12.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index b7a2a1c0731f..a925eeb6f2cc 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -636,7 +636,7 @@ com.puppycrawl.tools checkstyle - 10.12.0 + 10.12.1 From 22c000e889b126ed0733aecbf91d146f77077732 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 21:02:14 +0000 Subject: [PATCH 491/794] chore: Update dependabot.yml (#1814) (#628) * chore: Update dependabot.yml Source-Link: https://togithub.com/googleapis/synthtool/commit/9ad18b66e75ca08d6a7779f56c7ee0595d3e1203 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:c33bd13e1eab022b0499a3afbfb4b93ae10cb8ad89d8203a6343a88b1b78400f --- java-shared-config/.github/.OwlBot.lock.yaml | 3 ++- java-shared-config/.github/dependabot.yml | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index aadf54f6438e..b8ef92bef814 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,4 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:ad9cabee4c022f1aab04a71332369e0c23841062124818a4490f73337f790337 + digest: sha256:c33bd13e1eab022b0499a3afbfb4b93ae10cb8ad89d8203a6343a88b1b78400f +# created: 2023-06-21T18:48:32.287298785Z diff --git a/java-shared-config/.github/dependabot.yml b/java-shared-config/.github/dependabot.yml index c8f413b0da30..203f9eaccf13 100644 --- a/java-shared-config/.github/dependabot.yml +++ b/java-shared-config/.github/dependabot.yml @@ -5,10 +5,15 @@ updates: schedule: interval: "daily" # Disable version updates for Maven dependencies - open-pull-requests-limit: 0 + # we use renovate-bot as well as shared-dependencies BOM to update maven dependencies. + ignore: + - dependency-name: "*" - package-ecosystem: "pip" directory: "/" schedule: interval: "daily" # Disable version updates for pip dependencies - open-pull-requests-limit: 0 \ No newline at end of file + # If a security vulnerability comes in, we will be notified about + # it via template in the synthtool repository. + ignore: + - dependency-name: "*" From bfa2030f8cbbd89daa2688a69ac61b7f67285c5e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 14:46:05 -0400 Subject: [PATCH 492/794] build(deps): bump cryptography from 39.0.1 to 41.0.0 in /.kokoro (#620) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build(deps): bump cryptography from 39.0.1 to 41.0.0 in /.kokoro Bumps [cryptography](https://github.com/pyca/cryptography) from 39.0.1 to 41.0.0. - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/39.0.1...41.0.0) --- updated-dependencies: - dependency-name: cryptography dependency-type: indirect ... Signed-off-by: dependabot[bot] * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Owl Bot From 9517d3c357e7f505702c5282075ac6c46f00b1f8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 18 Jul 2023 18:57:10 +0200 Subject: [PATCH 493/794] deps: update auto-value-annotation.version to v1.10.2 (#632) * deps: update auto-value-annotation.version to v1.10.2 * update the golden file * removed unused split repositories --------- Co-authored-by: Tomo Suzuki --- .../.github/workflows/downstream-dependencies.yaml | 1 - .../java-storage-v2.9.3-expected-flattened-dependencies.txt | 2 +- java-shared-config/pom.xml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.github/workflows/downstream-dependencies.yaml b/java-shared-config/.github/workflows/downstream-dependencies.yaml index c6f5e91d1350..b151d3c5e0a6 100644 --- a/java-shared-config/.github/workflows/downstream-dependencies.yaml +++ b/java-shared-config/.github/workflows/downstream-dependencies.yaml @@ -13,7 +13,6 @@ jobs: java: [11] repo: - java-bigquery - - java-bigqueryconnection - java-spanner - java-storage - java-pubsub diff --git a/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt b/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt index b4999c31e7de..515bbc76c8f3 100644 --- a/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt +++ b/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt @@ -8,7 +8,7 @@ com.google.api:gax:jar:2.18.2:compile com.google.apis:google-api-services-storage:jar:v1-rev20220705-1.32.1:compile com.google.auth:google-auth-library-credentials:jar:1.7.0:compile com.google.auth:google-auth-library-oauth2-http:jar:1.7.0:compile -com.google.auto.value:auto-value-annotations:jar:1.10.1:compile +com.google.auto.value:auto-value-annotations:jar:1.10.2:compile com.google.cloud:google-cloud-core-http:jar:2.8.0:compile com.google.cloud:google-cloud-core:jar:2.8.0:compile com.google.code.findbugs:jsr305:jar:3.0.2:compile diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index a925eeb6f2cc..9accb706beb9 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -63,7 +63,7 @@ ${project.artifactId} false true - 1.10.1 + 1.10.2 3.1.0 /java/docs/reference/ From 3a8eea93d539b6b72495558977b4ed633667438b Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 19 Jul 2023 11:42:48 -0400 Subject: [PATCH 494/794] ci: remove java-bigqueryconnection from required check (#634) The java-bigqueryconnection repository has been migrated to the monorepo. We cannot use it as the test. --- java-shared-config/.github/sync-repo-settings.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index 16f529990440..67014da9b156 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -38,7 +38,6 @@ branchProtectionRules: - "Kokoro - Test: Java GraalVM Native Image" - "Kokoro - Test: Java 17 GraalVM Native Image" - "dependencies (11, java-bigquery)" - - "dependencies (11, java-bigqueryconnection)" - "dependencies (11, java-spanner)" - "dependencies (11, java-storage)" - "dependencies (11, java-pubsub)" From 43f8db7f7aa81d96b8e69672191e322e88df7647 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 13:52:05 -0400 Subject: [PATCH 495/794] chore(main): release 1.5.7-SNAPSHOT (#619) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9accb706beb9..224813ba3404 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.6 + 1.5.7-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index f87b2156f8f3..8763bd572f80 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.6:1.5.6 +google-cloud-shared-config:1.5.6:1.5.7-SNAPSHOT From 40533823806a6bbd3ab2b12dea876d2ca24c5c19 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 18:22:17 +0000 Subject: [PATCH 496/794] chore(main): release 1.5.7 (#635) :robot: I have created a release *beep* *boop* --- ## [1.5.7](https://togithub.com/googleapis/java-shared-config/compare/v1.5.6...v1.5.7) (2023-07-19) ### Dependencies * Update auto-value-annotation.version to v1.10.2 ([#632](https://togithub.com/googleapis/java-shared-config/issues/632)) ([9517d3c](https://togithub.com/googleapis/java-shared-config/commit/9517d3c357e7f505702c5282075ac6c46f00b1f8)) * Update dependency com.google.auto.service:auto-service-annotations to v1.1.1 ([#623](https://togithub.com/googleapis/java-shared-config/issues/623)) ([817c849](https://togithub.com/googleapis/java-shared-config/commit/817c849cc1fd18e530d7496e3190ac7394b4767e)) * Update dependency com.puppycrawl.tools:checkstyle to v10.12.1 ([#630](https://togithub.com/googleapis/java-shared-config/issues/630)) ([82c2314](https://togithub.com/googleapis/java-shared-config/commit/82c23143f08652d716b524d47fbe7c312fa4d137)) * Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.23 ([#627](https://togithub.com/googleapis/java-shared-config/issues/627)) ([20b66c4](https://togithub.com/googleapis/java-shared-config/commit/20b66c4d7c86190588d2f7371f59911430dcf841)) * Update dependency org.junit.vintage:junit-vintage-engine to v5.9.3 ([#624](https://togithub.com/googleapis/java-shared-config/issues/624)) ([4bcb8c7](https://togithub.com/googleapis/java-shared-config/commit/4bcb8c7e668148ea825c8e3a32a1a3da9e8fad1e)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 11 +++++++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 68e377ae3c15..48210d535ffb 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## [1.5.7](https://github.com/googleapis/java-shared-config/compare/v1.5.6...v1.5.7) (2023-07-19) + + +### Dependencies + +* Update auto-value-annotation.version to v1.10.2 ([#632](https://github.com/googleapis/java-shared-config/issues/632)) ([bfa9559](https://github.com/googleapis/java-shared-config/commit/bfa9559bf96802cc717b3e8452d09f495f7e1e90)) +* Update dependency com.google.auto.service:auto-service-annotations to v1.1.1 ([#623](https://github.com/googleapis/java-shared-config/issues/623)) ([3405245](https://github.com/googleapis/java-shared-config/commit/3405245576821db2a10ae6efe22c5a8b656ce026)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.12.1 ([#630](https://github.com/googleapis/java-shared-config/issues/630)) ([3d5a358](https://github.com/googleapis/java-shared-config/commit/3d5a358f7a82fa91869a39d770f4826cfb50e6b9)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.23 ([#627](https://github.com/googleapis/java-shared-config/issues/627)) ([274f269](https://github.com/googleapis/java-shared-config/commit/274f2692e20e8f9e4b390a3da14f7fcd4ecf7bdf)) +* Update dependency org.junit.vintage:junit-vintage-engine to v5.9.3 ([#624](https://github.com/googleapis/java-shared-config/issues/624)) ([88f4043](https://github.com/googleapis/java-shared-config/commit/88f4043f869406cf2a4544dbabdfd9b52365aca8)) + ## [1.5.6](https://github.com/googleapis/java-shared-config/compare/v1.5.5...v1.5.6) (2023-06-02) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 224813ba3404..93ea56350006 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.7-SNAPSHOT + 1.5.7 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 8763bd572f80..4159f5b01797 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.6:1.5.7-SNAPSHOT +google-cloud-shared-config:1.5.7:1.5.7 From b2bf1eb11c6fb5318bf80d8e947334e9ddc64361 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 24 Jul 2023 20:34:10 +0200 Subject: [PATCH 497/794] deps: update dependency org.opentest4j:opentest4j to v1.3.0 (#640) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 93ea56350006..810ed5b7d03a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -779,7 +779,7 @@ org.opentest4j opentest4j - 1.2.0 + 1.3.0 org.junit.vintage From e21950918d357cd104ded0b18d4cd8ee056340d1 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 24 Jul 2023 21:11:41 +0200 Subject: [PATCH 498/794] build(deps): update surefire.version to v3.1.2 (#622) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 810ed5b7d03a..e4ca85f2eeb1 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -64,7 +64,7 @@ false true 1.10.2 - 3.1.0 + 3.1.2 /java/docs/reference/ From 6d185158c25624da14f8ef79857eb163abc4e07d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 21:06:15 +0000 Subject: [PATCH 499/794] build(deps): bump cryptography from 39.0.1 to 41.0.2 in /.kokoro (#633) Bumps [cryptography](https://togithub.com/pyca/cryptography) from 39.0.1 to 41.0.2.
Changelog

Sourced from cryptography's changelog.

41.0.2 - 2023-07-10


* Fixed bugs in creating and parsing SSH certificates where critical options
  with values were handled incorrectly. Certificates are now created correctly
  and parsing accepts correct values as well as the previously generated
  invalid forms with a warning. In the next release, support for parsing these
  invalid forms will be removed.

.. _v41-0-1:


41.0.1 - 2023-06-01

  • Temporarily allow invalid ECDSA signature algorithm parameters in X.509 certificates, which are generated by older versions of Java.
  • Allow null bytes in pass phrases when serializing private keys.

.. _v41-0-0:

41.0.0 - 2023-05-30


* **BACKWARDS INCOMPATIBLE:** Support for OpenSSL less than 1.1.1d has been
  removed.  Users on older version of OpenSSL will need to upgrade.
* **BACKWARDS INCOMPATIBLE:** Support for Python 3.6 has been removed.
* **BACKWARDS INCOMPATIBLE:** Dropped support for LibreSSL < 3.6.
* Updated the minimum supported Rust version (MSRV) to 1.56.0, from 1.48.0.
* Updated Windows, macOS, and Linux wheels to be compiled with OpenSSL 3.1.1.
* Added support for the :class:`~cryptography.x509.OCSPAcceptableResponses`
  OCSP extension.
* Added support for the :class:`~cryptography.x509.MSCertificateTemplate`
  proprietary Microsoft certificate extension.
* Implemented support for equality checks on all asymmetric public key types.
* Added support for ``aes256-gcm@openssh.com`` encrypted keys in
  :func:`~cryptography.hazmat.primitives.serialization.load_ssh_private_key`.
* Added support for obtaining X.509 certificate signature algorithm parameters
  (including PSS) via
  :meth:`~cryptography.x509.Certificate.signature_algorithm_parameters`.
* Support signing :class:`~cryptography.hazmat.primitives.asymmetric.padding.PSS`
  X.509 certificates via the new keyword-only argument ``rsa_padding`` on
  :meth:`~cryptography.x509.CertificateBuilder.sign`.
* Added support for
  :class:`~cryptography.hazmat.primitives.ciphers.aead.ChaCha20Poly1305`
  on BoringSSL.

.. _v40-0-2:


40.0.2 - 2023-04-14

... (truncated)

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=cryptography&package-manager=pip&previous-version=39.0.1&new-version=41.0.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://togithub.com/googleapis/java-shared-config/network/alerts).
From e3961b7db773c2a551a02ab93e2da402b61a1c76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 20:42:12 +0000 Subject: [PATCH 500/794] build(deps): bump certifi from 2022.12.7 to 2023.7.22 in /.kokoro (#641) Bumps [certifi](https://togithub.com/certifi/python-certifi) from 2022.12.7 to 2023.7.22.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=certifi&package-manager=pip&previous-version=2022.12.7&new-version=2023.7.22)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://togithub.com/googleapis/java-shared-config/network/alerts).
From 1d55110b181e2bcde314f1187781c5f2132bfbbc Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 31 Jul 2023 17:26:14 +0200 Subject: [PATCH 501/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.12.2 (#644) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `10.12.1` -> `10.12.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.puppycrawl.tools:checkstyle/10.12.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.puppycrawl.tools:checkstyle/10.12.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.puppycrawl.tools:checkstyle/10.12.1/10.12.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.puppycrawl.tools:checkstyle/10.12.1/10.12.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index e4ca85f2eeb1..d71afd60bf9a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -636,7 +636,7 @@ com.puppycrawl.tools checkstyle - 10.12.1 + 10.12.2 From 421275aa9fb4b17b48c99b1e4fa6df536a4d6f69 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 19 Sep 2023 16:15:33 +0200 Subject: [PATCH 502/794] build(deps): update dependency org.apache.maven.plugins:maven-enforcer-plugin to v3.4.1 (#651) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d71afd60bf9a..743da940187c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -99,7 +99,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.4.1 org.codehaus.mojo From 49e4ce46c1b0329065402b566f1e5455d8b8e046 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 19 Sep 2023 16:18:03 +0200 Subject: [PATCH 503/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.12.3 (#652) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 743da940187c..2ee312a4df72 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -636,7 +636,7 @@ com.puppycrawl.tools checkstyle - 10.12.2 + 10.12.3 From 8014d33dd3abb549bb4afddc01d9d839c6a9213a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 19 Sep 2023 16:18:17 +0200 Subject: [PATCH 504/794] deps: update actions/checkout action to v4 (#653) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * deps: update actions/checkout action to v4 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../.github/workflows/downstream-dependencies.yaml | 4 ++-- .../.github/workflows/downstream-maven-plugins.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.github/workflows/downstream-dependencies.yaml b/java-shared-config/.github/workflows/downstream-dependencies.yaml index b151d3c5e0a6..5ea8a080190c 100644 --- a/java-shared-config/.github/workflows/downstream-dependencies.yaml +++ b/java-shared-config/.github/workflows/downstream-dependencies.yaml @@ -17,7 +17,7 @@ jobs: - java-storage - java-pubsub steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - uses: actions/setup-java@v3 with: distribution: zulu @@ -30,7 +30,7 @@ jobs: flatten-plugin-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - uses: actions/setup-java@v3 with: distribution: zulu diff --git a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml index ca29cd3d7eaf..baf380cd2f6d 100644 --- a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml +++ b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml @@ -22,7 +22,7 @@ jobs: - lint # fmt-maven-plugin and google-java-format - clirr # clirr-maven-plugin steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - uses: actions/setup-java@v3 with: distribution: zulu From 0e996d3b927589b235e42495a51dc35c1bdf3426 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 19 Sep 2023 16:18:38 +0200 Subject: [PATCH 505/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.6.0 (#656) --- java-shared-config/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2ee312a4df72..12c113f5b39c 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -469,7 +469,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 html @@ -569,7 +569,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 attach-javadocs @@ -701,7 +701,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 com.microsoft.doclet.DocFxDoclet false From 606cab5a704b27378bc74579fe481cc289eed737 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 14:39:58 -0400 Subject: [PATCH 506/794] chore: for Java repos RenovateBot to ignore GitHub Actions workflow file (#1855) (#655) chore: for Java repos RenovateBot to ignore GitHub Actions workflow file The actions used in the GitHub Actions workflow files do not appear in libraries' dependencies and mostly maintained by Java postprocessor templates. IgnorePath option document: https://docs.renovatebot.com/configuration-options/ Source-Link: https://github.com/googleapis/synthtool/commit/1543029c843989702adbe789acdead153ad696d1 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:88ba8dcc5c2c7792e1c3511381f4ab329002a1c42c512f66ca87ced572dfbf9f Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 4 +- java-shared-config/.github/workflows/ci.yaml | 48 +- java-shared-config/.kokoro/build.sh | 3 +- java-shared-config/.kokoro/requirements.txt | 572 +++++++++++-------- 4 files changed, 374 insertions(+), 253 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index b8ef92bef814..52eaa54d82b2 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:c33bd13e1eab022b0499a3afbfb4b93ae10cb8ad89d8203a6343a88b1b78400f -# created: 2023-06-21T18:48:32.287298785Z + digest: sha256:88ba8dcc5c2c7792e1c3511381f4ab329002a1c42c512f66ca87ced572dfbf9f +# created: 2023-09-05T18:54:42.225408832Z diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index e3bb26e37719..e27b2c57563c 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -25,17 +25,39 @@ jobs: strategy: fail-fast: false matrix: - java: [8, 11, 17] + java: [11, 17] steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: ${{matrix.java}} - run: java -version - run: .kokoro/build.sh env: JOB_TYPE: test + units-java8: + # Building using Java 17 and run the tests with Java 8 runtime + name: "units (8)" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + java-version: 8 + distribution: temurin + - name: "Set jvm system property environment variable for surefire plugin (unit tests)" + # Maven surefire plugin (unit tests) allows us to specify JVM to run the tests. + # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm + run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV + shell: bash + - uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + - run: .kokoro/build.sh + env: + JOB_TYPE: test windows: runs-on: windows-latest steps: @@ -44,7 +66,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 8 - run: java -version - run: .kokoro/build.bat @@ -54,22 +76,34 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11, 17] + java: [17] steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh + javadoc: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 17 + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: javadoc lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 11 - run: java -version - run: .kokoro/build.sh @@ -81,7 +115,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 8 - run: java -version - run: .kokoro/build.sh diff --git a/java-shared-config/.kokoro/build.sh b/java-shared-config/.kokoro/build.sh index 1c63330b0be2..11c22129fd63 100755 --- a/java-shared-config/.kokoro/build.sh +++ b/java-shared-config/.kokoro/build.sh @@ -47,7 +47,8 @@ set +e case ${JOB_TYPE} in test) - mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true + echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}" + mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT} RETURN_CODE=$? ;; lint) diff --git a/java-shared-config/.kokoro/requirements.txt b/java-shared-config/.kokoro/requirements.txt index c80f0a87cc53..a73256ab80be 100644 --- a/java-shared-config/.kokoro/requirements.txt +++ b/java-shared-config/.kokoro/requirements.txt @@ -1,20 +1,20 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --allow-unsafe --generate-hashes requirements.in +# pip-compile requirements.in --generate-hashes --upgrade # -attrs==22.1.0 \ - --hash=sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6 \ - --hash=sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c +attrs==23.1.0 \ + --hash=sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04 \ + --hash=sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015 # via gcp-releasetool -cachetools==4.2.4 \ - --hash=sha256:89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693 \ - --hash=sha256:92971d3cb7d2a97efff7c7bb1657f21a8f5fb309a37530537c71b1774189f2d1 +cachetools==5.3.1 \ + --hash=sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590 \ + --hash=sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b # via google-auth -certifi==2022.12.7 \ - --hash=sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3 \ - --hash=sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18 +certifi==2023.7.22 \ + --hash=sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082 \ + --hash=sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9 # via requests cffi==1.15.1 \ --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ @@ -82,9 +82,82 @@ cffi==1.15.1 \ --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \ --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0 # via cryptography -charset-normalizer==2.0.12 \ - --hash=sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597 \ - --hash=sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df +charset-normalizer==3.2.0 \ + --hash=sha256:04e57ab9fbf9607b77f7d057974694b4f6b142da9ed4a199859d9d4d5c63fe96 \ + --hash=sha256:09393e1b2a9461950b1c9a45d5fd251dc7c6f228acab64da1c9c0165d9c7765c \ + --hash=sha256:0b87549028f680ca955556e3bd57013ab47474c3124dc069faa0b6545b6c9710 \ + --hash=sha256:1000fba1057b92a65daec275aec30586c3de2401ccdcd41f8a5c1e2c87078706 \ + --hash=sha256:1249cbbf3d3b04902ff081ffbb33ce3377fa6e4c7356f759f3cd076cc138d020 \ + --hash=sha256:1920d4ff15ce893210c1f0c0e9d19bfbecb7983c76b33f046c13a8ffbd570252 \ + --hash=sha256:193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad \ + --hash=sha256:1a100c6d595a7f316f1b6f01d20815d916e75ff98c27a01ae817439ea7726329 \ + --hash=sha256:1f30b48dd7fa1474554b0b0f3fdfdd4c13b5c737a3c6284d3cdc424ec0ffff3a \ + --hash=sha256:203f0c8871d5a7987be20c72442488a0b8cfd0f43b7973771640fc593f56321f \ + --hash=sha256:246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6 \ + --hash=sha256:2dee8e57f052ef5353cf608e0b4c871aee320dd1b87d351c28764fc0ca55f9f4 \ + --hash=sha256:2efb1bd13885392adfda4614c33d3b68dee4921fd0ac1d3988f8cbb7d589e72a \ + --hash=sha256:2f4ac36d8e2b4cc1aa71df3dd84ff8efbe3bfb97ac41242fbcfc053c67434f46 \ + --hash=sha256:3170c9399da12c9dc66366e9d14da8bf7147e1e9d9ea566067bbce7bb74bd9c2 \ + --hash=sha256:3b1613dd5aee995ec6d4c69f00378bbd07614702a315a2cf6c1d21461fe17c23 \ + --hash=sha256:3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace \ + --hash=sha256:3bb7fda7260735efe66d5107fb7e6af6a7c04c7fce9b2514e04b7a74b06bf5dd \ + --hash=sha256:41b25eaa7d15909cf3ac4c96088c1f266a9a93ec44f87f1d13d4a0e86c81b982 \ + --hash=sha256:45de3f87179c1823e6d9e32156fb14c1927fcc9aba21433f088fdfb555b77c10 \ + --hash=sha256:46fb8c61d794b78ec7134a715a3e564aafc8f6b5e338417cb19fe9f57a5a9bf2 \ + --hash=sha256:48021783bdf96e3d6de03a6e39a1171ed5bd7e8bb93fc84cc649d11490f87cea \ + --hash=sha256:4957669ef390f0e6719db3613ab3a7631e68424604a7b448f079bee145da6e09 \ + --hash=sha256:5e86d77b090dbddbe78867a0275cb4df08ea195e660f1f7f13435a4649e954e5 \ + --hash=sha256:6339d047dab2780cc6220f46306628e04d9750f02f983ddb37439ca47ced7149 \ + --hash=sha256:681eb3d7e02e3c3655d1b16059fbfb605ac464c834a0c629048a30fad2b27489 \ + --hash=sha256:6c409c0deba34f147f77efaa67b8e4bb83d2f11c8806405f76397ae5b8c0d1c9 \ + --hash=sha256:7095f6fbfaa55defb6b733cfeb14efaae7a29f0b59d8cf213be4e7ca0b857b80 \ + --hash=sha256:70c610f6cbe4b9fce272c407dd9d07e33e6bf7b4aa1b7ffb6f6ded8e634e3592 \ + --hash=sha256:72814c01533f51d68702802d74f77ea026b5ec52793c791e2da806a3844a46c3 \ + --hash=sha256:7a4826ad2bd6b07ca615c74ab91f32f6c96d08f6fcc3902ceeedaec8cdc3bcd6 \ + --hash=sha256:7c70087bfee18a42b4040bb9ec1ca15a08242cf5867c58726530bdf3945672ed \ + --hash=sha256:855eafa5d5a2034b4621c74925d89c5efef61418570e5ef9b37717d9c796419c \ + --hash=sha256:8700f06d0ce6f128de3ccdbc1acaea1ee264d2caa9ca05daaf492fde7c2a7200 \ + --hash=sha256:89f1b185a01fe560bc8ae5f619e924407efca2191b56ce749ec84982fc59a32a \ + --hash=sha256:8b2c760cfc7042b27ebdb4a43a4453bd829a5742503599144d54a032c5dc7e9e \ + --hash=sha256:8c2f5e83493748286002f9369f3e6607c565a6a90425a3a1fef5ae32a36d749d \ + --hash=sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6 \ + --hash=sha256:94aea8eff76ee6d1cdacb07dd2123a68283cb5569e0250feab1240058f53b623 \ + --hash=sha256:95eb302ff792e12aba9a8b8f8474ab229a83c103d74a750ec0bd1c1eea32e669 \ + --hash=sha256:9bd9b3b31adcb054116447ea22caa61a285d92e94d710aa5ec97992ff5eb7cf3 \ + --hash=sha256:9e608aafdb55eb9f255034709e20d5a83b6d60c054df0802fa9c9883d0a937aa \ + --hash=sha256:a103b3a7069b62f5d4890ae1b8f0597618f628b286b03d4bc9195230b154bfa9 \ + --hash=sha256:a386ebe437176aab38c041de1260cd3ea459c6ce5263594399880bbc398225b2 \ + --hash=sha256:a38856a971c602f98472050165cea2cdc97709240373041b69030be15047691f \ + --hash=sha256:a401b4598e5d3f4a9a811f3daf42ee2291790c7f9d74b18d75d6e21dda98a1a1 \ + --hash=sha256:a7647ebdfb9682b7bb97e2a5e7cb6ae735b1c25008a70b906aecca294ee96cf4 \ + --hash=sha256:aaf63899c94de41fe3cf934601b0f7ccb6b428c6e4eeb80da72c58eab077b19a \ + --hash=sha256:b0dac0ff919ba34d4df1b6131f59ce95b08b9065233446be7e459f95554c0dc8 \ + --hash=sha256:baacc6aee0b2ef6f3d308e197b5d7a81c0e70b06beae1f1fcacffdbd124fe0e3 \ + --hash=sha256:bf420121d4c8dce6b889f0e8e4ec0ca34b7f40186203f06a946fa0276ba54029 \ + --hash=sha256:c04a46716adde8d927adb9457bbe39cf473e1e2c2f5d0a16ceb837e5d841ad4f \ + --hash=sha256:c0b21078a4b56965e2b12f247467b234734491897e99c1d51cee628da9786959 \ + --hash=sha256:c1c76a1743432b4b60ab3358c937a3fe1341c828ae6194108a94c69028247f22 \ + --hash=sha256:c4983bf937209c57240cff65906b18bb35e64ae872da6a0db937d7b4af845dd7 \ + --hash=sha256:c4fb39a81950ec280984b3a44f5bd12819953dc5fa3a7e6fa7a80db5ee853952 \ + --hash=sha256:c57921cda3a80d0f2b8aec7e25c8aa14479ea92b5b51b6876d975d925a2ea346 \ + --hash=sha256:c8063cf17b19661471ecbdb3df1c84f24ad2e389e326ccaf89e3fb2484d8dd7e \ + --hash=sha256:ccd16eb18a849fd8dcb23e23380e2f0a354e8daa0c984b8a732d9cfaba3a776d \ + --hash=sha256:cd6dbe0238f7743d0efe563ab46294f54f9bc8f4b9bcf57c3c666cc5bc9d1299 \ + --hash=sha256:d62e51710986674142526ab9f78663ca2b0726066ae26b78b22e0f5e571238dd \ + --hash=sha256:db901e2ac34c931d73054d9797383d0f8009991e723dab15109740a63e7f902a \ + --hash=sha256:e03b8895a6990c9ab2cdcd0f2fe44088ca1c65ae592b8f795c3294af00a461c3 \ + --hash=sha256:e1c8a2f4c69e08e89632defbfabec2feb8a8d99edc9f89ce33c4b9e36ab63037 \ + --hash=sha256:e4b749b9cc6ee664a3300bb3a273c1ca8068c46be705b6c31cf5d276f8628a94 \ + --hash=sha256:e6a5bf2cba5ae1bb80b154ed68a3cfa2fa00fde979a7f50d6598d3e17d9ac20c \ + --hash=sha256:e857a2232ba53ae940d3456f7533ce6ca98b81917d47adc3c7fd55dad8fab858 \ + --hash=sha256:ee4006268ed33370957f55bf2e6f4d263eaf4dc3cfc473d1d90baff6ed36ce4a \ + --hash=sha256:eef9df1eefada2c09a5e7a40991b9fc6ac6ef20b1372abd48d2794a316dc0449 \ + --hash=sha256:f058f6963fd82eb143c692cecdc89e075fa0828db2e5b291070485390b2f1c9c \ + --hash=sha256:f25c229a6ba38a35ae6e25ca1264621cc25d4d38dca2942a7fce0b67a4efe918 \ + --hash=sha256:f2a1d0fd4242bd8643ce6f98927cf9c04540af6efa92323e9d3124f57727bfc1 \ + --hash=sha256:f7560358a6811e52e9c4d142d497f1a6e10103d3a6881f18d04dbce3729c0e2c \ + --hash=sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac \ + --hash=sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa # via requests click==8.0.4 \ --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \ @@ -97,121 +170,152 @@ colorlog==6.7.0 \ --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \ --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5 # via gcp-docuploader -cryptography==39.0.1 \ - --hash=sha256:0f8da300b5c8af9f98111ffd512910bc792b4c77392a9523624680f7956a99d4 \ - --hash=sha256:35f7c7d015d474f4011e859e93e789c87d21f6f4880ebdc29896a60403328f1f \ - --hash=sha256:5aa67414fcdfa22cf052e640cb5ddc461924a045cacf325cd164e65312d99502 \ - --hash=sha256:5d2d8b87a490bfcd407ed9d49093793d0f75198a35e6eb1a923ce1ee86c62b41 \ - --hash=sha256:6687ef6d0a6497e2b58e7c5b852b53f62142cfa7cd1555795758934da363a965 \ - --hash=sha256:6f8ba7f0328b79f08bdacc3e4e66fb4d7aab0c3584e0bd41328dce5262e26b2e \ - --hash=sha256:706843b48f9a3f9b9911979761c91541e3d90db1ca905fd63fee540a217698bc \ - --hash=sha256:807ce09d4434881ca3a7594733669bd834f5b2c6d5c7e36f8c00f691887042ad \ - --hash=sha256:83e17b26de248c33f3acffb922748151d71827d6021d98c70e6c1a25ddd78505 \ - --hash=sha256:96f1157a7c08b5b189b16b47bc9db2332269d6680a196341bf30046330d15388 \ - --hash=sha256:aec5a6c9864be7df2240c382740fcf3b96928c46604eaa7f3091f58b878c0bb6 \ - --hash=sha256:b0afd054cd42f3d213bf82c629efb1ee5f22eba35bf0eec88ea9ea7304f511a2 \ - --hash=sha256:ced4e447ae29ca194449a3f1ce132ded8fcab06971ef5f618605aacaa612beac \ - --hash=sha256:d1f6198ee6d9148405e49887803907fe8962a23e6c6f83ea7d98f1c0de375695 \ - --hash=sha256:e124352fd3db36a9d4a21c1aa27fd5d051e621845cb87fb851c08f4f75ce8be6 \ - --hash=sha256:e422abdec8b5fa8462aa016786680720d78bdce7a30c652b7fadf83a4ba35336 \ - --hash=sha256:ef8b72fa70b348724ff1218267e7f7375b8de4e8194d1636ee60510aae104cd0 \ - --hash=sha256:f0c64d1bd842ca2633e74a1a28033d139368ad959872533b1bab8c80e8240a0c \ - --hash=sha256:f24077a3b5298a5a06a8e0536e3ea9ec60e4c7ac486755e5fb6e6ea9b3500106 \ - --hash=sha256:fdd188c8a6ef8769f148f88f859884507b954cc64db6b52f66ef199bb9ad660a \ - --hash=sha256:fe913f20024eb2cb2f323e42a64bdf2911bb9738a15dba7d3cce48151034e3a8 +cryptography==41.0.2 \ + --hash=sha256:01f1d9e537f9a15b037d5d9ee442b8c22e3ae11ce65ea1f3316a41c78756b711 \ + --hash=sha256:079347de771f9282fbfe0e0236c716686950c19dee1b76240ab09ce1624d76d7 \ + --hash=sha256:182be4171f9332b6741ee818ec27daff9fb00349f706629f5cbf417bd50e66fd \ + --hash=sha256:192255f539d7a89f2102d07d7375b1e0a81f7478925b3bc2e0549ebf739dae0e \ + --hash=sha256:2a034bf7d9ca894720f2ec1d8b7b5832d7e363571828037f9e0c4f18c1b58a58 \ + --hash=sha256:342f3767e25876751e14f8459ad85e77e660537ca0a066e10e75df9c9e9099f0 \ + --hash=sha256:439c3cc4c0d42fa999b83ded80a9a1fb54d53c58d6e59234cfe97f241e6c781d \ + --hash=sha256:49c3222bb8f8e800aead2e376cbef687bc9e3cb9b58b29a261210456a7783d83 \ + --hash=sha256:674b669d5daa64206c38e507808aae49904c988fa0a71c935e7006a3e1e83831 \ + --hash=sha256:7a9a3bced53b7f09da251685224d6a260c3cb291768f54954e28f03ef14e3766 \ + --hash=sha256:7af244b012711a26196450d34f483357e42aeddb04128885d95a69bd8b14b69b \ + --hash=sha256:7d230bf856164de164ecb615ccc14c7fc6de6906ddd5b491f3af90d3514c925c \ + --hash=sha256:84609ade00a6ec59a89729e87a503c6e36af98ddcd566d5f3be52e29ba993182 \ + --hash=sha256:9a6673c1828db6270b76b22cc696f40cde9043eb90373da5c2f8f2158957f42f \ + --hash=sha256:9b6d717393dbae53d4e52684ef4f022444fc1cce3c48c38cb74fca29e1f08eaa \ + --hash=sha256:9c3fe6534d59d071ee82081ca3d71eed3210f76ebd0361798c74abc2bcf347d4 \ + --hash=sha256:a719399b99377b218dac6cf547b6ec54e6ef20207b6165126a280b0ce97e0d2a \ + --hash=sha256:b332cba64d99a70c1e0836902720887fb4529ea49ea7f5462cf6640e095e11d2 \ + --hash=sha256:d124682c7a23c9764e54ca9ab5b308b14b18eba02722b8659fb238546de83a76 \ + --hash=sha256:d73f419a56d74fef257955f51b18d046f3506270a5fd2ac5febbfa259d6c0fa5 \ + --hash=sha256:f0dc40e6f7aa37af01aba07277d3d64d5a03dc66d682097541ec4da03cc140ee \ + --hash=sha256:f14ad275364c8b4e525d018f6716537ae7b6d369c094805cae45300847e0894f \ + --hash=sha256:f772610fe364372de33d76edcd313636a25684edb94cee53fd790195f5989d14 # via # gcp-releasetool # secretstorage -gcp-docuploader==0.6.4 \ - --hash=sha256:01486419e24633af78fd0167db74a2763974765ee8078ca6eb6964d0ebd388af \ - --hash=sha256:70861190c123d907b3b067da896265ead2eeb9263969d6955c9e0bb091b5ccbf +gcp-docuploader==0.6.5 \ + --hash=sha256:30221d4ac3e5a2b9c69aa52fdbef68cc3f27d0e6d0d90e220fc024584b8d2318 \ + --hash=sha256:b7458ef93f605b9d46a4bf3a8dc1755dad1f31d030c8679edf304e343b347eea # via -r requirements.in -gcp-releasetool==1.10.5 \ - --hash=sha256:174b7b102d704b254f2a26a3eda2c684fd3543320ec239baf771542a2e58e109 \ - --hash=sha256:e29d29927fe2ca493105a82958c6873bb2b90d503acac56be2c229e74de0eec9 +gcp-releasetool==1.16.0 \ + --hash=sha256:27bf19d2e87aaa884096ff941aa3c592c482be3d6a2bfe6f06afafa6af2353e3 \ + --hash=sha256:a316b197a543fd036209d0caba7a8eb4d236d8e65381c80cbc6d7efaa7606d63 # via -r requirements.in -google-api-core==2.8.2 \ - --hash=sha256:06f7244c640322b508b125903bb5701bebabce8832f85aba9335ec00b3d02edc \ - --hash=sha256:93c6a91ccac79079ac6bbf8b74ee75db970cc899278b97d53bc012f35908cf50 +google-api-core==2.11.1 \ + --hash=sha256:25d29e05a0058ed5f19c61c0a78b1b53adea4d9364b464d014fbda941f6d1c9a \ + --hash=sha256:d92a5a92dc36dd4f4b9ee4e55528a90e432b059f93aee6ad857f9de8cc7ae94a # via # google-cloud-core # google-cloud-storage -google-auth==2.14.1 \ - --hash=sha256:ccaa901f31ad5cbb562615eb8b664b3dd0bf5404a67618e642307f00613eda4d \ - --hash=sha256:f5d8701633bebc12e0deea4df8abd8aff31c28b355360597f7f2ee60f2e4d016 +google-auth==2.22.0 \ + --hash=sha256:164cba9af4e6e4e40c3a4f90a1a6c12ee56f14c0b4868d1ca91b32826ab334ce \ + --hash=sha256:d61d1b40897407b574da67da1a833bdc10d5a11642566e506565d1b1a46ba873 # via # gcp-releasetool # google-api-core # google-cloud-core # google-cloud-storage -google-cloud-core==2.3.1 \ - --hash=sha256:113ba4f492467d5bd442c8d724c1a25ad7384045c3178369038840ecdd19346c \ - --hash=sha256:34334359cb04187bdc80ddcf613e462dfd7a3aabbc3fe4d118517ab4b9303d53 +google-cloud-core==2.3.3 \ + --hash=sha256:37b80273c8d7eee1ae816b3a20ae43585ea50506cb0e60f3cf5be5f87f1373cb \ + --hash=sha256:fbd11cad3e98a7e5b0343dc07cb1039a5ffd7a5bb96e1f1e27cee4bda4a90863 # via google-cloud-storage -google-cloud-storage==2.0.0 \ - --hash=sha256:a57a15aead0f9dfbd4381f1bfdbe8bf89818a4bd75bab846cafcefb2db846c47 \ - --hash=sha256:ec4be60bb223a3a960f0d01697d849b86d91cad815a84915a32ed3635e93a5e7 +google-cloud-storage==2.10.0 \ + --hash=sha256:934b31ead5f3994e5360f9ff5750982c5b6b11604dc072bc452c25965e076dc7 \ + --hash=sha256:9433cf28801671de1c80434238fb1e7e4a1ba3087470e90f70c928ea77c2b9d7 # via gcp-docuploader -google-crc32c==1.3.0 \ - --hash=sha256:04e7c220798a72fd0f08242bc8d7a05986b2a08a0573396187fd32c1dcdd58b3 \ - --hash=sha256:05340b60bf05b574159e9bd940152a47d38af3fb43803ffe71f11d704b7696a6 \ - --hash=sha256:12674a4c3b56b706153a358eaa1018c4137a5a04635b92b4652440d3d7386206 \ - --hash=sha256:127f9cc3ac41b6a859bd9dc4321097b1a4f6aa7fdf71b4f9227b9e3ebffb4422 \ - --hash=sha256:13af315c3a0eec8bb8b8d80b8b128cb3fcd17d7e4edafc39647846345a3f003a \ - --hash=sha256:1926fd8de0acb9d15ee757175ce7242e235482a783cd4ec711cc999fc103c24e \ - --hash=sha256:226f2f9b8e128a6ca6a9af9b9e8384f7b53a801907425c9a292553a3a7218ce0 \ - --hash=sha256:276de6273eb074a35bc598f8efbc00c7869c5cf2e29c90748fccc8c898c244df \ - --hash=sha256:318f73f5484b5671f0c7f5f63741ab020a599504ed81d209b5c7129ee4667407 \ - --hash=sha256:3bbce1be3687bbfebe29abdb7631b83e6b25da3f4e1856a1611eb21854b689ea \ - --hash=sha256:42ae4781333e331a1743445931b08ebdad73e188fd554259e772556fc4937c48 \ - --hash=sha256:58be56ae0529c664cc04a9c76e68bb92b091e0194d6e3c50bea7e0f266f73713 \ - --hash=sha256:5da2c81575cc3ccf05d9830f9e8d3c70954819ca9a63828210498c0774fda1a3 \ - --hash=sha256:6311853aa2bba4064d0c28ca54e7b50c4d48e3de04f6770f6c60ebda1e975267 \ - --hash=sha256:650e2917660e696041ab3dcd7abac160b4121cd9a484c08406f24c5964099829 \ - --hash=sha256:6a4db36f9721fdf391646685ecffa404eb986cbe007a3289499020daf72e88a2 \ - --hash=sha256:779cbf1ce375b96111db98fca913c1f5ec11b1d870e529b1dc7354b2681a8c3a \ - --hash=sha256:7f6fe42536d9dcd3e2ffb9d3053f5d05221ae3bbcefbe472bdf2c71c793e3183 \ - --hash=sha256:891f712ce54e0d631370e1f4997b3f182f3368179198efc30d477c75d1f44942 \ - --hash=sha256:95c68a4b9b7828ba0428f8f7e3109c5d476ca44996ed9a5f8aac6269296e2d59 \ - --hash=sha256:96a8918a78d5d64e07c8ea4ed2bc44354e3f93f46a4866a40e8db934e4c0d74b \ - --hash=sha256:9c3cf890c3c0ecfe1510a452a165431b5831e24160c5fcf2071f0f85ca5a47cd \ - --hash=sha256:9f58099ad7affc0754ae42e6d87443299f15d739b0ce03c76f515153a5cda06c \ - --hash=sha256:a0b9e622c3b2b8d0ce32f77eba617ab0d6768b82836391e4f8f9e2074582bf02 \ - --hash=sha256:a7f9cbea4245ee36190f85fe1814e2d7b1e5f2186381b082f5d59f99b7f11328 \ - --hash=sha256:bab4aebd525218bab4ee615786c4581952eadc16b1ff031813a2fd51f0cc7b08 \ - --hash=sha256:c124b8c8779bf2d35d9b721e52d4adb41c9bfbde45e6a3f25f0820caa9aba73f \ - --hash=sha256:c9da0a39b53d2fab3e5467329ed50e951eb91386e9d0d5b12daf593973c3b168 \ - --hash=sha256:ca60076c388728d3b6ac3846842474f4250c91efbfe5afa872d3ffd69dd4b318 \ - --hash=sha256:cb6994fff247987c66a8a4e550ef374671c2b82e3c0d2115e689d21e511a652d \ - --hash=sha256:d1c1d6236feab51200272d79b3d3e0f12cf2cbb12b208c835b175a21efdb0a73 \ - --hash=sha256:dd7760a88a8d3d705ff562aa93f8445ead54f58fd482e4f9e2bafb7e177375d4 \ - --hash=sha256:dda4d8a3bb0b50f540f6ff4b6033f3a74e8bf0bd5320b70fab2c03e512a62812 \ - --hash=sha256:e0f1ff55dde0ebcfbef027edc21f71c205845585fffe30d4ec4979416613e9b3 \ - --hash=sha256:e7a539b9be7b9c00f11ef16b55486141bc2cdb0c54762f84e3c6fc091917436d \ - --hash=sha256:eb0b14523758e37802f27b7f8cd973f5f3d33be7613952c0df904b68c4842f0e \ - --hash=sha256:ed447680ff21c14aaceb6a9f99a5f639f583ccfe4ce1a5e1d48eb41c3d6b3217 \ - --hash=sha256:f52a4ad2568314ee713715b1e2d79ab55fab11e8b304fd1462ff5cccf4264b3e \ - --hash=sha256:fbd60c6aaa07c31d7754edbc2334aef50601b7f1ada67a96eb1eb57c7c72378f \ - --hash=sha256:fc28e0db232c62ca0c3600884933178f0825c99be4474cdd645e378a10588125 \ - --hash=sha256:fe31de3002e7b08eb20823b3735b97c86c5926dd0581c7710a680b418a8709d4 \ - --hash=sha256:fec221a051150eeddfdfcff162e6db92c65ecf46cb0f7bb1bf812a1520ec026b \ - --hash=sha256:ff71073ebf0e42258a42a0b34f2c09ec384977e7f6808999102eedd5b49920e3 +google-crc32c==1.5.0 \ + --hash=sha256:024894d9d3cfbc5943f8f230e23950cd4906b2fe004c72e29b209420a1e6b05a \ + --hash=sha256:02c65b9817512edc6a4ae7c7e987fea799d2e0ee40c53ec573a692bee24de876 \ + --hash=sha256:02ebb8bf46c13e36998aeaad1de9b48f4caf545e91d14041270d9dca767b780c \ + --hash=sha256:07eb3c611ce363c51a933bf6bd7f8e3878a51d124acfc89452a75120bc436289 \ + --hash=sha256:1034d91442ead5a95b5aaef90dbfaca8633b0247d1e41621d1e9f9db88c36298 \ + --hash=sha256:116a7c3c616dd14a3de8c64a965828b197e5f2d121fedd2f8c5585c547e87b02 \ + --hash=sha256:19e0a019d2c4dcc5e598cd4a4bc7b008546b0358bd322537c74ad47a5386884f \ + --hash=sha256:1c7abdac90433b09bad6c43a43af253e688c9cfc1c86d332aed13f9a7c7f65e2 \ + --hash=sha256:1e986b206dae4476f41bcec1faa057851f3889503a70e1bdb2378d406223994a \ + --hash=sha256:272d3892a1e1a2dbc39cc5cde96834c236d5327e2122d3aaa19f6614531bb6eb \ + --hash=sha256:278d2ed7c16cfc075c91378c4f47924c0625f5fc84b2d50d921b18b7975bd210 \ + --hash=sha256:2ad40e31093a4af319dadf503b2467ccdc8f67c72e4bcba97f8c10cb078207b5 \ + --hash=sha256:2e920d506ec85eb4ba50cd4228c2bec05642894d4c73c59b3a2fe20346bd00ee \ + --hash=sha256:3359fc442a743e870f4588fcf5dcbc1bf929df1fad8fb9905cd94e5edb02e84c \ + --hash=sha256:37933ec6e693e51a5b07505bd05de57eee12f3e8c32b07da7e73669398e6630a \ + --hash=sha256:398af5e3ba9cf768787eef45c803ff9614cc3e22a5b2f7d7ae116df8b11e3314 \ + --hash=sha256:3b747a674c20a67343cb61d43fdd9207ce5da6a99f629c6e2541aa0e89215bcd \ + --hash=sha256:461665ff58895f508e2866824a47bdee72497b091c730071f2b7575d5762ab65 \ + --hash=sha256:4c6fdd4fccbec90cc8a01fc00773fcd5fa28db683c116ee3cb35cd5da9ef6c37 \ + --hash=sha256:5829b792bf5822fd0a6f6eb34c5f81dd074f01d570ed7f36aa101d6fc7a0a6e4 \ + --hash=sha256:596d1f98fc70232fcb6590c439f43b350cb762fb5d61ce7b0e9db4539654cc13 \ + --hash=sha256:5ae44e10a8e3407dbe138984f21e536583f2bba1be9491239f942c2464ac0894 \ + --hash=sha256:635f5d4dd18758a1fbd1049a8e8d2fee4ffed124462d837d1a02a0e009c3ab31 \ + --hash=sha256:64e52e2b3970bd891309c113b54cf0e4384762c934d5ae56e283f9a0afcd953e \ + --hash=sha256:66741ef4ee08ea0b2cc3c86916ab66b6aef03768525627fd6a1b34968b4e3709 \ + --hash=sha256:67b741654b851abafb7bc625b6d1cdd520a379074e64b6a128e3b688c3c04740 \ + --hash=sha256:6ac08d24c1f16bd2bf5eca8eaf8304812f44af5cfe5062006ec676e7e1d50afc \ + --hash=sha256:6f998db4e71b645350b9ac28a2167e6632c239963ca9da411523bb439c5c514d \ + --hash=sha256:72218785ce41b9cfd2fc1d6a017dc1ff7acfc4c17d01053265c41a2c0cc39b8c \ + --hash=sha256:74dea7751d98034887dbd821b7aae3e1d36eda111d6ca36c206c44478035709c \ + --hash=sha256:759ce4851a4bb15ecabae28f4d2e18983c244eddd767f560165563bf9aefbc8d \ + --hash=sha256:77e2fd3057c9d78e225fa0a2160f96b64a824de17840351b26825b0848022906 \ + --hash=sha256:7c074fece789b5034b9b1404a1f8208fc2d4c6ce9decdd16e8220c5a793e6f61 \ + --hash=sha256:7c42c70cd1d362284289c6273adda4c6af8039a8ae12dc451dcd61cdabb8ab57 \ + --hash=sha256:7f57f14606cd1dd0f0de396e1e53824c371e9544a822648cd76c034d209b559c \ + --hash=sha256:83c681c526a3439b5cf94f7420471705bbf96262f49a6fe546a6db5f687a3d4a \ + --hash=sha256:8485b340a6a9e76c62a7dce3c98e5f102c9219f4cfbf896a00cf48caf078d438 \ + --hash=sha256:84e6e8cd997930fc66d5bb4fde61e2b62ba19d62b7abd7a69920406f9ecca946 \ + --hash=sha256:89284716bc6a5a415d4eaa11b1726d2d60a0cd12aadf5439828353662ede9dd7 \ + --hash=sha256:8b87e1a59c38f275c0e3676fc2ab6d59eccecfd460be267ac360cc31f7bcde96 \ + --hash=sha256:8f24ed114432de109aa9fd317278518a5af2d31ac2ea6b952b2f7782b43da091 \ + --hash=sha256:98cb4d057f285bd80d8778ebc4fde6b4d509ac3f331758fb1528b733215443ae \ + --hash=sha256:998679bf62b7fb599d2878aa3ed06b9ce688b8974893e7223c60db155f26bd8d \ + --hash=sha256:9ba053c5f50430a3fcfd36f75aff9caeba0440b2d076afdb79a318d6ca245f88 \ + --hash=sha256:9c99616c853bb585301df6de07ca2cadad344fd1ada6d62bb30aec05219c45d2 \ + --hash=sha256:a1fd716e7a01f8e717490fbe2e431d2905ab8aa598b9b12f8d10abebb36b04dd \ + --hash=sha256:a2355cba1f4ad8b6988a4ca3feed5bff33f6af2d7f134852cf279c2aebfde541 \ + --hash=sha256:b1f8133c9a275df5613a451e73f36c2aea4fe13c5c8997e22cf355ebd7bd0728 \ + --hash=sha256:b8667b48e7a7ef66afba2c81e1094ef526388d35b873966d8a9a447974ed9178 \ + --hash=sha256:ba1eb1843304b1e5537e1fca632fa894d6f6deca8d6389636ee5b4797affb968 \ + --hash=sha256:be82c3c8cfb15b30f36768797a640e800513793d6ae1724aaaafe5bf86f8f346 \ + --hash=sha256:c02ec1c5856179f171e032a31d6f8bf84e5a75c45c33b2e20a3de353b266ebd8 \ + --hash=sha256:c672d99a345849301784604bfeaeba4db0c7aae50b95be04dd651fd2a7310b93 \ + --hash=sha256:c6c777a480337ac14f38564ac88ae82d4cd238bf293f0a22295b66eb89ffced7 \ + --hash=sha256:cae0274952c079886567f3f4f685bcaf5708f0a23a5f5216fdab71f81a6c0273 \ + --hash=sha256:cd67cf24a553339d5062eff51013780a00d6f97a39ca062781d06b3a73b15462 \ + --hash=sha256:d3515f198eaa2f0ed49f8819d5732d70698c3fa37384146079b3799b97667a94 \ + --hash=sha256:d5280312b9af0976231f9e317c20e4a61cd2f9629b7bfea6a693d1878a264ebd \ + --hash=sha256:de06adc872bcd8c2a4e0dc51250e9e65ef2ca91be023b9d13ebd67c2ba552e1e \ + --hash=sha256:e1674e4307fa3024fc897ca774e9c7562c957af85df55efe2988ed9056dc4e57 \ + --hash=sha256:e2096eddb4e7c7bdae4bd69ad364e55e07b8316653234a56552d9c988bd2d61b \ + --hash=sha256:e560628513ed34759456a416bf86b54b2476c59144a9138165c9a1575801d0d9 \ + --hash=sha256:edfedb64740750e1a3b16152620220f51d58ff1b4abceb339ca92e934775c27a \ + --hash=sha256:f13cae8cc389a440def0c8c52057f37359014ccbc9dc1f0827936bcd367c6100 \ + --hash=sha256:f314013e7dcd5cf45ab1945d92e713eec788166262ae8deb2cfacd53def27325 \ + --hash=sha256:f583edb943cf2e09c60441b910d6a20b4d9d626c75a36c8fcac01a6c96c01183 \ + --hash=sha256:fd8536e902db7e365f49e7d9029283403974ccf29b13fc7028b97e2295b33556 \ + --hash=sha256:fe70e325aa68fa4b5edf7d1a4b6f691eb04bbccac0ace68e34820d283b5f80d4 # via google-resumable-media -google-resumable-media==2.3.3 \ - --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \ - --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5 +google-resumable-media==2.5.0 \ + --hash=sha256:218931e8e2b2a73a58eb354a288e03a0fd5fb1c4583261ac6e4c078666468c93 \ + --hash=sha256:da1bd943e2e114a56d85d6848497ebf9be6a14d3db23e9fc57581e7c3e8170ec # via google-cloud-storage -googleapis-common-protos==1.56.3 \ - --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \ - --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461 +googleapis-common-protos==1.59.1 \ + --hash=sha256:0cbedb6fb68f1c07e18eb4c48256320777707e7d0c55063ae56c15db3224a61e \ + --hash=sha256:b35d530fe825fb4227857bc47ad84c33c809ac96f312e13182bdeaa2abe1178a # via google-api-core idna==3.4 \ --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \ --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2 # via requests -importlib-metadata==4.8.3 \ - --hash=sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e \ - --hash=sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668 +importlib-metadata==6.8.0 \ + --hash=sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb \ + --hash=sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743 + # via keyring +jaraco-classes==3.3.0 \ + --hash=sha256:10afa92b6743f25c0cf5f37c6bb6e18e2c5bb84a16527ccfc0040ea377e7aaeb \ + --hash=sha256:c063dd08e89217cee02c8d5e5ec560f2c8ce6cdc2fcdc2e68f7b2e5547ed3621 # via keyring jeepney==0.8.0 \ --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \ @@ -219,139 +323,119 @@ jeepney==0.8.0 \ # via # keyring # secretstorage -jinja2==3.0.3 \ - --hash=sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8 \ - --hash=sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7 +jinja2==3.1.2 \ + --hash=sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 \ + --hash=sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61 # via gcp-releasetool -keyring==23.4.1 \ - --hash=sha256:17e49fb0d6883c2b4445359434dba95aad84aabb29bbff044ad0ed7100232eca \ - --hash=sha256:89cbd74d4683ed164c8082fb38619341097741323b3786905c6dac04d6915a55 +keyring==24.2.0 \ + --hash=sha256:4901caaf597bfd3bbd78c9a0c7c4c29fcd8310dab2cffefe749e916b6527acd6 \ + --hash=sha256:ca0746a19ec421219f4d713f848fa297a661a8a8c1504867e55bfb5e09091509 # via gcp-releasetool -markupsafe==2.0.1 \ - --hash=sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298 \ - --hash=sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64 \ - --hash=sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b \ - --hash=sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194 \ - --hash=sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567 \ - --hash=sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff \ - --hash=sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724 \ - --hash=sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74 \ - --hash=sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646 \ - --hash=sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35 \ - --hash=sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6 \ - --hash=sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a \ - --hash=sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6 \ - --hash=sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad \ - --hash=sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26 \ - --hash=sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38 \ - --hash=sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac \ - --hash=sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7 \ - --hash=sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6 \ - --hash=sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047 \ - --hash=sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75 \ - --hash=sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f \ - --hash=sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b \ - --hash=sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135 \ - --hash=sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8 \ - --hash=sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a \ - --hash=sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a \ - --hash=sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1 \ - --hash=sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9 \ - --hash=sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864 \ - --hash=sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914 \ - --hash=sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee \ - --hash=sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f \ - --hash=sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18 \ - --hash=sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8 \ - --hash=sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2 \ - --hash=sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d \ - --hash=sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b \ - --hash=sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b \ - --hash=sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86 \ - --hash=sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6 \ - --hash=sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f \ - --hash=sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb \ - --hash=sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833 \ - --hash=sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28 \ - --hash=sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e \ - --hash=sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415 \ - --hash=sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902 \ - --hash=sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f \ - --hash=sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d \ - --hash=sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9 \ - --hash=sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d \ - --hash=sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145 \ - --hash=sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066 \ - --hash=sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c \ - --hash=sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1 \ - --hash=sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a \ - --hash=sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207 \ - --hash=sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f \ - --hash=sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53 \ - --hash=sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd \ - --hash=sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134 \ - --hash=sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85 \ - --hash=sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9 \ - --hash=sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5 \ - --hash=sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94 \ - --hash=sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509 \ - --hash=sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51 \ - --hash=sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872 +markupsafe==2.1.3 \ + --hash=sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e \ + --hash=sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e \ + --hash=sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431 \ + --hash=sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686 \ + --hash=sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559 \ + --hash=sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc \ + --hash=sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c \ + --hash=sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0 \ + --hash=sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4 \ + --hash=sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9 \ + --hash=sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575 \ + --hash=sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba \ + --hash=sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d \ + --hash=sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3 \ + --hash=sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00 \ + --hash=sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155 \ + --hash=sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac \ + --hash=sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52 \ + --hash=sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f \ + --hash=sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8 \ + --hash=sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b \ + --hash=sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24 \ + --hash=sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea \ + --hash=sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198 \ + --hash=sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0 \ + --hash=sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee \ + --hash=sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be \ + --hash=sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2 \ + --hash=sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707 \ + --hash=sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6 \ + --hash=sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58 \ + --hash=sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779 \ + --hash=sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636 \ + --hash=sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c \ + --hash=sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad \ + --hash=sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee \ + --hash=sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc \ + --hash=sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2 \ + --hash=sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48 \ + --hash=sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7 \ + --hash=sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e \ + --hash=sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b \ + --hash=sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa \ + --hash=sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5 \ + --hash=sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e \ + --hash=sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb \ + --hash=sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9 \ + --hash=sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57 \ + --hash=sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc \ + --hash=sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2 # via jinja2 -packaging==21.3 \ - --hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \ - --hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 +more-itertools==9.1.0 \ + --hash=sha256:cabaa341ad0389ea83c17a94566a53ae4c9d07349861ecb14dc6d0345cf9ac5d \ + --hash=sha256:d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3 + # via jaraco-classes +packaging==23.1 \ + --hash=sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61 \ + --hash=sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f # via gcp-releasetool -protobuf==3.20.2 \ - --hash=sha256:03d76b7bd42ac4a6e109742a4edf81ffe26ffd87c5993126d894fe48a120396a \ - --hash=sha256:09e25909c4297d71d97612f04f41cea8fa8510096864f2835ad2f3b3df5a5559 \ - --hash=sha256:18e34a10ae10d458b027d7638a599c964b030c1739ebd035a1dfc0e22baa3bfe \ - --hash=sha256:291fb4307094bf5ccc29f424b42268640e00d5240bf0d9b86bf3079f7576474d \ - --hash=sha256:2c0b040d0b5d5d207936ca2d02f00f765906622c07d3fa19c23a16a8ca71873f \ - --hash=sha256:384164994727f274cc34b8abd41a9e7e0562801361ee77437099ff6dfedd024b \ - --hash=sha256:3cb608e5a0eb61b8e00fe641d9f0282cd0eedb603be372f91f163cbfbca0ded0 \ - --hash=sha256:5d9402bf27d11e37801d1743eada54372f986a372ec9679673bfcc5c60441151 \ - --hash=sha256:712dca319eee507a1e7df3591e639a2b112a2f4a62d40fe7832a16fd19151750 \ - --hash=sha256:7a5037af4e76c975b88c3becdf53922b5ffa3f2cddf657574a4920a3b33b80f3 \ - --hash=sha256:8228e56a865c27163d5d1d1771d94b98194aa6917bcfb6ce139cbfa8e3c27334 \ - --hash=sha256:84a1544252a933ef07bb0b5ef13afe7c36232a774affa673fc3636f7cee1db6c \ - --hash=sha256:84fe5953b18a383fd4495d375fe16e1e55e0a3afe7b4f7b4d01a3a0649fcda9d \ - --hash=sha256:9c673c8bfdf52f903081816b9e0e612186684f4eb4c17eeb729133022d6032e3 \ - --hash=sha256:a9e5ae5a8e8985c67e8944c23035a0dff2c26b0f5070b2f55b217a1c33bbe8b1 \ - --hash=sha256:b4fdb29c5a7406e3f7ef176b2a7079baa68b5b854f364c21abe327bbeec01cdb \ - --hash=sha256:c184485e0dfba4dfd451c3bd348c2e685d6523543a0f91b9fd4ae90eb09e8422 \ - --hash=sha256:c9cdf251c582c16fd6a9f5e95836c90828d51b0069ad22f463761d27c6c19019 \ - --hash=sha256:e39cf61bb8582bda88cdfebc0db163b774e7e03364bbf9ce1ead13863e81e359 \ - --hash=sha256:e8fbc522303e09036c752a0afcc5c0603e917222d8bedc02813fd73b4b4ed804 \ - --hash=sha256:f34464ab1207114e73bba0794d1257c150a2b89b7a9faf504e00af7c9fd58978 \ - --hash=sha256:f52dabc96ca99ebd2169dadbe018824ebda08a795c7684a0b7d203a290f3adb0 +protobuf==3.20.3 \ + --hash=sha256:03038ac1cfbc41aa21f6afcbcd357281d7521b4157926f30ebecc8d4ea59dcb7 \ + --hash=sha256:28545383d61f55b57cf4df63eebd9827754fd2dc25f80c5253f9184235db242c \ + --hash=sha256:2e3427429c9cffebf259491be0af70189607f365c2f41c7c3764af6f337105f2 \ + --hash=sha256:398a9e0c3eaceb34ec1aee71894ca3299605fa8e761544934378bbc6c97de23b \ + --hash=sha256:44246bab5dd4b7fbd3c0c80b6f16686808fab0e4aca819ade6e8d294a29c7050 \ + --hash=sha256:447d43819997825d4e71bf5769d869b968ce96848b6479397e29fc24c4a5dfe9 \ + --hash=sha256:67a3598f0a2dcbc58d02dd1928544e7d88f764b47d4a286202913f0b2801c2e7 \ + --hash=sha256:74480f79a023f90dc6e18febbf7b8bac7508420f2006fabd512013c0c238f454 \ + --hash=sha256:819559cafa1a373b7096a482b504ae8a857c89593cf3a25af743ac9ecbd23480 \ + --hash=sha256:899dc660cd599d7352d6f10d83c95df430a38b410c1b66b407a6b29265d66469 \ + --hash=sha256:8c0c984a1b8fef4086329ff8dd19ac77576b384079247c770f29cc8ce3afa06c \ + --hash=sha256:9aae4406ea63d825636cc11ffb34ad3379335803216ee3a856787bcf5ccc751e \ + --hash=sha256:a7ca6d488aa8ff7f329d4c545b2dbad8ac31464f1d8b1c87ad1346717731e4db \ + --hash=sha256:b6cc7ba72a8850621bfec987cb72623e703b7fe2b9127a161ce61e61558ad905 \ + --hash=sha256:bf01b5720be110540be4286e791db73f84a2b721072a3711efff6c324cdf074b \ + --hash=sha256:c02ce36ec760252242a33967d51c289fd0e1c0e6e5cc9397e2279177716add86 \ + --hash=sha256:d9e4432ff660d67d775c66ac42a67cf2453c27cb4d738fc22cb53b5d84c135d4 \ + --hash=sha256:daa564862dd0d39c00f8086f88700fdbe8bc717e993a21e90711acfed02f2402 \ + --hash=sha256:de78575669dddf6099a8a0f46a27e82a1783c557ccc38ee620ed8cc96d3be7d7 \ + --hash=sha256:e64857f395505ebf3d2569935506ae0dfc4a15cb80dc25261176c784662cdcc4 \ + --hash=sha256:f4bd856d702e5b0d96a00ec6b307b0f51c1982c2bf9c0052cf9019e9a544ba99 \ + --hash=sha256:f4c42102bc82a51108e449cbb32b19b180022941c727bac0cfd50170341f16ee # via # gcp-docuploader # gcp-releasetool # google-api-core - # google-cloud-storage -pyasn1==0.4.8 \ - --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \ - --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba +pyasn1==0.5.0 \ + --hash=sha256:87a2121042a1ac9358cabcaf1d07680ff97ee6404333bacca15f76aa8ad01a57 \ + --hash=sha256:97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde # via # pyasn1-modules # rsa -pyasn1-modules==0.2.8 \ - --hash=sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e \ - --hash=sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74 +pyasn1-modules==0.3.0 \ + --hash=sha256:5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c \ + --hash=sha256:d3ccd6ed470d9ffbc716be08bd90efbd44d0734bc9303818f7336070984a162d # via google-auth pycparser==2.21 \ --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 # via cffi -pyjwt==2.4.0 \ - --hash=sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf \ - --hash=sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba +pyjwt==2.7.0 \ + --hash=sha256:ba2b425b15ad5ef12f200dc67dd56af4e26de2331f965c5439994dad075876e1 \ + --hash=sha256:bd6ca4a3c4285c1a2d4349e5a035fdf8fb94e04ccd0fcbe6ba289dae9cc3e074 # via gcp-releasetool -pyparsing==3.0.9 \ - --hash=sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb \ - --hash=sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc - # via packaging pyperclip==1.8.2 \ --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57 # via gcp-releasetool @@ -359,9 +443,9 @@ python-dateutil==2.8.2 \ --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \ --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 # via gcp-releasetool -requests==2.27.1 \ - --hash=sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 \ - --hash=sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d +requests==2.31.0 \ + --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \ + --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 # via # gcp-releasetool # google-api-core @@ -374,10 +458,6 @@ secretstorage==3.3.3 \ --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 # via keyring -setuptools==67.3.2 \ - --hash=sha256:95f00380ef2ffa41d9bba85d95b27689d923c93dfbafed4aecd7cf988a25e012 \ - --hash=sha256:bb6d8e508de562768f2027902929f8523932fcd1fb784e6d573d2cafac995a48 - # via -r requirements.in six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 @@ -385,19 +465,25 @@ six==1.16.0 \ # gcp-docuploader # google-auth # python-dateutil -typing-extensions==4.4.0 \ - --hash=sha256:1511434bb92bf8dd198c12b1cc812e800d4181cfcb867674e0f8279cc93087aa \ - --hash=sha256:16fa4864408f655d35ec496218b85f79b3437c829e93320c7c9215ccfd92489e +typing-extensions==4.7.1 \ + --hash=sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36 \ + --hash=sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2 # via -r requirements.in -urllib3==1.26.12 \ - --hash=sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e \ - --hash=sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997 - # via requests -wheel==0.38.4 \ - --hash=sha256:965f5259b566725405b05e7cf774052044b1ed30119b5d586b2703aafe8719ac \ - --hash=sha256:b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8 +urllib3==1.26.16 \ + --hash=sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f \ + --hash=sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14 + # via + # google-auth + # requests +wheel==0.40.0 \ + --hash=sha256:cd1196f3faee2b31968d626e1731c94f99cbdb67cf5a46e4f5656cbee7738873 \ + --hash=sha256:d236b20e7cb522daf2390fa84c55eea81c5c30190f90f29ae2ca1ad8355bf247 # via -r requirements.in -zipp==3.6.0 \ - --hash=sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832 \ - --hash=sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc +zipp==3.16.1 \ + --hash=sha256:0b37c326d826d5ca35f2b9685cd750292740774ef16190008b00a0227c256fe0 \ + --hash=sha256:857b158da2cbf427b376da1c24fd11faecbac5a4ac7523c3607f8a01f94c2ec0 # via importlib-metadata + +# WARNING: The following packages were not pinned, but pip requires them to be +# pinned when the requirements file includes hashes. Consider using the --allow-unsafe flag. +# setuptools From ec793cef41ca956e347c8d9f6dbadb9f341c5957 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Fri, 29 Sep 2023 02:33:29 +0000 Subject: [PATCH 507/794] chore: remove dependencies (11) from list of required checks (#663) * chore: remove dependencies (11) from list of required checks The dependencies (11) check was removed in https://github.com/googleapis/java-shared-config/pull/655/ * empty commit --- java-shared-config/.github/sync-repo-settings.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index 67014da9b156..babd141c94e2 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -29,7 +29,6 @@ branchProtectionRules: requiresStrictStatusChecks: false # List of required status check contexts that must pass for commits to be accepted to matching branches. requiredStatusCheckContexts: - - "dependencies (11)" - "lint" - "clirr" - "units (8)" From 272c2dcf8b80a574d036b4809ab832dd9e763984 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 2 Oct 2023 14:27:47 +0000 Subject: [PATCH 508/794] chore: publish native image docker images from java-shared-config (#660) * chore: publish native image docker images from java-shared-config to cloud-devrel-public-resources --- .../.cloudbuild/cloudbuild-test.yaml | 42 +++++++++++++++++ .../.cloudbuild/cloudbuild.yaml | 46 +++++++++++++++++++ .../.cloudbuild/google-cloud-sdk.repo | 8 ++++ .../.cloudbuild/graalvm22_3_jdk11.Dockerfile | 45 ++++++++++++++++++ .../.cloudbuild/graalvm22_3_jdk11.yaml | 29 ++++++++++++ .../.cloudbuild/graalvm22_3_jdk17.Dockerfile | 45 ++++++++++++++++++ .../.cloudbuild/graalvm22_3_jdk17.yaml | 29 ++++++++++++ 7 files changed, 244 insertions(+) create mode 100644 java-shared-config/.cloudbuild/cloudbuild-test.yaml create mode 100644 java-shared-config/.cloudbuild/cloudbuild.yaml create mode 100644 java-shared-config/.cloudbuild/google-cloud-sdk.repo create mode 100644 java-shared-config/.cloudbuild/graalvm22_3_jdk11.Dockerfile create mode 100644 java-shared-config/.cloudbuild/graalvm22_3_jdk11.yaml create mode 100644 java-shared-config/.cloudbuild/graalvm22_3_jdk17.Dockerfile create mode 100644 java-shared-config/.cloudbuild/graalvm22_3_jdk17.yaml diff --git a/java-shared-config/.cloudbuild/cloudbuild-test.yaml b/java-shared-config/.cloudbuild/cloudbuild-test.yaml new file mode 100644 index 000000000000..a8bf102b2737 --- /dev/null +++ b/java-shared-config/.cloudbuild/cloudbuild-test.yaml @@ -0,0 +1,42 @@ +# Copyright 2023 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. + +timeout: 7200s # 2 hours +substitutions: + _JAVA_SHARED_CONFIG_VERSION: '1.5.7' + _GRAALVM_A: 'graalvm22_3_jdk11' + _GRAALVM_B: 'graalvm22_3_jdk17' +steps: + # GraalVM A build + - name: gcr.io/cloud-builders/docker + args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "${_GRAALVM_A}.Dockerfile", "."] + dir: .cloudbuild + id: graalvm-a-build + waitFor: ["-"] + - name: gcr.io/gcp-runtimes/structure_test + args: + ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_A}.yaml", "-v"] + waitFor: ["graalvm-a-build"] + + + # GraalVM B build + - name: gcr.io/cloud-builders/docker + args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "${_GRAALVM_B}.Dockerfile", "."] + dir: .cloudbuild + id: graalvm-b-build + waitFor: ["-"] + - name: gcr.io/gcp-runtimes/structure_test + args: + ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_B}.yaml", "-v"] + waitFor: ["graalvm-b-build"] diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml new file mode 100644 index 000000000000..9a9f138b99ee --- /dev/null +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -0,0 +1,46 @@ +# Copyright 2023 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. + +timeout: 7200s # 2 hours +substitutions: + _JAVA_SHARED_CONFIG_VERSION: '1.5.7' + _GRAALVM_A: 'graalvm22_3_jdk11' + _GRAALVM_B: 'graalvm22_3_jdk17' +steps: + # GraalVM A build + - name: gcr.io/cloud-builders/docker + args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "${_GRAALVM_A}.Dockerfile", "."] + dir: .cloudbuild + id: graalvm-a-build + waitFor: ["-"] + - name: gcr.io/gcp-runtimes/structure_test + args: + ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_A}.yaml", "-v"] + waitFor: ["graalvm-a-build"] + + # GraalVM B build + - name: gcr.io/cloud-builders/docker + args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "${_GRAALVM_B}.Dockerfile", "." ] + dir: .cloudbuild + id: graalvm-b-build + waitFor: [ "-" ] + - name: gcr.io/gcp-runtimes/structure_test + args: + [ "-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_B}.yaml", "-v" ] + waitFor: [ "graalvm-b-build" ] + + +images: + - gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION} + - gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION} diff --git a/java-shared-config/.cloudbuild/google-cloud-sdk.repo b/java-shared-config/.cloudbuild/google-cloud-sdk.repo new file mode 100644 index 000000000000..8c654dc3177c --- /dev/null +++ b/java-shared-config/.cloudbuild/google-cloud-sdk.repo @@ -0,0 +1,8 @@ +[google-cloud-sdk] +name=Google Cloud SDK +baseurl=https://packages.cloud.google.com/yum/repos/cloud-sdk-el7-x86_64 +enabled=1 +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg + https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg diff --git a/java-shared-config/.cloudbuild/graalvm22_3_jdk11.Dockerfile b/java-shared-config/.cloudbuild/graalvm22_3_jdk11.Dockerfile new file mode 100644 index 000000000000..789d88c6a4e3 --- /dev/null +++ b/java-shared-config/.cloudbuild/graalvm22_3_jdk11.Dockerfile @@ -0,0 +1,45 @@ +# Copyright 2023 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. + +FROM ghcr.io/graalvm/graalvm-ce:ol7-java11-22.3.2-b1 + +RUN gu install native-image && \ + yum update -y && \ + yum install -y wget unzip git && \ + # Install maven + wget -q https://archive.apache.org/dist/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.zip -O /tmp/maven.zip && \ + unzip /tmp/maven.zip -d /tmp/maven && \ + mv /tmp/maven/apache-maven-3.9.4 /usr/local/lib/maven && \ + rm /tmp/maven.zip && \ + ln -s $JAVA_HOME/lib $JAVA_HOME/conf + +ENV PATH $PATH:/usr/local/lib/maven/bin + +# Install gcloud SDK +COPY google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo +RUN yum install -y google-cloud-sdk + +# Adding the package path to local +ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin + +# Install docker +RUN yum install -y docker-engine docker-cli + +# Install terraform +RUN yum -y install terraform + +# Install jq +RUN yum -y install jq + +WORKDIR /workspace diff --git a/java-shared-config/.cloudbuild/graalvm22_3_jdk11.yaml b/java-shared-config/.cloudbuild/graalvm22_3_jdk11.yaml new file mode 100644 index 000000000000..c79001829031 --- /dev/null +++ b/java-shared-config/.cloudbuild/graalvm22_3_jdk11.yaml @@ -0,0 +1,29 @@ +# Copyright 2023 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. + +schemaVersion: 1.0.0 +commandTests: + - name: "version" + command: ["java", "-version"] + # java -version outputs to stderr... + expectedError: ["openjdk version \"11.0.19\"", "GraalVM CE 22.3.2"] + - name: "maven" + command: ["mvn", "-version"] + expectedOutput: ["Apache Maven 3.9.4"] + - name: "gcloud" + command: ["gcloud", "version"] + expectedOutput: ["Google Cloud SDK"] + - name: "docker" + command: ["docker", "--version"] + expectedOutput: ["Docker version *"] diff --git a/java-shared-config/.cloudbuild/graalvm22_3_jdk17.Dockerfile b/java-shared-config/.cloudbuild/graalvm22_3_jdk17.Dockerfile new file mode 100644 index 000000000000..98b07495e3c0 --- /dev/null +++ b/java-shared-config/.cloudbuild/graalvm22_3_jdk17.Dockerfile @@ -0,0 +1,45 @@ +# Copyright 2023 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. + +FROM ghcr.io/graalvm/graalvm-ce:ol7-java17-22.3.2-b1 + +RUN gu install native-image && \ + yum update -y && \ + yum install -y wget unzip git && \ + # Install maven + wget -q https://archive.apache.org/dist/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.zip -O /tmp/maven.zip && \ + unzip /tmp/maven.zip -d /tmp/maven && \ + mv /tmp/maven/apache-maven-3.9.4 /usr/local/lib/maven && \ + rm /tmp/maven.zip && \ + ln -s $JAVA_HOME/lib $JAVA_HOME/conf + +ENV PATH $PATH:/usr/local/lib/maven/bin + +# Install gcloud SDK +COPY google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo +RUN yum install -y google-cloud-sdk + +# Adding the package path to local +ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin + +# Install docker +RUN yum install -y docker-engine docker-cli + +# Install terraform +RUN yum -y install terraform + +# Install jq +RUN yum -y install jq + +WORKDIR /workspace diff --git a/java-shared-config/.cloudbuild/graalvm22_3_jdk17.yaml b/java-shared-config/.cloudbuild/graalvm22_3_jdk17.yaml new file mode 100644 index 000000000000..62d3f8871d2f --- /dev/null +++ b/java-shared-config/.cloudbuild/graalvm22_3_jdk17.yaml @@ -0,0 +1,29 @@ +# Copyright 2023 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. + +schemaVersion: 1.0.0 +commandTests: + - name: "version" + command: ["java", "-version"] + # java -version outputs to stderr... + expectedError: ["openjdk version \"17.0.7\"", "GraalVM CE 22.3.2"] + - name: "maven" + command: ["mvn", "-version"] + expectedOutput: ["Apache Maven 3.9.4"] + - name: "gcloud" + command: ["gcloud", "version"] + expectedOutput: ["Google Cloud SDK"] + - name: "docker" + command: ["docker", "--version"] + expectedOutput: ["Docker version *"] From c36cb632d5f5d0f70003cf8532f369643d5421f9 Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Wed, 4 Oct 2023 14:11:31 -0400 Subject: [PATCH 509/794] deps: Update auto-value-annotation.version to v1.10.4 (#669) --- .../java-storage-v2.9.3-expected-flattened-dependencies.txt | 2 +- java-shared-config/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt b/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt index 515bbc76c8f3..f418bfe63756 100644 --- a/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt +++ b/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt @@ -8,7 +8,7 @@ com.google.api:gax:jar:2.18.2:compile com.google.apis:google-api-services-storage:jar:v1-rev20220705-1.32.1:compile com.google.auth:google-auth-library-credentials:jar:1.7.0:compile com.google.auth:google-auth-library-oauth2-http:jar:1.7.0:compile -com.google.auto.value:auto-value-annotations:jar:1.10.2:compile +com.google.auto.value:auto-value-annotations:jar:1.10.4:compile com.google.cloud:google-cloud-core-http:jar:2.8.0:compile com.google.cloud:google-cloud-core:jar:2.8.0:compile com.google.code.findbugs:jsr305:jar:3.0.2:compile diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 12c113f5b39c..764c4d0e6a73 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -63,7 +63,7 @@ ${project.artifactId} false true - 1.10.2 + 1.10.4 3.1.2 /java/docs/reference/ From 17c50610a0ad71a3e13e4c5cbbd08322a2cac4a5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 15:08:10 -0400 Subject: [PATCH 510/794] chore(main): release 1.5.8-SNAPSHOT (#636) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 764c4d0e6a73..5b1df24b58f7 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.7 + 1.5.8-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 4159f5b01797..8de341547790 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.7:1.5.7 +google-cloud-shared-config:1.5.7:1.5.8-SNAPSHOT From 8c1887b9085a4c490fb04b60fe52ea106f1077f4 Mon Sep 17 00:00:00 2001 From: Alice <65933803+alicejli@users.noreply.github.com> Date: Wed, 4 Oct 2023 16:13:15 -0400 Subject: [PATCH 511/794] test: add test for maven-javadoc-plugin version (#662) * add javadoc test for bigquery * test: add new check for javadoc generation with doclet --- .../.github/sync-repo-settings.yaml | 2 + .../workflows/downstream-maven-plugins.yaml | 19 ++++++ ...lient-library-check-javadoc-with-doclet.sh | 62 +++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100755 java-shared-config/.kokoro/client-library-check-javadoc-with-doclet.sh diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index babd141c94e2..c7ff8b2d3096 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -44,9 +44,11 @@ branchProtectionRules: - "build (8, java-bigquery, test)" - "build (8, java-bigquery, lint)" - "build (8, java-bigquery, clirr)" + - "build (8, java-bigtable, javadoc)" - "build (11, java-bigquery, test)" - "build (11, java-bigquery, lint)" - "build (11, java-bigquery, clirr)" + - "build (11, java-bigtable, javadoc)" - "cla/google" - pattern: java7 # Can admins overwrite branch protection. diff --git a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml index baf380cd2f6d..d37e2667c2b8 100644 --- a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml +++ b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml @@ -17,10 +17,12 @@ jobs: java: [8, 11] repo: - java-bigquery + - java-bigtable job-type: - test # maven-surefire-plugin - lint # fmt-maven-plugin and google-java-format - clirr # clirr-maven-plugin + - javadoc # maven-javadoc-plugin steps: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - uses: actions/setup-java@v3 @@ -31,3 +33,20 @@ jobs: - run: sudo apt-get update -y - run: sudo apt-get install libxml2-utils - run: .kokoro/client-library-check.sh ${{matrix.repo}} ${{matrix.job-type}} + javadoc-with-doclet: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + repo: + - java-bigtable + steps: + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 11 + - run: java -version + - run: sudo apt-get update -y + - run: sudo apt-get install libxml2-utils + - run: .kokoro/client-library-check-javadoc-with-doclet.sh ${{matrix.repo}} diff --git a/java-shared-config/.kokoro/client-library-check-javadoc-with-doclet.sh b/java-shared-config/.kokoro/client-library-check-javadoc-with-doclet.sh new file mode 100755 index 000000000000..79963d10b8df --- /dev/null +++ b/java-shared-config/.kokoro/client-library-check-javadoc-with-doclet.sh @@ -0,0 +1,62 @@ +#!/bin/bash + +set -eo pipefail +REPO=$1 +set -x + +# Make artifacts available for 'mvn validate' at the bottom +mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q + +# Read the current version of this BOM in the POM. Example version: '0.116.1-alpha-SNAPSHOT' +VERSION_POM=pom.xml +# Namespace (xmlns) prevents xmllint from specifying tag names in XPath +VERSION=`sed -e 's/xmlns=".*"//' ${VERSION_POM} | xmllint --xpath '/project/version/text()' -` + +if [ -z "${VERSION}" ]; then + echo "Version is not found in ${VERSION_POM}" + exit 1 +fi +echo "Version: ${VERSION}" + +# Get version of doclet used to generate Cloud RAD +git clone https://github.com/googleapis/java-docfx-doclet.git +cd java-docfx-doclet/third_party/docfx-doclet-143274 +git checkout 1.9.0 +mvn package -Dmaven.test.skip=true + +# work from the root directory +cd ../../../ +docletPath=$(realpath "java-docfx-doclet/third_party/docfx-doclet-143274/target/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies.jar") +echo "This is the doclet path: ${docletPath}" + +# Test with java-bigtable +git clone "https://github.com/googleapis/${REPO}.git" --depth=1 +pushd ${REPO} + +# replace version +xmllint --shell <(cat pom.xml) << EOF +setns x=http://maven.apache.org/POM/4.0.0 +cd .//x:artifactId[text()="google-cloud-shared-config"] +cd ../x:version +set ${VERSION} +save pom.xml +EOF + +mvn clean -B -ntp \ + -P docFX \ + -DdocletPath="${docletPath}" \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ + -Dcheckstyle.skip=true \ + -Dflatten.skip=true \ + -Danimal.sniffer.skip=true \ + javadoc:aggregate + +# go back to the root directory +cd .. +# clean up clones +echo "Removing java-docfx-doclet clone" +rm -rf java-docfx-doclet +echo "Removing java-bigtable clone" +rm -rf ${REPO} \ No newline at end of file From d15fde516aaee1481d22186c7433072188c9958b Mon Sep 17 00:00:00 2001 From: Alice <65933803+alicejli@users.noreply.github.com> Date: Wed, 4 Oct 2023 16:42:14 -0400 Subject: [PATCH 512/794] Revert "build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.6.0" (#671) Reverts googleapis/java-shared-config#656 This version update currently breaks javadoc generation with v1.9.0+ of the doclet used for Cloud RAD. --- java-shared-config/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 5b1df24b58f7..78461a99d914 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -469,7 +469,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.0 + 3.5.0 html @@ -569,7 +569,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.0 + 3.5.0 attach-javadocs @@ -701,7 +701,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.0 + 3.5.0 com.microsoft.doclet.DocFxDoclet false From fb87d72c840be8edf881148efa823c5d5fdeef44 Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Thu, 5 Oct 2023 12:16:06 -0400 Subject: [PATCH 513/794] chore: Renaming `auto-value-annotation.version` to `auto-value.version` (#674) * chore: Renaming to * chore: updating golden file * chore: updatiNG golden file --- java-shared-config/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 78461a99d914..9eee0ffddc2a 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -63,7 +63,7 @@ ${project.artifactId} false true - 1.10.4 + 1.10.4 3.1.2 /java/docs/reference/ @@ -538,7 +538,7 @@ com.google.auto.value auto-value-annotations - ${auto-value-annotation.version} + ${auto-value.version} @@ -741,7 +741,7 @@ com.google.auto.value auto-value - ${auto-value-annotation.version} + ${auto-value.version} + 1.5.8 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 8de341547790..d3770bddc63f 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.7:1.5.8-SNAPSHOT +google-cloud-shared-config:1.5.8:1.5.8 From afeb109bb7d7dfc6e8c85ea0da0aea97d591b702 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Thu, 5 Oct 2023 19:13:59 +0000 Subject: [PATCH 516/794] chore: add kokoro job for verifying presence of docker image (#664) * chore: add kokoro job for verifying presence of docker image --- .../.kokoro/presubmit/graalvm-docker.cfg | 12 ++++++ .../.kokoro/verify-docker-images.sh | 37 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 java-shared-config/.kokoro/presubmit/graalvm-docker.cfg create mode 100755 java-shared-config/.kokoro/verify-docker-images.sh diff --git a/java-shared-config/.kokoro/presubmit/graalvm-docker.cfg b/java-shared-config/.kokoro/presubmit/graalvm-docker.cfg new file mode 100644 index 000000000000..63d5b09071d3 --- /dev/null +++ b/java-shared-config/.kokoro/presubmit/graalvm-docker.cfg @@ -0,0 +1,12 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-shared-config/.kokoro/verify-docker-images.sh" +} \ No newline at end of file diff --git a/java-shared-config/.kokoro/verify-docker-images.sh b/java-shared-config/.kokoro/verify-docker-images.sh new file mode 100755 index 000000000000..3f15d3a20c41 --- /dev/null +++ b/java-shared-config/.kokoro/verify-docker-images.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +# Script to verify the presence of GraalVM docker test images tagged with the latest java-shared-config version. + +function fetch_image_names() { + imageNames="$(grep " - gcr.io/cloud-devrel-public-resources/" .cloudbuild/cloudbuild.yaml | cut -d "/" -f 3 | cut -d ":" -f 1)" + export imageNames + echo "$imageNames" +} + +# Get the directory of the build script +scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")") +# cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. || exit + +# Fetch the java-shared-config version in source of the current commit. +javaSharedConfigVersion="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" + +branchName=$(git name-rev "$KOKORO_GIT_COMMIT" | sed 's/.* //') +gitCommitMessage=$(git log -1 "$(git rev-parse --short "$KOKORO_GIT_COMMIT")" | grep "chore(main): release *") + +# GraalVM docker images are not tagged with SNAPSHOT versions. +if [[ "${branchName}" == *"release-please--branches--main"* ]] && [[ ! $gitCommitMessage =~ "SNAPSHOT" ]]; then + imageNames=$(fetch_image_names) + for name in $imageNames; do + fullContainerName="gcr.io/cloud-devrel-public-resources/${name}:${javaSharedConfigVersion}" + echo "Verifying presence of ${fullContainerName}." + gcloud container images describe "${fullContainerName}" > /dev/null; exit_status=$? + if [[ $exit_status = 0 ]]; then + echo "Success. Found $fullContainerName." + fi + done + RETURN_CODE=$? +else + echo "Skipping check for non-release and SNAPSHOT update branches" + exit 0 +fi From decbb0d1e1ff3b9b61b41b271ae1197ca4d8c2f9 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 6 Oct 2023 09:03:42 -0400 Subject: [PATCH 517/794] ci: mark javadoc-with-doclet as required (#677) --- java-shared-config/.github/sync-repo-settings.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index c7ff8b2d3096..cda3df630bec 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -49,6 +49,7 @@ branchProtectionRules: - "build (11, java-bigquery, lint)" - "build (11, java-bigquery, clirr)" - "build (11, java-bigtable, javadoc)" + - "javadoc-with-doclet (java-bigtable)" - "cla/google" - pattern: java7 # Can admins overwrite branch protection. From 256fcfa8822d5fd1eaf130d2a6a752d0f16b02e1 Mon Sep 17 00:00:00 2001 From: Deepankar Dixit <90280028+ddixit14@users.noreply.github.com> Date: Tue, 10 Oct 2023 17:46:47 +0000 Subject: [PATCH 518/794] chore: Update downstream-dependencies.yaml with java-bigquerystorage (#681) Adding java-bigquerystorage to the repo list for this check. ${auto-value}.version is used there. --- .../.github/workflows/downstream-dependencies.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/java-shared-config/.github/workflows/downstream-dependencies.yaml b/java-shared-config/.github/workflows/downstream-dependencies.yaml index 5ea8a080190c..772e515964b5 100644 --- a/java-shared-config/.github/workflows/downstream-dependencies.yaml +++ b/java-shared-config/.github/workflows/downstream-dependencies.yaml @@ -13,6 +13,7 @@ jobs: java: [11] repo: - java-bigquery + - java-bigquerystorage - java-spanner - java-storage - java-pubsub From 05cdb0b692ebea5e23598f02076833c9d32499b3 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:57:55 +0000 Subject: [PATCH 519/794] feat: add graal-sdk dependency management to java-shared-config (#683) * feat: add graal-sdk dependency management to java-shared-config --- java-shared-config/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 5070ddef8592..9cfb79693d8e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -65,6 +65,7 @@ true 1.10.4 3.1.2 + 22.3.2 /java/docs/reference/ @@ -540,6 +541,12 @@ auto-value-annotations ${auto-value.version} + + + org.graalvm.sdk + graal-sdk + ${graal-sdk.version} + From 43595a28ea14fad6fa20aef4e00f1f238ebc6350 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 16 Oct 2023 16:59:25 +0200 Subject: [PATCH 520/794] build(deps): update dependency org.jacoco:jacoco-maven-plugin to v0.8.11 (#686) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 9cfb79693d8e..8c82e5e11b1b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -186,7 +186,7 @@ org.jacoco jacoco-maven-plugin - 0.8.10 + 0.8.11 org.apache.maven.plugins From 7e587725e0d09a531d0d180704cc3eb7011f5b82 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:26:03 -0400 Subject: [PATCH 521/794] chore(main): release 1.5.9-SNAPSHOT (#678) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 8c82e5e11b1b..84ea7cb3f423 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.8 + 1.5.9-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index d3770bddc63f..e1e1a33ddedd 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.8:1.5.8 +google-cloud-shared-config:1.5.8:1.5.9-SNAPSHOT From cfeefc1556a36979b04525bcddb5eb0287bbed52 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 16 Oct 2023 19:55:45 +0000 Subject: [PATCH 522/794] chore: add java-shared-config to safe.directory and mark docker validation check as required (#688) * test: troubleshoot kokoro docker image for validate docker check * add git config command as recommended * remove unused arg * remove debugging statements; mark check as required --- java-shared-config/.github/sync-repo-settings.yaml | 1 + java-shared-config/.kokoro/verify-docker-images.sh | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index cda3df630bec..c7db364836f6 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -36,6 +36,7 @@ branchProtectionRules: - "Kokoro - Test: Integration" - "Kokoro - Test: Java GraalVM Native Image" - "Kokoro - Test: Java 17 GraalVM Native Image" + - "Kokoro - Test: Docker Image Validation" - "dependencies (11, java-bigquery)" - "dependencies (11, java-spanner)" - "dependencies (11, java-storage)" diff --git a/java-shared-config/.kokoro/verify-docker-images.sh b/java-shared-config/.kokoro/verify-docker-images.sh index 3f15d3a20c41..794f7a8d8e1d 100755 --- a/java-shared-config/.kokoro/verify-docker-images.sh +++ b/java-shared-config/.kokoro/verify-docker-images.sh @@ -8,6 +8,8 @@ function fetch_image_names() { echo "$imageNames" } +git config --global --add safe.directory /tmpfs/src/github/java-shared-config + # Get the directory of the build script scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")") # cd to the parent directory, i.e. the root of the git repo @@ -16,8 +18,8 @@ cd ${scriptDir}/.. || exit # Fetch the java-shared-config version in source of the current commit. javaSharedConfigVersion="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" -branchName=$(git name-rev "$KOKORO_GIT_COMMIT" | sed 's/.* //') -gitCommitMessage=$(git log -1 "$(git rev-parse --short "$KOKORO_GIT_COMMIT")" | grep "chore(main): release *") +branchName=$(git name-rev "${KOKORO_GIT_COMMIT}" | sed 's/.* //') +gitCommitMessage=$(git log -1 "$(git rev-parse --short "${KOKORO_GIT_COMMIT}")" | grep "chore(main): release *") # GraalVM docker images are not tagged with SNAPSHOT versions. if [[ "${branchName}" == *"release-please--branches--main"* ]] && [[ ! $gitCommitMessage =~ "SNAPSHOT" ]]; then From 7b82a8c43bb8b235c0e23febb193ea17bc0df004 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Tue, 17 Oct 2023 14:21:24 +0000 Subject: [PATCH 523/794] chore: avoid masking errors in docker validation script (#689) * chore: avoid masking errors in docker validation script --- java-shared-config/.kokoro/verify-docker-images.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/java-shared-config/.kokoro/verify-docker-images.sh b/java-shared-config/.kokoro/verify-docker-images.sh index 794f7a8d8e1d..b9ac3da73f15 100755 --- a/java-shared-config/.kokoro/verify-docker-images.sh +++ b/java-shared-config/.kokoro/verify-docker-images.sh @@ -2,6 +2,11 @@ # Script to verify the presence of GraalVM docker test images tagged with the latest java-shared-config version. +set -o pipefail + +# Output commands executed. +set -x + function fetch_image_names() { imageNames="$(grep " - gcr.io/cloud-devrel-public-resources/" .cloudbuild/cloudbuild.yaml | cut -d "/" -f 3 | cut -d ":" -f 1)" export imageNames @@ -30,9 +35,10 @@ if [[ "${branchName}" == *"release-please--branches--main"* ]] && [[ ! $gitCommi gcloud container images describe "${fullContainerName}" > /dev/null; exit_status=$? if [[ $exit_status = 0 ]]; then echo "Success. Found $fullContainerName." + else + exit $exit_status fi done - RETURN_CODE=$? else echo "Skipping check for non-release and SNAPSHOT update branches" exit 0 From c004602bbcad62a35c0b34a0e23e85476b21bd04 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Tue, 17 Oct 2023 15:10:14 +0000 Subject: [PATCH 524/794] chore: update docker image tag to 1.6.0 (#690) --- java-shared-config/.cloudbuild/cloudbuild-test.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test.yaml b/java-shared-config/.cloudbuild/cloudbuild-test.yaml index a8bf102b2737..448944918483 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.5.7' + _JAVA_SHARED_CONFIG_VERSION: '1.6.0' _GRAALVM_A: 'graalvm22_3_jdk11' _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 9a9f138b99ee..6d3e184bc064 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.5.7' + _JAVA_SHARED_CONFIG_VERSION: '1.6.0' _GRAALVM_A: 'graalvm22_3_jdk11' _GRAALVM_B: 'graalvm22_3_jdk17' steps: From 51ba5b794506b081d7588405fe2420514624dd29 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 15:56:14 +0000 Subject: [PATCH 525/794] chore(main): release 1.6.0 (#687) :robot: I have created a release *beep* *boop* --- ## [1.6.0](https://togithub.com/googleapis/java-shared-config/compare/v1.5.8...v1.6.0) (2023-10-17) ### Features * Add graal-sdk dependency management to java-shared-config ([#683](https://togithub.com/googleapis/java-shared-config/issues/683)) ([05cdb0b](https://togithub.com/googleapis/java-shared-config/commit/05cdb0b692ebea5e23598f02076833c9d32499b3)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 6af7ef870cac..0302c540ec54 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.6.0](https://github.com/googleapis/java-shared-config/compare/v1.5.8...v1.6.0) (2023-10-17) + + +### Features + +* Add graal-sdk dependency management to java-shared-config ([#683](https://github.com/googleapis/java-shared-config/issues/683)) ([5cd1d84](https://github.com/googleapis/java-shared-config/commit/5cd1d84bf2d68dbe8f9fa7e02d9065082bd56726)) + ## [1.5.8](https://github.com/googleapis/java-shared-config/compare/v1.5.7...v1.5.8) (2023-10-05) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 84ea7cb3f423..6584a63a515b 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.5.9-SNAPSHOT + 1.6.0 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index e1e1a33ddedd..5a80366a3c9d 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.5.8:1.5.9-SNAPSHOT +google-cloud-shared-config:1.6.0:1.6.0 From 41f425fbea2abbe5fa04ffe78cec8529a77ebe55 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 12:14:13 -0400 Subject: [PATCH 526/794] chore: bump urllib3 from 2.0.3 to 2.0.6 in /docker/owlbot/java/src (#1873) (#682) Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.0.3 to 2.0.6. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/2.0.3...2.0.6) --- updated-dependencies: - dependency-name: urllib3 dependency-type: indirect ... Source-Link: https://github.com/googleapis/synthtool/commit/e19b0b1ba296650dd264bf06003ee4d71a32d98b Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:411589ea6aca20f400adb0291a11fb9f12bf3f968ff7e5ec1d2a2eb1800ea5d1 Signed-off-by: dependabot[bot] Co-authored-by: Owl Bot Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jeffrey Rennie Co-authored-by: Anthonios Partheniou --- java-shared-config/.github/.OwlBot.lock.yaml | 4 ++-- java-shared-config/.kokoro/requirements.txt | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 52eaa54d82b2..641e636aea67 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:88ba8dcc5c2c7792e1c3511381f4ab329002a1c42c512f66ca87ced572dfbf9f -# created: 2023-09-05T18:54:42.225408832Z + digest: sha256:411589ea6aca20f400adb0291a11fb9f12bf3f968ff7e5ec1d2a2eb1800ea5d1 +# created: 2023-10-11T14:20:39.368918544Z diff --git a/java-shared-config/.kokoro/requirements.txt b/java-shared-config/.kokoro/requirements.txt index a73256ab80be..59de49234092 100644 --- a/java-shared-config/.kokoro/requirements.txt +++ b/java-shared-config/.kokoro/requirements.txt @@ -418,6 +418,7 @@ protobuf==3.20.3 \ # gcp-docuploader # gcp-releasetool # google-api-core + # googleapis-common-protos pyasn1==0.5.0 \ --hash=sha256:87a2121042a1ac9358cabcaf1d07680ff97ee6404333bacca15f76aa8ad01a57 \ --hash=sha256:97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde @@ -469,9 +470,9 @@ typing-extensions==4.7.1 \ --hash=sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36 \ --hash=sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2 # via -r requirements.in -urllib3==1.26.16 \ - --hash=sha256:8d36afa7616d8ab714608411b4a3b13e58f463aee519024578e062e141dce20f \ - --hash=sha256:8f135f6502756bde6b2a9b28989df5fbe87c9970cecaa69041edcce7f0589b14 +urllib3==1.26.17 \ + --hash=sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21 \ + --hash=sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b # via # google-auth # requests @@ -485,5 +486,6 @@ zipp==3.16.1 \ # via importlib-metadata # WARNING: The following packages were not pinned, but pip requires them to be -# pinned when the requirements file includes hashes. Consider using the --allow-unsafe flag. +# pinned when the requirements file includes hashes and the requirement is not +# satisfied by a package already installed. Consider using the --allow-unsafe flag. # setuptools From 5ba2919800813a698eeb36aac7c1f58ec00cae9c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 17 Oct 2023 19:31:51 +0200 Subject: [PATCH 527/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.12.4 (#665) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 6584a63a515b..d95b86826e20 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -643,7 +643,7 @@ com.puppycrawl.tools checkstyle - 10.12.3 + 10.12.4 From b80dddec4b4ea78dca3d4a9942392de7667ebcd5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 14:29:30 -0400 Subject: [PATCH 528/794] chore(main): release 1.6.1-SNAPSHOT (#692) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index d95b86826e20..18c5cd2d8f96 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.6.0 + 1.6.1-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 5a80366a3c9d..d7432c297889 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.6.0:1.6.0 +google-cloud-shared-config:1.6.0:1.6.1-SNAPSHOT From f77219bf78b53e389872d095d3775722248e3592 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 14:29:58 -0400 Subject: [PATCH 529/794] chore: track customization in templates (#1876) (#693) Source-Link: https://github.com/googleapis/synthtool/commit/a79241941a00783e0da86853c455e899567c3ccb Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:d0a8eb7ffc63ddce4c63191373d6e99d5385516423c396de207dedf2b6db7427 Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 4 ++-- java-shared-config/.kokoro/nightly/integration.cfg | 1 + java-shared-config/.kokoro/nightly/java11-integration.cfg | 1 + java-shared-config/.kokoro/presubmit/integration.cfg | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 641e636aea67..cd91b662b949 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:411589ea6aca20f400adb0291a11fb9f12bf3f968ff7e5ec1d2a2eb1800ea5d1 -# created: 2023-10-11T14:20:39.368918544Z + digest: sha256:d0a8eb7ffc63ddce4c63191373d6e99d5385516423c396de207dedf2b6db7427 +# created: 2023-10-17T17:33:29.360983119Z diff --git a/java-shared-config/.kokoro/nightly/integration.cfg b/java-shared-config/.kokoro/nightly/integration.cfg index a2907a257b2b..5a95c68284c4 100644 --- a/java-shared-config/.kokoro/nightly/integration.cfg +++ b/java-shared-config/.kokoro/nightly/integration.cfg @@ -35,3 +35,4 @@ env_vars: { key: "SECRET_MANAGER_KEYS" value: "java-it-service-account" } + diff --git a/java-shared-config/.kokoro/nightly/java11-integration.cfg b/java-shared-config/.kokoro/nightly/java11-integration.cfg index 58049cc38f11..6a6ef94eff28 100644 --- a/java-shared-config/.kokoro/nightly/java11-integration.cfg +++ b/java-shared-config/.kokoro/nightly/java11-integration.cfg @@ -35,3 +35,4 @@ env_vars: { key: "SECRET_MANAGER_KEYS" value: "java-it-service-account" } + diff --git a/java-shared-config/.kokoro/presubmit/integration.cfg b/java-shared-config/.kokoro/presubmit/integration.cfg index dded67a9d54a..5864c603e5ad 100644 --- a/java-shared-config/.kokoro/presubmit/integration.cfg +++ b/java-shared-config/.kokoro/presubmit/integration.cfg @@ -31,3 +31,4 @@ env_vars: { key: "SECRET_MANAGER_KEYS" value: "java-it-service-account" } + From c40a1de27dde9fdfc7d3650bb865046d296da87c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 19 Oct 2023 16:04:24 +0200 Subject: [PATCH 530/794] deps: update actions/checkout digest to b4ffde6 (#696) --- .../.github/workflows/downstream-dependencies.yaml | 4 ++-- .../.github/workflows/downstream-maven-plugins.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-shared-config/.github/workflows/downstream-dependencies.yaml b/java-shared-config/.github/workflows/downstream-dependencies.yaml index 772e515964b5..3cae8fb49615 100644 --- a/java-shared-config/.github/workflows/downstream-dependencies.yaml +++ b/java-shared-config/.github/workflows/downstream-dependencies.yaml @@ -18,7 +18,7 @@ jobs: - java-storage - java-pubsub steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - uses: actions/setup-java@v3 with: distribution: zulu @@ -31,7 +31,7 @@ jobs: flatten-plugin-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - uses: actions/setup-java@v3 with: distribution: zulu diff --git a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml index d37e2667c2b8..26cca0668b9c 100644 --- a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml +++ b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml @@ -24,7 +24,7 @@ jobs: - clirr # clirr-maven-plugin - javadoc # maven-javadoc-plugin steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - uses: actions/setup-java@v3 with: distribution: zulu @@ -41,7 +41,7 @@ jobs: repo: - java-bigtable steps: - - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - uses: actions/setup-java@v3 with: distribution: temurin From 54e38de6967aabad8aa48500c24f41f040347ea2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 25 Oct 2023 23:20:15 +0200 Subject: [PATCH 531/794] build(deps): update surefire.version to v3.2.1 (#698) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 18c5cd2d8f96..3600df80f842 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -64,7 +64,7 @@ false true 1.10.4 - 3.1.2 + 3.2.1 22.3.2 /java/docs/reference/ From fd2ab619e0d8e5a003592c802e2c0fbccb2af3db Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 25 Oct 2023 23:20:32 +0200 Subject: [PATCH 532/794] build(deps): update dependency org.apache.maven.plugins:maven-jxr-plugin to v3.3.1 (#697) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 3600df80f842..55967d64ba30 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -511,7 +511,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.3.0 + 3.3.1 true From 020293aa5c29fe8171968f2e88a959d35297314c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 25 Oct 2023 23:46:17 +0200 Subject: [PATCH 533/794] build(deps): update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.3.1 (#701) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-checkstyle-plugin](https://maven.apache.org/plugins/) | `3.3.0` -> `3.3.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.apache.maven.plugins:maven-checkstyle-plugin/3.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.apache.maven.plugins:maven-checkstyle-plugin/3.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.apache.maven.plugins:maven-checkstyle-plugin/3.3.0/3.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.apache.maven.plugins:maven-checkstyle-plugin/3.3.0/3.3.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 55967d64ba30..2411c64da1fd 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -638,7 +638,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.3.0 + 3.3.1 com.puppycrawl.tools From 02706d382825c304e329ff13cae995ec03d0f716 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 30 Oct 2023 17:10:53 +0000 Subject: [PATCH 534/794] deps: update graal-sdk to 22.3.3 (#703) * deps: update graal-sdk to 22.3.3 --- java-shared-config/.cloudbuild/cloudbuild-test.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/.cloudbuild/graalvm22_3_jdk11.Dockerfile | 2 +- java-shared-config/.cloudbuild/graalvm22_3_jdk11.yaml | 2 +- java-shared-config/.cloudbuild/graalvm22_3_jdk17.Dockerfile | 2 +- java-shared-config/.cloudbuild/graalvm22_3_jdk17.yaml | 2 +- java-shared-config/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test.yaml b/java-shared-config/.cloudbuild/cloudbuild-test.yaml index 448944918483..c39919eeab71 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.6.0' + _JAVA_SHARED_CONFIG_VERSION: '1.6.1' _GRAALVM_A: 'graalvm22_3_jdk11' _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 6d3e184bc064..618601ec1b97 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.6.0' + _JAVA_SHARED_CONFIG_VERSION: '1.6.1' _GRAALVM_A: 'graalvm22_3_jdk11' _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/.cloudbuild/graalvm22_3_jdk11.Dockerfile b/java-shared-config/.cloudbuild/graalvm22_3_jdk11.Dockerfile index 789d88c6a4e3..d0cfee89ab3c 100644 --- a/java-shared-config/.cloudbuild/graalvm22_3_jdk11.Dockerfile +++ b/java-shared-config/.cloudbuild/graalvm22_3_jdk11.Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ghcr.io/graalvm/graalvm-ce:ol7-java11-22.3.2-b1 +FROM ghcr.io/graalvm/graalvm-ce:ol7-java11-22.3.3-b1 RUN gu install native-image && \ yum update -y && \ diff --git a/java-shared-config/.cloudbuild/graalvm22_3_jdk11.yaml b/java-shared-config/.cloudbuild/graalvm22_3_jdk11.yaml index c79001829031..9416153e5140 100644 --- a/java-shared-config/.cloudbuild/graalvm22_3_jdk11.yaml +++ b/java-shared-config/.cloudbuild/graalvm22_3_jdk11.yaml @@ -17,7 +17,7 @@ commandTests: - name: "version" command: ["java", "-version"] # java -version outputs to stderr... - expectedError: ["openjdk version \"11.0.19\"", "GraalVM CE 22.3.2"] + expectedError: ["openjdk version \"11.0.20\"", "GraalVM CE 22.3.3"] - name: "maven" command: ["mvn", "-version"] expectedOutput: ["Apache Maven 3.9.4"] diff --git a/java-shared-config/.cloudbuild/graalvm22_3_jdk17.Dockerfile b/java-shared-config/.cloudbuild/graalvm22_3_jdk17.Dockerfile index 98b07495e3c0..722e066bdc48 100644 --- a/java-shared-config/.cloudbuild/graalvm22_3_jdk17.Dockerfile +++ b/java-shared-config/.cloudbuild/graalvm22_3_jdk17.Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ghcr.io/graalvm/graalvm-ce:ol7-java17-22.3.2-b1 +FROM ghcr.io/graalvm/graalvm-ce:ol7-java17-22.3.3-b1 RUN gu install native-image && \ yum update -y && \ diff --git a/java-shared-config/.cloudbuild/graalvm22_3_jdk17.yaml b/java-shared-config/.cloudbuild/graalvm22_3_jdk17.yaml index 62d3f8871d2f..e447328815d5 100644 --- a/java-shared-config/.cloudbuild/graalvm22_3_jdk17.yaml +++ b/java-shared-config/.cloudbuild/graalvm22_3_jdk17.yaml @@ -17,7 +17,7 @@ commandTests: - name: "version" command: ["java", "-version"] # java -version outputs to stderr... - expectedError: ["openjdk version \"17.0.7\"", "GraalVM CE 22.3.2"] + expectedError: ["openjdk version \"17.0.8\"", "GraalVM CE 22.3.3"] - name: "maven" command: ["mvn", "-version"] expectedOutput: ["Apache Maven 3.9.4"] diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2411c64da1fd..ec6377c3783e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -65,7 +65,7 @@ true 1.10.4 3.2.1 - 22.3.2 + 22.3.3 /java/docs/reference/ From 5f4a17741f00a785dd40a599406d90fb08c71f87 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 30 Oct 2023 19:33:29 +0000 Subject: [PATCH 535/794] chore: update downstream tests to graalvm 22.3.3 (#704) * chore: update graalvm version to 22.3.3 in container images --- java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg | 2 +- java-shared-config/.kokoro/presubmit/graalvm-native.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg b/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg index fa90a8cdb77c..360dc0170b98 100644 --- a/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg +++ b/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.2" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3" } env_vars: { diff --git a/java-shared-config/.kokoro/presubmit/graalvm-native.cfg b/java-shared-config/.kokoro/presubmit/graalvm-native.cfg index a6dcd5522232..f11a36cb911d 100644 --- a/java-shared-config/.kokoro/presubmit/graalvm-native.cfg +++ b/java-shared-config/.kokoro/presubmit/graalvm-native.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.2" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3" } env_vars: { From 8d773c6628917f5fc6dd4537d6e6d1d3d388d107 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 08:25:56 -0400 Subject: [PATCH 536/794] chore: bump urllib3 from 1.26.17 to 1.26.18 in /synthtool/gcp/templates/java_library/.kokoro (#1885) (#699) Source-Link: https://github.com/googleapis/synthtool/commit/e4a9d44f7d1ddda567c14bce7df4d93fdb010de0 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:4875b2142cb4325542ba4f3175a81921c4b2b8256db012b220e3ca9637b34154 Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 4 ++-- java-shared-config/.kokoro/requirements.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index cd91b662b949..8058621d830f 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:d0a8eb7ffc63ddce4c63191373d6e99d5385516423c396de207dedf2b6db7427 -# created: 2023-10-17T17:33:29.360983119Z + digest: sha256:4875b2142cb4325542ba4f3175a81921c4b2b8256db012b220e3ca9637b34154 +# created: 2023-10-24T01:51:42.863726766Z diff --git a/java-shared-config/.kokoro/requirements.txt b/java-shared-config/.kokoro/requirements.txt index 59de49234092..c5c11bbe7925 100644 --- a/java-shared-config/.kokoro/requirements.txt +++ b/java-shared-config/.kokoro/requirements.txt @@ -470,9 +470,9 @@ typing-extensions==4.7.1 \ --hash=sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36 \ --hash=sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2 # via -r requirements.in -urllib3==1.26.17 \ - --hash=sha256:24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21 \ - --hash=sha256:94a757d178c9be92ef5539b8840d48dc9cf1b2709c9d6b588232a055c524458b +urllib3==1.26.18 \ + --hash=sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07 \ + --hash=sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0 # via # google-auth # requests From 721deb1426ef010b76eae5a17ad1c416ad6c78d7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 09:39:43 -0400 Subject: [PATCH 537/794] chore(main): release 1.6.1 (#694) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 9 +++++++++ java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 0302c540ec54..fe1b8b964961 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [1.6.1](https://github.com/googleapis/java-shared-config/compare/v1.6.0...v1.6.1) (2023-10-31) + + +### Dependencies + +* Update actions/checkout digest to b4ffde6 ([#696](https://github.com/googleapis/java-shared-config/issues/696)) ([6d69223](https://github.com/googleapis/java-shared-config/commit/6d692231d80049b7b88f24c1c6a0fe8eaa19c76f)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.12.4 ([#665](https://github.com/googleapis/java-shared-config/issues/665)) ([6018b84](https://github.com/googleapis/java-shared-config/commit/6018b84b8da88d5022d064c5d950cbacbf3deab2)) +* Update graal-sdk to 22.3.3 ([#703](https://github.com/googleapis/java-shared-config/issues/703)) ([05c3057](https://github.com/googleapis/java-shared-config/commit/05c30571d61bba3e232584bdb5e941519e32f68a)) + ## [1.6.0](https://github.com/googleapis/java-shared-config/compare/v1.5.8...v1.6.0) (2023-10-17) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index ec6377c3783e..2944d6ca796e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.6.1-SNAPSHOT + 1.6.1 Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index d7432c297889..3c5ec87f256b 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.6.0:1.6.1-SNAPSHOT +google-cloud-shared-config:1.6.1:1.6.1 From 4762fc39550c50f5ce8854e66fc6dbe0c03b35a5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 10:44:36 -0400 Subject: [PATCH 538/794] chore(main): release 1.6.2-SNAPSHOT (#705) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 2944d6ca796e..6faab751ed11 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.6.1 + 1.6.2-SNAPSHOT Google Cloud https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 3c5ec87f256b..57cf723849a1 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.6.1:1.6.1 +google-cloud-shared-config:1.6.1:1.6.2-SNAPSHOT From 162c3346edf6edb5b259346ab8d1bcfaef278edc Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Wed, 15 Nov 2023 22:31:35 +0000 Subject: [PATCH 539/794] chore: add downstream testing for showcase tests (#709) * chore: add downstream testing for showcase tests --- .../.kokoro/presubmit/downstream-build.sh | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/java-shared-config/.kokoro/presubmit/downstream-build.sh b/java-shared-config/.kokoro/presubmit/downstream-build.sh index 6019e3a55273..ddba85a995a0 100755 --- a/java-shared-config/.kokoro/presubmit/downstream-build.sh +++ b/java-shared-config/.kokoro/presubmit/downstream-build.sh @@ -44,13 +44,41 @@ mkdir -p "${HOME}/.m2" cp settings.xml "${HOME}/.m2" ### Round 2 +git clone "https://github.com/googleapis/sdk-platform-java" --depth=1 + +# Update the shared-config version in showcase +pushd sdk-platform-java/showcase +modify_shared_config +popd + +pushd sdk-platform-java +mvn -B -ntp install --projects '!gapic-generator-java' -Dcheckstyle.skip -Dfmt.skip -DskipTests +popd +pushd sdk-platform-java/showcase/gapic-showcase +SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout) +popd + +## Start showcase server +mkdir -p /usr/src/showcase +curl --location https://github.com/googleapis/gapic-showcase/releases/download/v"${SHOWCASE_VERSION}"/gapic-showcase-"${SHOWCASE_VERSION}"-linux-amd64.tar.gz --output /usr/src/showcase/showcase-"${SHOWCASE_VERSION}"-linux-amd64.tar.gz +pushd /usr/src/showcase/ +tar -xf showcase-* +./gapic-showcase run & +popd + +# Run showcase tests with `native` profile +pushd sdk-platform-java/showcase +mvn test -Pnative,-showcase -Denforcer.skip=true -ntp -B +popd + + +### Round 3 # Update the shared-config version in google-cloud-jar-parent git clone "https://github.com/googleapis/google-cloud-java.git" --depth=1 pushd google-cloud-java/google-cloud-pom-parent modify_shared_config popd -### Round 3 # Run the updated java-shared-config against google-cloud-java pushd google-cloud-java source ./.kokoro/common.sh From 6c0326bcc824bfd35656d4237a38bf3cda1020f0 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Thu, 30 Nov 2023 00:27:52 +0000 Subject: [PATCH 540/794] chore: remove graalvm kokoro github status (#713) * chore: remove graalvm kokoro github status and unused cfgs --- .../.github/sync-repo-settings.yaml | 2 - .../.kokoro/presubmit/graalvm-native-17.cfg | 47 ------------------- .../.kokoro/presubmit/graalvm-native.cfg | 47 ------------------- 3 files changed, 96 deletions(-) delete mode 100644 java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg delete mode 100644 java-shared-config/.kokoro/presubmit/graalvm-native.cfg diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index c7db364836f6..e6662ac08701 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -34,8 +34,6 @@ branchProtectionRules: - "units (8)" - "units (11)" - "Kokoro - Test: Integration" - - "Kokoro - Test: Java GraalVM Native Image" - - "Kokoro - Test: Java 17 GraalVM Native Image" - "Kokoro - Test: Docker Image Validation" - "dependencies (11, java-bigquery)" - "dependencies (11, java-spanner)" diff --git a/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg b/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg deleted file mode 100644 index 360dc0170b98..000000000000 --- a/java-shared-config/.kokoro/presubmit/graalvm-native-17.cfg +++ /dev/null @@ -1,47 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3" -} - -env_vars: { - key: "JOB_TYPE" - value: "graalvm17" -} - -# Format: //devtools/kokoro/config/proto/build.proto -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-shared-config/.kokoro/presubmit/downstream-build.sh" -} - - # TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "cloud-java-ci-test" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "cloud-java-ci-test" -} - - env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/cloud-java-ci-it-service-account" - } - - env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "cloud-java-ci-it-service-account" - } - - # Defines the google-cloud-java modules to be tested downstream tested with GraalVM native image - # builds. - env_vars: { - key: "MODULES_UNDER_TEST" - value: "java-os-login,java-kms" # KMS's ITKmsTest exercises gax-java's native image - # reflect-config.json. OS Login has a similar issue. -} \ No newline at end of file diff --git a/java-shared-config/.kokoro/presubmit/graalvm-native.cfg b/java-shared-config/.kokoro/presubmit/graalvm-native.cfg deleted file mode 100644 index f11a36cb911d..000000000000 --- a/java-shared-config/.kokoro/presubmit/graalvm-native.cfg +++ /dev/null @@ -1,47 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3" -} - -env_vars: { - key: "JOB_TYPE" - value: "graalvm" -} - -# Format: //devtools/kokoro/config/proto/build.proto -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-shared-config/.kokoro/presubmit/downstream-build.sh" -} - - # TODO: remove this after we've migrated all tests and scripts -env_vars: { - key: "GCLOUD_PROJECT" - value: "cloud-java-ci-test" -} - -env_vars: { - key: "GOOGLE_CLOUD_PROJECT" - value: "cloud-java-ci-test" -} - - env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "secret_manager/cloud-java-ci-it-service-account" - } - - env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "cloud-java-ci-it-service-account" - } - - # Defines the google-cloud-java modules to be tested downstream tested with GraalVM native image - # builds. - env_vars: { - key: "MODULES_UNDER_TEST" - value: "java-os-login,java-kms" # KMS's ITKmsTest exercises gax-java's native image - # reflect-config.json. OS Login has a similar issue. -} From f7488c017bb349fe180b759cb8f240048aeb8f4e Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Thu, 30 Nov 2023 00:34:35 +0000 Subject: [PATCH 541/794] feat: separate native-image-shared-config into its own module (#712) * feat: separate out native image shared configs into their own artifact --- ...lient-library-check-javadoc-with-doclet.sh | 2 +- .../.kokoro/client-library-check.sh | 2 +- .../.kokoro/verify-docker-images.sh | 2 + .../java-shared-config/java.header | 15 + .../java-shared-config/license-checks.xml | 10 + java-shared-config/java-shared-config/pom.xml | 749 +++++++++++++++ .../native-image-shared-config/pom.xml | 141 +++ java-shared-config/pom.xml | 859 +----------------- 8 files changed, 955 insertions(+), 825 deletions(-) create mode 100644 java-shared-config/java-shared-config/java.header create mode 100644 java-shared-config/java-shared-config/license-checks.xml create mode 100644 java-shared-config/java-shared-config/pom.xml create mode 100644 java-shared-config/native-image-shared-config/pom.xml diff --git a/java-shared-config/.kokoro/client-library-check-javadoc-with-doclet.sh b/java-shared-config/.kokoro/client-library-check-javadoc-with-doclet.sh index 79963d10b8df..de6db6268b9b 100755 --- a/java-shared-config/.kokoro/client-library-check-javadoc-with-doclet.sh +++ b/java-shared-config/.kokoro/client-library-check-javadoc-with-doclet.sh @@ -8,7 +8,7 @@ set -x mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q # Read the current version of this BOM in the POM. Example version: '0.116.1-alpha-SNAPSHOT' -VERSION_POM=pom.xml +VERSION_POM=java-shared-config/pom.xml # Namespace (xmlns) prevents xmllint from specifying tag names in XPath VERSION=`sed -e 's/xmlns=".*"//' ${VERSION_POM} | xmllint --xpath '/project/version/text()' -` diff --git a/java-shared-config/.kokoro/client-library-check.sh b/java-shared-config/.kokoro/client-library-check.sh index bbc8470ec59b..52cc52984e5c 100755 --- a/java-shared-config/.kokoro/client-library-check.sh +++ b/java-shared-config/.kokoro/client-library-check.sh @@ -40,7 +40,7 @@ cd ${scriptDir}/.. mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q # Read the current version of this BOM in the POM. Example version: '0.116.1-alpha-SNAPSHOT' -VERSION_POM=pom.xml +VERSION_POM=java-shared-config/pom.xml # Namespace (xmlns) prevents xmllint from specifying tag names in XPath VERSION=`sed -e 's/xmlns=".*"//' ${VERSION_POM} | xmllint --xpath '/project/version/text()' -` diff --git a/java-shared-config/.kokoro/verify-docker-images.sh b/java-shared-config/.kokoro/verify-docker-images.sh index b9ac3da73f15..54e39b2d6c05 100755 --- a/java-shared-config/.kokoro/verify-docker-images.sh +++ b/java-shared-config/.kokoro/verify-docker-images.sh @@ -21,7 +21,9 @@ scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")") cd ${scriptDir}/.. || exit # Fetch the java-shared-config version in source of the current commit. +pushd java-shared-config javaSharedConfigVersion="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" +popd branchName=$(git name-rev "${KOKORO_GIT_COMMIT}" | sed 's/.* //') gitCommitMessage=$(git log -1 "$(git rev-parse --short "${KOKORO_GIT_COMMIT}")" | grep "chore(main): release *") diff --git a/java-shared-config/java-shared-config/java.header b/java-shared-config/java-shared-config/java.header new file mode 100644 index 000000000000..d0970ba7d375 --- /dev/null +++ b/java-shared-config/java-shared-config/java.header @@ -0,0 +1,15 @@ +^/\*$ +^ \* Copyright \d\d\d\d,? Google (Inc\.|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$ +^ \*$ +^ \*[ ]+https?://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\.$ +^ \*/$ diff --git a/java-shared-config/java-shared-config/license-checks.xml b/java-shared-config/java-shared-config/license-checks.xml new file mode 100644 index 000000000000..6597fced808e --- /dev/null +++ b/java-shared-config/java-shared-config/license-checks.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml new file mode 100644 index 000000000000..aacc4a295baa --- /dev/null +++ b/java-shared-config/java-shared-config/pom.xml @@ -0,0 +1,749 @@ + + + 4.0.0 + com.google.cloud + google-cloud-shared-config + pom + 1.6.2-SNAPSHOT + Google Cloud Shared Config + https://github.com/googleapis/java-shared-config + + Shared build configuration for Google Cloud Java libraries. + + + + com.google.cloud + native-image-shared-config + 1.6.2-SNAPSHOT + ../native-image-shared-config + + + + UTF-8 + + ${project.artifactId} + false + true + 1.10.4 + /java/docs/reference/ + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://google.oss.sonatype.org/ + false + 15 + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.version} + + + + **/*SmokeTest.java + **/IT*.java + + sponge_log + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.4.1 + + + org.codehaus.mojo + extra-enforcer-rules + 1.7.0 + + + + + org.codehaus.mojo + exec-maven-plugin + 3.1.0 + + + -1 + + + + org.apache.maven.plugins + maven-failsafe-plugin + + ${surefire.version} + + 3600 + sponge_log + + **/IT*.java + **/*SmokeTest.java + + + + + org.apache.maven.surefire + surefire-junit47 + ${surefire.version} + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + true + true + + true + true + + + ${project.artifactId} + ${project.groupId} + ${project.version} + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 1.8 + 1.8 + UTF-8 + -Xlint:unchecked + -Xlint:deprecation + true + + + + org.apache.maven.plugins + maven-site-plugin + 3.12.1 + + true + + + + org.jacoco + jacoco-maven-plugin + 0.8.11 + + + org.apache.maven.plugins + maven-dependency-plugin + 3.5.0 + + + javax.annotation:javax.annotation-api + + + + + io.grpc:* + + com.google.protobuf:* + + com.google.api.grpc:* + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.4.0 + + + org.codehaus.mojo + clirr-maven-plugin + 2.8 + + + com.coveo + fmt-maven-plugin + 2.9 + + + true + + + + com.google.googlejavaformat + google-java-format + 1.7 + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.3.0 + + + + flatten + process-resources + + flatten + + + + + flatten.clean + clean + + clean + + + + + oss + all + + remove + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce + + enforce + + + + + [3.0,) + + + [1.7,) + + + + + compile + provided + + true + true + + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + + java + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-test + verify + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + org.apache.maven.plugins + maven-site-plugin + + + org.jacoco + jacoco-maven-plugin + + + + prepare-agent + + + + report + test + + report + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-main-proto-resources + generate-resources + + add-resource + + + + + src/main/proto + + + + + + add-test-proto-resources + generate-test-resources + + add-test-resource + + + + + src/test/proto + + + + + + + + org.codehaus.mojo + clirr-maven-plugin + + clirr-ignored-differences.xml + true + + + + + check + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.23 + + + java8 + + check + + + + org.codehaus.mojo.signature + java18 + 1.0 + + + + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.4.5 + + + + index + dependency-info + team + ci-management + issue-management + licenses + scm + dependency-management + distribution-management + summary + modules + + + + + true + ${site.installationModule} + jar + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + html + + javadoc + aggregate + aggregate-jar + + + + + none + protected + true + ${project.build.directory}/javadoc + + + Test helpers packages + com.google.cloud.testing + + + SPI packages + com.google.cloud.spi* + + + + + https://googleapis.dev/java/api-common/ + https://googleapis.dev/java/gax/ + https://googleapis.dev/java/google-auth-library/ + + https://developers.google.com/protocol-buffers/docs/reference/java/ + https://googleapis.github.io/common-protos-java/apidocs/ + https://grpc.io/grpc-java/javadoc/ + + + + + org.apache.maven.plugins + maven-jxr-plugin + 3.3.1 + + true + + + + aggregate + ${report.jxr.inherited} + + jxr + aggregate + + + + + + + + + + + + com.google.auto.value + auto-value-annotations + ${auto-value.version} + + + + + + + release + + + performRelease + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + attach-javadocs + + jar + + + none + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + + + + allow-snapshots + + + sonatype-snapshots + https://google.oss.sonatype.org/content/repositories/snapshots + + false + + + true + + + + + + + checkstyle-tests + + [1.11,) + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + + com.puppycrawl.tools + checkstyle + 10.12.4 + + + + + checkstyle + validate + + check + + + java.header + license-checks.xml + true + true + error + true + true + + + src/main + + + src/test + + + + + + + + + + + enable-integration-tests + + false + + + + + + docFX + + + + docFX + + + + + java-docfx-doclet-1.9.0 + ${env.KOKORO_GFILE_DIR}/${docletName}.jar + ${project.build.directory}/docfx-yml + ${project.artifactId} + + + 8 + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + com.microsoft.doclet.DocFxDoclet + false + + -outputpath ${outputpath} + -projectname ${projectname} + -excludeclasses ${excludeclasses}: + -excludepackages ${excludePackages}: + + none + protected + true + ${source} + + ${sourceFileExclude} + + + + + + + + + autovalue-java8 + + [1.8,) + + ${basedir}/EnableAutoValue.txt + + + + + + maven-compiler-plugin + + + + com.google.auto.value + auto-value + ${auto-value.version} + + + + com.google.auto.service + auto-service-annotations + 1.1.1 + + + + + + + + + + + compiler-release-8 + + [9,] + + + 8 + + + + diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml new file mode 100644 index 000000000000..9dac34bc220f --- /dev/null +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -0,0 +1,141 @@ + + + 4.0.0 + com.google.cloud + native-image-shared-config + pom + 1.6.2-SNAPSHOT + Native Image Shared Config + https://github.com/googleapis/java-shared-config + + Native Image build configuration for Google Cloud Java libraries. + + + + chingor13 + Jeff Ching + chingor@google.com + Google + + Developer + + + + + Google LLC + + + scm:git:git@github.com:googleapis/java-shared-config.git + scm:git:git@github.com:googleapis/java-shared-config.git + + https://github.com/googleapis/java-shared-config + HEAD + + + + https://github.com/googleapis/java-shared-config/issues + GitHub Issues + + + + + sonatype-nexus-snapshots + https://google.oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-staging + https://google.oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + + 3.2.1 + 22.3.3 + + + + + + org.graalvm.sdk + graal-sdk + ${graal-sdk.version} + + + + + + + + native + + + + org.opentest4j + opentest4j + 1.3.0 + + + org.junit.vintage + junit-vintage-engine + 5.9.3 + test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.version} + + + org.junit.vintage + junit-vintage-engine + 5.9.3 + + + + + + + **/IT*.java + + **/*ClientTest.java + + + + + org.graalvm.buildtools + native-maven-plugin + 0.9.23 + true + + + test-native + + test + + test + + + + + --no-fallback + --no-server + + + + + + + + diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 6faab751ed11..524af717adb7 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -1,44 +1,34 @@ - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.google.cloud - google-cloud-shared-config + google-cloud-shared-config-parent pom - 1.6.2-SNAPSHOT - Google Cloud - https://github.com/googleapis/java-shared-config - Shared build configuration for Google Cloud Java libraries. + Shared build configuration for Google Cloud Java libraries (Parent) - - - chingor13 - Jeff Ching - chingor@google.com - Google - - Developer - - - - - Google LLC - - - scm:git:git@github.com:googleapis/java-shared-config.git - scm:git:git@github.com:googleapis/java-shared-config.git - - https://github.com/googleapis/java-shared-config - HEAD - + + 0.1.0-SNAPSHOT - - https://github.com/googleapis/java-shared-config/issues - GitHub Issues - + + native-image-shared-config + java-shared-config + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.1 + + true + + + + sonatype-nexus-snapshots @@ -50,810 +40,33 @@ - - - Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - - - - - UTF-8 - - ${project.artifactId} - false - true - 1.10.4 - 3.2.1 - 22.3.3 - /java/docs/reference/ - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true - - ossrh - https://google.oss.sonatype.org/ - false - 15 - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - - - **/*SmokeTest.java - **/IT*.java - - sponge_log - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.4.1 - - - org.codehaus.mojo - extra-enforcer-rules - 1.7.0 - - - - - org.codehaus.mojo - exec-maven-plugin - 3.1.0 - - - -1 - - - - org.apache.maven.plugins - maven-failsafe-plugin - - ${surefire.version} - - 3600 - sponge_log - - **/IT*.java - **/*SmokeTest.java - - - - - org.apache.maven.surefire - surefire-junit47 - ${surefire.version} - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.3.0 - - - true - true - - true - true - - - ${project.artifactId} - ${project.groupId} - ${project.version} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - 1.8 - 1.8 - UTF-8 - -Xlint:unchecked - -Xlint:deprecation - true - - - - org.apache.maven.plugins - maven-site-plugin - 3.12.1 - - true - - - - org.jacoco - jacoco-maven-plugin - 0.8.11 - - - org.apache.maven.plugins - maven-dependency-plugin - 3.5.0 - - - javax.annotation:javax.annotation-api - - - - - io.grpc:* - - com.google.protobuf:* - - com.google.api.grpc:* - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.4.0 - - - org.codehaus.mojo - clirr-maven-plugin - 2.8 - - - com.coveo - fmt-maven-plugin - 2.9 - - - true - - - - com.google.googlejavaformat - google-java-format - 1.7 - - - - - org.codehaus.mojo - flatten-maven-plugin - 1.3.0 - - - - flatten - process-resources - - flatten - - - - - flatten.clean - clean - - clean - - - - - oss - all - - remove - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce - - enforce - - - - - [3.0,) - - - [1.7,) - - - - - compile - provided - - true - true - - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - - java - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.sonatype.plugins - nexus-staging-maven-plugin - - - org.apache.maven.plugins - maven-site-plugin - - - org.jacoco - jacoco-maven-plugin - - - - prepare-agent - - - - report - test - - report - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-main-proto-resources - generate-resources - - add-resource - - - - - src/main/proto - - - - - - add-test-proto-resources - generate-test-resources - - add-test-resource - - - - - src/test/proto - - - - - - - - org.codehaus.mojo - clirr-maven-plugin - - clirr-ignored-differences.xml - true - - - - - check - - - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.23 - - - java8 - - check - - - - org.codehaus.mojo.signature - java18 - 1.0 - - - - - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.4.5 - - - - index - dependency-info - team - ci-management - issue-management - licenses - scm - dependency-management - distribution-management - summary - modules - - - - - true - ${site.installationModule} - jar - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - - html - - javadoc - aggregate - aggregate-jar - - - - - none - protected - true - ${project.build.directory}/javadoc - - - Test helpers packages - com.google.cloud.testing - - - SPI packages - com.google.cloud.spi* - - - - - https://googleapis.dev/java/api-common/ - https://googleapis.dev/java/gax/ - https://googleapis.dev/java/google-auth-library/ - - https://developers.google.com/protocol-buffers/docs/reference/java/ - https://googleapis.github.io/common-protos-java/apidocs/ - https://grpc.io/grpc-java/javadoc/ - - - - - org.apache.maven.plugins - maven-jxr-plugin - 3.3.1 - - true - - - - aggregate - ${report.jxr.inherited} - - jxr - aggregate - - - - - - - - - - - - com.google.auto.value - auto-value-annotations - ${auto-value.version} - - - - org.graalvm.sdk - graal-sdk - ${graal-sdk.version} - - - - - release + + release-staging-repository - performRelease + + !gpg.executable - org.apache.maven.plugins - maven-source-plugin - 3.3.0 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - - attach-javadocs - - jar - - - none - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.1.0 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - - - - allow-snapshots - - - sonatype-snapshots - https://google.oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - - - - checkstyle-tests - - [1.11,) - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.3.1 - - - com.puppycrawl.tools - checkstyle - 10.12.4 - - - - - checkstyle - validate - - check - - - java.header - license-checks.xml - true - true - error - true - true - - - src/main - - - src/test - - - - - - - - - - - enable-integration-tests - - false - - - - - - docFX - - - - docFX - - - - - java-docfx-doclet-1.9.0 - ${env.KOKORO_GFILE_DIR}/${docletName}.jar - ${project.build.directory}/docfx-yml - ${project.artifactId} - - - 8 - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - com.microsoft.doclet.DocFxDoclet - false - - -outputpath ${outputpath} - -projectname ${projectname} - -excludeclasses ${excludeclasses}: - -excludepackages ${excludePackages}: - - none - protected - true - ${source} - - ${sourceFileExclude} - - - - - - - - - autovalue-java8 - - [1.8,) - - ${basedir}/EnableAutoValue.txt - - - - - - maven-compiler-plugin - - - - com.google.auto.value - auto-value - ${auto-value.version} - - - - com.google.auto.service - auto-service-annotations - 1.1.1 - - - - - - - - - - - native - - - - org.opentest4j - opentest4j - 1.3.0 - - - org.junit.vintage - junit-vintage-engine - 5.9.3 - test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.junit.vintage - junit-vintage-engine - 5.9.3 - - - - - - - **/IT*.java - - **/*ClientTest.java - - - - - - org.graalvm.buildtools - native-maven-plugin - 0.9.23 + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 true - - - test-native - - test - - test - - - - --no-fallback - --no-server - + sonatype-nexus-staging + https://google.oss.sonatype.org/ + false - - - - compiler-release-8 - - [9,] - - - 8 - - - + + \ No newline at end of file From 89df2a5d63d9c6ac78c8956e600c403d10aa220b Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 4 Dec 2023 18:59:26 +0000 Subject: [PATCH 542/794] chore: remove docker validation check (#718) --- .../.kokoro/presubmit/graalvm-docker.cfg | 12 ----- .../.kokoro/verify-docker-images.sh | 47 ------------------- 2 files changed, 59 deletions(-) delete mode 100644 java-shared-config/.kokoro/presubmit/graalvm-docker.cfg delete mode 100755 java-shared-config/.kokoro/verify-docker-images.sh diff --git a/java-shared-config/.kokoro/presubmit/graalvm-docker.cfg b/java-shared-config/.kokoro/presubmit/graalvm-docker.cfg deleted file mode 100644 index 63d5b09071d3..000000000000 --- a/java-shared-config/.kokoro/presubmit/graalvm-docker.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-shared-config/.kokoro/verify-docker-images.sh" -} \ No newline at end of file diff --git a/java-shared-config/.kokoro/verify-docker-images.sh b/java-shared-config/.kokoro/verify-docker-images.sh deleted file mode 100755 index 54e39b2d6c05..000000000000 --- a/java-shared-config/.kokoro/verify-docker-images.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -# Script to verify the presence of GraalVM docker test images tagged with the latest java-shared-config version. - -set -o pipefail - -# Output commands executed. -set -x - -function fetch_image_names() { - imageNames="$(grep " - gcr.io/cloud-devrel-public-resources/" .cloudbuild/cloudbuild.yaml | cut -d "/" -f 3 | cut -d ":" -f 1)" - export imageNames - echo "$imageNames" -} - -git config --global --add safe.directory /tmpfs/src/github/java-shared-config - -# Get the directory of the build script -scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")") -# cd to the parent directory, i.e. the root of the git repo -cd ${scriptDir}/.. || exit - -# Fetch the java-shared-config version in source of the current commit. -pushd java-shared-config -javaSharedConfigVersion="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" -popd - -branchName=$(git name-rev "${KOKORO_GIT_COMMIT}" | sed 's/.* //') -gitCommitMessage=$(git log -1 "$(git rev-parse --short "${KOKORO_GIT_COMMIT}")" | grep "chore(main): release *") - -# GraalVM docker images are not tagged with SNAPSHOT versions. -if [[ "${branchName}" == *"release-please--branches--main"* ]] && [[ ! $gitCommitMessage =~ "SNAPSHOT" ]]; then - imageNames=$(fetch_image_names) - for name in $imageNames; do - fullContainerName="gcr.io/cloud-devrel-public-resources/${name}:${javaSharedConfigVersion}" - echo "Verifying presence of ${fullContainerName}." - gcloud container images describe "${fullContainerName}" > /dev/null; exit_status=$? - if [[ $exit_status = 0 ]]; then - echo "Success. Found $fullContainerName." - else - exit $exit_status - fi - done -else - echo "Skipping check for non-release and SNAPSHOT update branches" - exit 0 -fi From b451c816e1d2c4651e93358f4b5de1810a4f4f48 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 16:16:37 -0500 Subject: [PATCH 543/794] chore(main): release 1.7.0 (#716) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index fe1b8b964961..70b0d703d77f 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.7.0](https://github.com/googleapis/java-shared-config/compare/v1.6.1...v1.7.0) (2023-12-04) + + +### Features + +* Separate native-image-shared-config into its own module ([#712](https://github.com/googleapis/java-shared-config/issues/712)) ([567fecb](https://github.com/googleapis/java-shared-config/commit/567fecb2fd80bd6e2fe509e4c2a97685f35e2b84)) + ## [1.6.1](https://github.com/googleapis/java-shared-config/compare/v1.6.0...v1.6.1) (2023-10-31) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index aacc4a295baa..2bc24ed005cf 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.6.2-SNAPSHOT + 1.7.0 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.6.2-SNAPSHOT + 1.7.0 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 9dac34bc220f..540b35245e69 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.6.2-SNAPSHOT + 1.7.0 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 57cf723849a1..50a7860607c0 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.6.1:1.6.2-SNAPSHOT +google-cloud-shared-config:1.7.0:1.7.0 From 970c05c6ba396e01e9f2d020ff9cb3dae7ec83d8 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 4 Dec 2023 22:33:41 +0000 Subject: [PATCH 544/794] chore: update graalvm docker image for 1.7.0 release (#720) * chore: update graalvm docker image for 1.7.0 release --- java-shared-config/.cloudbuild/cloudbuild-test.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/.github/release-please.yml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test.yaml b/java-shared-config/.cloudbuild/cloudbuild-test.yaml index c39919eeab71..26ab676afff9 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.6.1' + _JAVA_SHARED_CONFIG_VERSION: '1.7.0' # {x-version-update:google-cloud-shared-config:released} _GRAALVM_A: 'graalvm22_3_jdk11' _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 618601ec1b97..bea0e73fa21c 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.6.1' + _JAVA_SHARED_CONFIG_VERSION: '1.7.0' # {x-version-update:google-cloud-shared-config:released} _GRAALVM_A: 'graalvm22_3_jdk11' _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/.github/release-please.yml b/java-shared-config/.github/release-please.yml index 7190cc4c4872..b498ed442bee 100644 --- a/java-shared-config/.github/release-please.yml +++ b/java-shared-config/.github/release-please.yml @@ -1,5 +1,6 @@ releaseType: java-yoshi handleGHRelease: true +extraFiles: [".cloudbuild/cloudbuild.yaml", ".cloudbuild/cloudbuild-test.yaml"] branches: - bumpMinorPreMajor: true handleGHRelease: true From 3001b768595df01a7d195cac2c79a8c902cc862f Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Tue, 5 Dec 2023 17:20:33 +0000 Subject: [PATCH 545/794] chore: add downstream check for native image tests in cloud build (#715) * chore: add dowsntream check for native image tests in cloud build --- ...build-test.yaml => cloudbuild-test-a.yaml} | 17 +++------- .../.cloudbuild/cloudbuild-test-b.yaml | 34 +++++++++++++++++++ .../.kokoro/presubmit/downstream-build.sh | 25 ++------------ 3 files changed, 41 insertions(+), 35 deletions(-) rename java-shared-config/.cloudbuild/{cloudbuild-test.yaml => cloudbuild-test-a.yaml} (69%) create mode 100644 java-shared-config/.cloudbuild/cloudbuild-test-b.yaml diff --git a/java-shared-config/.cloudbuild/cloudbuild-test.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml similarity index 69% rename from java-shared-config/.cloudbuild/cloudbuild-test.yaml rename to java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 26ab676afff9..e91ed177af68 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -16,7 +16,7 @@ timeout: 7200s # 2 hours substitutions: _JAVA_SHARED_CONFIG_VERSION: '1.7.0' # {x-version-update:google-cloud-shared-config:released} _GRAALVM_A: 'graalvm22_3_jdk11' - _GRAALVM_B: 'graalvm22_3_jdk17' + steps: # GraalVM A build - name: gcr.io/cloud-builders/docker @@ -28,15 +28,8 @@ steps: args: ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_A}.yaml", "-v"] waitFor: ["graalvm-a-build"] + - name: gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION} + entrypoint: bash + args: [ './.kokoro/presubmit/downstream-build.sh' ] + waitFor: [ "graalvm-a-build" ] - - # GraalVM B build - - name: gcr.io/cloud-builders/docker - args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "${_GRAALVM_B}.Dockerfile", "."] - dir: .cloudbuild - id: graalvm-b-build - waitFor: ["-"] - - name: gcr.io/gcp-runtimes/structure_test - args: - ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_B}.yaml", "-v"] - waitFor: ["graalvm-b-build"] diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml new file mode 100644 index 000000000000..c0ad6c3600f2 --- /dev/null +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -0,0 +1,34 @@ +# Copyright 2023 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. + +timeout: 7200s # 2 hours +substitutions: + _JAVA_SHARED_CONFIG_VERSION: '1.7.0' # {x-version-update:google-cloud-shared-config:released} + _GRAALVM_B: 'graalvm22_3_jdk17' + +steps: + # GraalVM B build + - name: gcr.io/cloud-builders/docker + args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "${_GRAALVM_B}.Dockerfile", "."] + dir: .cloudbuild + id: graalvm-b-build + waitFor: ["-"] + - name: gcr.io/gcp-runtimes/structure_test + args: + ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/${_GRAALVM_B}.yaml", "-v"] + waitFor: ["graalvm-b-build"] + - name: gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION} + entrypoint: bash + args: [ './.kokoro/presubmit/downstream-build.sh' ] + waitFor: [ "graalvm-b-build" ] \ No newline at end of file diff --git a/java-shared-config/.kokoro/presubmit/downstream-build.sh b/java-shared-config/.kokoro/presubmit/downstream-build.sh index ddba85a995a0..710bfd4e2a69 100755 --- a/java-shared-config/.kokoro/presubmit/downstream-build.sh +++ b/java-shared-config/.kokoro/presubmit/downstream-build.sh @@ -14,6 +14,7 @@ # limitations under the License. set -eo pipefail +set -x function modify_shared_config() { @@ -26,18 +27,13 @@ function modify_shared_config() { EOF } -if [ -z "${MODULES_UNDER_TEST}" ]; then - echo "MODULES_UNDER_TEST must be set to run downstream-build.sh" - exit 1 -fi - ### Round 1 ## Get the directory of the build script and install java-shared-config scriptDir=$(realpath "$(dirname "${BASH_SOURCE[0]}")") ## cd to the parent directory, i.e. the root of the git repo cd "${scriptDir}/../.." mvn -B -ntp install -Dcheckstyle.skip -Dfmt.skip -DskipTests -SHARED_CONFIG_VERSION=$(sed -e 's/xmlns=".*"//' pom.xml | xmllint --xpath '/project/version/text()' -) +SHARED_CONFIG_VERSION=$(sed -e 's/xmlns=".*"//' java-shared-config/pom.xml | xmllint --xpath '/project/version/text()' -) # Use GCP Maven Mirror mkdir -p "${HOME}/.m2" @@ -71,21 +67,4 @@ pushd sdk-platform-java/showcase mvn test -Pnative,-showcase -Denforcer.skip=true -ntp -B popd - -### Round 3 -# Update the shared-config version in google-cloud-jar-parent -git clone "https://github.com/googleapis/google-cloud-java.git" --depth=1 -pushd google-cloud-java/google-cloud-pom-parent -modify_shared_config -popd - -# Run the updated java-shared-config against google-cloud-java -pushd google-cloud-java -source ./.kokoro/common.sh -RETURN_CODE=0 -setup_application_credentials -setup_cloud "$MODULES_UNDER_TEST" -run_graalvm_tests "$MODULES_UNDER_TEST" - - exit $RETURN_CODE \ No newline at end of file From 6279607f4bedd4a71de6fdabe9228c59fbcef9ef Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 16:25:14 -0500 Subject: [PATCH 546/794] ci: Update ci.yaml to introduce Java 21 unit testing (#1907) (#717) Source-Link: https://github.com/googleapis/synthtool/commit/c06d605503f34e91c9d7dfee8f5287d58b5988ae Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:6f431774e11cc46619cf093fd1481193c4024031073697fa18f0099b943aab88 Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 4 ++-- java-shared-config/.github/workflows/ci.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 8058621d830f..d304652e1c44 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:4875b2142cb4325542ba4f3175a81921c4b2b8256db012b220e3ca9637b34154 -# created: 2023-10-24T01:51:42.863726766Z + digest: sha256:6f431774e11cc46619cf093fd1481193c4024031073697fa18f0099b943aab88 +# created: 2023-12-01T19:50:20.444857406Z diff --git a/java-shared-config/.github/workflows/ci.yaml b/java-shared-config/.github/workflows/ci.yaml index e27b2c57563c..ae66b1973b17 100644 --- a/java-shared-config/.github/workflows/ci.yaml +++ b/java-shared-config/.github/workflows/ci.yaml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - java: [11, 17] + java: [11, 17, 21] steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 From 9687387c3963c67dc0de14ae1f06878bfe096d00 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Thu, 7 Dec 2023 17:08:09 +0000 Subject: [PATCH 547/794] fix: move release configs to native-image-shared-config (#725) * fix: move release configs to native-image-shared-config --- java-shared-config/java-shared-config/pom.xml | 77 ----------------- .../native-image-shared-config/pom.xml | 85 +++++++++++++++++++ 2 files changed, 85 insertions(+), 77 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 2bc24ed005cf..8f6dd930ba3d 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -33,18 +33,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true - - ossrh - https://google.oss.sonatype.org/ - false - 15 - - org.apache.maven.plugins maven-surefire-plugin @@ -301,10 +289,6 @@ org.apache.maven.plugins maven-compiler-plugin - - org.sonatype.plugins - nexus-staging-maven-plugin - org.apache.maven.plugins maven-site-plugin @@ -506,67 +490,6 @@ - - release - - - performRelease - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.0 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - - attach-javadocs - - jar - - - none - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.1.0 - - - sign-artifacts - verify - - sign - - - - --pinentry-mode - loopback - - - - - - - - allow-snapshots diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 540b35245e69..6ae89b76bf54 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -72,7 +72,92 @@ + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.13 + true + + ossrh + https://google.oss.sonatype.org/ + false + 15 + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + + + release + + + performRelease + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + attach-javadocs + + jar + + + none + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + + native From fb72ef81a8a492b064085b0f4ff33f032a375fa6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 12:14:59 -0500 Subject: [PATCH 548/794] chore(main): release 1.7.1-SNAPSHOT (#719) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 8f6dd930ba3d..4f909069dd82 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.0 + 1.7.1-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.0 + 1.7.1-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 6ae89b76bf54..c1b416cb7966 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.0 + 1.7.1-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 50a7860607c0..e401d2e73e78 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.0:1.7.0 +google-cloud-shared-config:1.7.0:1.7.1-SNAPSHOT From ed5f5a42450ccf955c437dcb707d63f81c04bfd1 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Thu, 7 Dec 2023 18:25:40 +0000 Subject: [PATCH 549/794] chore: update release-please.yml to include cloudbuild test yamls (#728) --- java-shared-config/.github/release-please.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/.github/release-please.yml b/java-shared-config/.github/release-please.yml index b498ed442bee..bebea50cfe92 100644 --- a/java-shared-config/.github/release-please.yml +++ b/java-shared-config/.github/release-please.yml @@ -1,6 +1,6 @@ releaseType: java-yoshi handleGHRelease: true -extraFiles: [".cloudbuild/cloudbuild.yaml", ".cloudbuild/cloudbuild-test.yaml"] +extraFiles: [".cloudbuild/cloudbuild.yaml", ".cloudbuild/cloudbuild-test-a.yaml", ".cloudbuild/cloudbuild-test-b.yaml" ] branches: - bumpMinorPreMajor: true handleGHRelease: true From 42fc3e1a755a554ba1623c11d98e659b9cfb07bf Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 16:46:37 -0500 Subject: [PATCH 550/794] chore(main): release 1.7.1 (#727) * chore(main): release 1.7.1 --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index e91ed177af68..6054d06340e4 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.0' # {x-version-update:google-cloud-shared-config:released} + _JAVA_SHARED_CONFIG_VERSION: '1.7.1' # {x-version-update:google-cloud-shared-config:released} _GRAALVM_A: 'graalvm22_3_jdk11' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index c0ad6c3600f2..259a62a8d673 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.0' # {x-version-update:google-cloud-shared-config:released} + _JAVA_SHARED_CONFIG_VERSION: '1.7.1' # {x-version-update:google-cloud-shared-config:released} _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index bea0e73fa21c..bbcbba638fae 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.0' # {x-version-update:google-cloud-shared-config:released} + _JAVA_SHARED_CONFIG_VERSION: '1.7.1' # {x-version-update:google-cloud-shared-config:released} _GRAALVM_A: 'graalvm22_3_jdk11' _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 70b0d703d77f..a52a804d7707 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.7.1](https://github.com/googleapis/java-shared-config/compare/v1.7.0...v1.7.1) (2023-12-07) + + +### Bug Fixes + +* Move release configs to native-image-shared-config ([#725](https://github.com/googleapis/java-shared-config/issues/725)) ([58ffb4e](https://github.com/googleapis/java-shared-config/commit/58ffb4e8218ac98b516e01b68b34b54b4cecec98)) + ## [1.7.0](https://github.com/googleapis/java-shared-config/compare/v1.6.1...v1.7.0) (2023-12-04) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 4f909069dd82..720dc430fb4b 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.1-SNAPSHOT + 1.7.1 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.1-SNAPSHOT + 1.7.1 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index c1b416cb7966..a4250d62fe1a 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.1-SNAPSHOT + 1.7.1 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index e401d2e73e78..0635362755f7 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.0:1.7.1-SNAPSHOT +google-cloud-shared-config:1.7.1:1.7.1 From be00886f38eae11d69cca13a10c843e98841cd39 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Thu, 7 Dec 2023 22:28:31 +0000 Subject: [PATCH 551/794] chore: update tagging of images in test yamls to current version (#729) --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 6054d06340e4..d62a1a928f44 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.1' # {x-version-update:google-cloud-shared-config:released} + _JAVA_SHARED_CONFIG_VERSION: '1.7.1' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 259a62a8d673..715889e4224b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.1' # {x-version-update:google-cloud-shared-config:released} + _JAVA_SHARED_CONFIG_VERSION: '1.7.1' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_B: 'graalvm22_3_jdk17' steps: From 220381978a496435442a35098d461157de1e74a6 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 18:37:01 -0500 Subject: [PATCH 552/794] chore(main): release 1.7.2-SNAPSHOT (#731) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index d62a1a928f44..277573551a11 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 715889e4224b..1bce50e82bc4 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 720dc430fb4b..bba365f3197f 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.1 + 1.7.2-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.1 + 1.7.2-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index a4250d62fe1a..9ab5d47a762c 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.1 + 1.7.2-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 0635362755f7..509d28367eca 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.1:1.7.1 +google-cloud-shared-config:1.7.1:1.7.2-SNAPSHOT From 32932d69a31813ccbb0fb541305d8f7fdcce8ee4 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Dec 2023 00:37:37 +0100 Subject: [PATCH 553/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.28 (#647) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 9ab5d47a762c..e40e8c6384f0 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -201,7 +201,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.23 + 0.9.28 true From c5d1aa9bbca95bb2c195fd8621e95bb22c928ace Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Tue, 13 Feb 2024 19:38:35 +0000 Subject: [PATCH 554/794] chore: use sdk-platform-java-config in downstream checks for spanner and pubsub; update junit-vintage to 5.10.2 (#746) * chore: use sdk-platform-java-config in downstream checks for spanner and pubsub --- .../.kokoro/client-library-check.sh | 83 ++++++++++++++++--- .../native-image-shared-config/pom.xml | 4 +- 2 files changed, 74 insertions(+), 13 deletions(-) diff --git a/java-shared-config/.kokoro/client-library-check.sh b/java-shared-config/.kokoro/client-library-check.sh index 52cc52984e5c..03bdeab0728b 100755 --- a/java-shared-config/.kokoro/client-library-check.sh +++ b/java-shared-config/.kokoro/client-library-check.sh @@ -21,6 +21,55 @@ set -eo pipefail # Display commands being run. set -x +function get_current_version_from_versions_txt() { + versions=$1 + key=$2 + version=$(grep "$key:" "${versions}" | cut -d: -f3) # 3rd field is current + echo "${version}" +} + +function get_released_version_from_versions_txt() { + versions=$1 + key=$2 + version=$(grep "$key:" "${versions}" | cut -d: -f2) # 2nd field is release + echo "${version}" +} + +function replace_java_shared_config_version() { + version=$1 + # replace version + xmllint --shell <(cat pom.xml) << EOF + setns x=http://maven.apache.org/POM/4.0.0 + cd .//x:artifactId[text()="google-cloud-shared-config"] + cd ../x:version + set ${version} + save pom.xml +EOF +} + +function replace_java_shared_dependencies_version() { + version=$1 + # replace version + xmllint --shell <(cat pom.xml) << EOF + setns x=http://maven.apache.org/POM/4.0.0 + cd .//x:properties/x:google-cloud-shared-dependencies.version + set ${version} + save pom.xml +EOF +} + +function replace_sdk_platform_java_config_version() { + version=$1 + # replace version + xmllint --shell <(cat pom.xml) << EOF + setns x=http://maven.apache.org/POM/4.0.0 + cd .//x:artifactId[text()="sdk-platform-java-config"] + cd ../x:version + set ${version} + save pom.xml +EOF +} + if [[ $# -ne 2 ]]; then echo "Usage: $0 " @@ -42,13 +91,26 @@ mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=tr # Read the current version of this BOM in the POM. Example version: '0.116.1-alpha-SNAPSHOT' VERSION_POM=java-shared-config/pom.xml # Namespace (xmlns) prevents xmllint from specifying tag names in XPath -VERSION=`sed -e 's/xmlns=".*"//' ${VERSION_POM} | xmllint --xpath '/project/version/text()' -` +JAVA_SHARED_CONFIG_VERSION=`sed -e 's/xmlns=".*"//' ${VERSION_POM} | xmllint --xpath '/project/version/text()' -` -if [ -z "${VERSION}" ]; then +if [ -z "${JAVA_SHARED_CONFIG_VERSION}" ]; then echo "Version is not found in ${VERSION_POM}" exit 1 fi -echo "Version: ${VERSION}" +echo "Version: ${JAVA_SHARED_CONFIG_VERSION}" + +# Update java-shared-config in sdk-platform-java-config +git clone "https://github.com/googleapis/sdk-platform-java.git" --depth=1 +pushd sdk-platform-java +SDK_PLATFORM_JAVA_CONFIG_VERSION=$(get_current_version_from_versions_txt versions.txt "google-cloud-shared-dependencies") +RELEASED_SHARED_DEPENDENCIES_VERSION=$(get_released_version_from_versions_txt versions.txt "google-cloud-shared-dependencies") +pushd sdk-platform-java-config + +# Use released version of google-cloud-shared-dependencies to avoid verifying SNAPSHOT changes. +replace_java_shared_config_version "${JAVA_SHARED_CONFIG_VERSION}" +replace_java_shared_dependencies_version "${RELEASED_SHARED_DEPENDENCIES_VERSION}" +mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q +popd # Check this BOM against a few java client libraries # java-bigquery @@ -60,14 +122,13 @@ fi pushd ${REPO} -# replace version -xmllint --shell <(cat pom.xml) << EOF -setns x=http://maven.apache.org/POM/4.0.0 -cd .//x:artifactId[text()="google-cloud-shared-config"] -cd ../x:version -set ${VERSION} -save pom.xml -EOF +# TODO(#748): Replace the version of sdk-platform-java-config for all libraries. This logic will no longer +# be needed after the rest of the handwritten libraries are migrated to use this artifact. +if [ "$REPO" == "java-spanner" ] || [ "$REPO" == "java-pubsub" ]; then + replace_sdk_platform_java_config_version "${SDK_PLATFORM_JAVA_CONFIG_VERSION}" +else + replace_java_shared_config_version "${JAVA_SHARED_CONFIG_VERSION}" +fi case ${JOB_TYPE} in dependencies) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index e40e8c6384f0..d3075458c8e2 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -171,7 +171,7 @@ org.junit.vintage junit-vintage-engine - 5.9.3 + 5.10.2 test @@ -185,7 +185,7 @@ org.junit.vintage junit-vintage-engine - 5.9.3 + 5.10.2 From c8d96553b444e89b08671314ccf621d800a615db Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 13 Feb 2024 21:18:10 +0100 Subject: [PATCH 555/794] build(deps): update dependency org.codehaus.mojo:flatten-maven-plugin to v1.6.0 (#595) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index bba365f3197f..b584fb485b55 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -186,7 +186,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.3.0 + 1.6.0 From 33e49653d2feb8b7f4ffe25623db9c31bbb0fdfc Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 13 Feb 2024 21:46:46 +0100 Subject: [PATCH 556/794] deps: update dependency org.junit.vintage:junit-vintage-engine to v5.10.2 (#638) From b0a460d7c69d699e05525cd14b2f94d2c8b7fc63 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Tue, 13 Feb 2024 21:04:32 +0000 Subject: [PATCH 557/794] chore: update java-shared-config version based on current version (#738) --- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index bbcbba638fae..e9c434c2f0cc 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.1' # {x-version-update:google-cloud-shared-config:released} + _JAVA_SHARED_CONFIG_VERSION: '1.7.1' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' _GRAALVM_B: 'graalvm22_3_jdk17' steps: From 6632dd8cc1bc649d4a65d71b16de469617b04b60 Mon Sep 17 00:00:00 2001 From: Alice <65933803+alicejli@users.noreply.github.com> Date: Tue, 13 Feb 2024 16:14:51 -0500 Subject: [PATCH 558/794] fix: update docFX config (#744) * fix: update docFX config * revert version change, handled thru separate PR * add debugging logs * add more debugging logs * remove debugging logs * remove debug logs --- java-shared-config/java-shared-config/pom.xml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index b584fb485b55..f8c44dfdcb74 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -572,14 +572,9 @@ - java-docfx-doclet-1.9.0 - ${env.KOKORO_GFILE_DIR}/${docletName}.jar ${project.build.directory}/docfx-yml ${project.artifactId} - - - 8 - + 17 @@ -592,17 +587,12 @@ false -outputpath ${outputpath} - -projectname ${projectname} - -excludeclasses ${excludeclasses}: - -excludepackages ${excludePackages}: + -projectname ${projectname} none protected true ${source} - - ${sourceFileExclude} - From 82c9b3595d11c2a1decbaf0c0d3f4c342c92fce7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 14 Feb 2024 21:00:36 +0100 Subject: [PATCH 559/794] deps: update actions/github-script action to v7 (#708) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * deps: update actions/github-script action to v7 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot From 26ba6101495545acacc8b509a4dfacb0d371688c Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:40:53 +0000 Subject: [PATCH 560/794] chore: use sdk-platform-java-config for java-bigquery (#754) --- java-shared-config/.kokoro/client-library-check.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.kokoro/client-library-check.sh b/java-shared-config/.kokoro/client-library-check.sh index 03bdeab0728b..33e012d24935 100755 --- a/java-shared-config/.kokoro/client-library-check.sh +++ b/java-shared-config/.kokoro/client-library-check.sh @@ -124,10 +124,10 @@ pushd ${REPO} # TODO(#748): Replace the version of sdk-platform-java-config for all libraries. This logic will no longer # be needed after the rest of the handwritten libraries are migrated to use this artifact. -if [ "$REPO" == "java-spanner" ] || [ "$REPO" == "java-pubsub" ]; then - replace_sdk_platform_java_config_version "${SDK_PLATFORM_JAVA_CONFIG_VERSION}" -else +if [ "$REPO" == "java-storage" ]; then replace_java_shared_config_version "${JAVA_SHARED_CONFIG_VERSION}" +else + replace_sdk_platform_java_config_version "${SDK_PLATFORM_JAVA_CONFIG_VERSION}" fi case ${JOB_TYPE} in From 33eef8b87e87f1b854d33de23e5b81cff9a83394 Mon Sep 17 00:00:00 2001 From: Alice <65933803+alicejli@users.noreply.github.com> Date: Thu, 15 Feb 2024 17:23:54 -0500 Subject: [PATCH 561/794] chore: update doclet test to use updated `sdk-platform-java-config` artifact (#755) * chore: merge doclet test with rest of client-library-checks * add back in separate test * update script and permissions * update script * update permissions * update permissions * update permissions * rename file * update permissions * update script * replace cd with pushd and popd --- .../workflows/downstream-maven-plugins.yaml | 5 +- .../.kokoro/client-library-check-doclet.sh | 140 ++++++++++++++++++ ...lient-library-check-javadoc-with-doclet.sh | 62 -------- 3 files changed, 143 insertions(+), 64 deletions(-) create mode 100755 java-shared-config/.kokoro/client-library-check-doclet.sh delete mode 100755 java-shared-config/.kokoro/client-library-check-javadoc-with-doclet.sh diff --git a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml index 26cca0668b9c..4088864ba58c 100644 --- a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml +++ b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml @@ -23,6 +23,7 @@ jobs: - lint # fmt-maven-plugin and google-java-format - clirr # clirr-maven-plugin - javadoc # maven-javadoc-plugin + - javadoc-with-doclet # test javadoc generation with doclet steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - uses: actions/setup-java@v3 @@ -45,8 +46,8 @@ jobs: - uses: actions/setup-java@v3 with: distribution: temurin - java-version: 11 + java-version: 17 - run: java -version - run: sudo apt-get update -y - run: sudo apt-get install libxml2-utils - - run: .kokoro/client-library-check-javadoc-with-doclet.sh ${{matrix.repo}} + - run: .kokoro/client-library-check-doclet.sh ${{matrix.repo}} diff --git a/java-shared-config/.kokoro/client-library-check-doclet.sh b/java-shared-config/.kokoro/client-library-check-doclet.sh new file mode 100755 index 000000000000..dc50a56d6562 --- /dev/null +++ b/java-shared-config/.kokoro/client-library-check-doclet.sh @@ -0,0 +1,140 @@ +#!/bin/bash +# Copyright 2024 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. + +# Presubmit to ensure the dependencies of the Google Libraries BOM, with the modification of change +# in the PR, pick up the highest versions among transitive dependencies. +# https://maven.apache.org/enforcer/enforcer-rules/requireUpperBoundDeps.html + +set -eo pipefail +# Display commands being run. +set -x + +function get_current_version_from_versions_txt() { + versions=$1 + key=$2 + version=$(grep "$key:" "${versions}" | cut -d: -f3) # 3rd field is current + echo "${version}" +} + +function get_released_version_from_versions_txt() { + versions=$1 + key=$2 + version=$(grep "$key:" "${versions}" | cut -d: -f2) # 2nd field is release + echo "${version}" +} + +function replace_java_shared_config_version() { + version=$1 + # replace version + xmllint --shell <(cat pom.xml) << EOF + setns x=http://maven.apache.org/POM/4.0.0 + cd .//x:artifactId[text()="google-cloud-shared-config"] + cd ../x:version + set ${version} + save pom.xml +EOF +} + +function replace_java_shared_dependencies_version() { + version=$1 + # replace version + xmllint --shell <(cat pom.xml) << EOF + setns x=http://maven.apache.org/POM/4.0.0 + cd .//x:properties/x:google-cloud-shared-dependencies.version + set ${version} + save pom.xml +EOF +} + +function replace_sdk_platform_java_config_version() { + version=$1 + # replace version + xmllint --shell <(cat pom.xml) << EOF + setns x=http://maven.apache.org/POM/4.0.0 + cd .//x:artifactId[text()="sdk-platform-java-config"] + cd ../x:version + set ${version} + save pom.xml +EOF +} +REPO=$1 +# Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +# Make artifacts available for 'mvn validate' at the bottom +mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q + +# Get version of doclet used to generate Cloud RAD for javadoc testing with the doclet below +git clone https://github.com/googleapis/java-docfx-doclet.git +pushd java-docfx-doclet/third_party/docfx-doclet-143274 +git checkout 1.9.0 +mvn package -Dmaven.test.skip=true + +# work from the root directory +popd +docletPath=$(realpath "java-docfx-doclet/third_party/docfx-doclet-143274/target/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies.jar") +echo "This is the doclet path: ${docletPath}" + +# Read the current version of this BOM in the POM. Example version: '0.116.1-alpha-SNAPSHOT' +VERSION_POM=java-shared-config/pom.xml +# Namespace (xmlns) prevents xmllint from specifying tag names in XPath +JAVA_SHARED_CONFIG_VERSION=`sed -e 's/xmlns=".*"//' ${VERSION_POM} | xmllint --xpath '/project/version/text()' -` + +if [ -z "${JAVA_SHARED_CONFIG_VERSION}" ]; then + echo "Version is not found in ${VERSION_POM}" + exit 1 +fi +echo "Version: ${JAVA_SHARED_CONFIG_VERSION}" + +# Update java-shared-config in sdk-platform-java-config +git clone "https://github.com/googleapis/sdk-platform-java.git" --depth=1 +pushd sdk-platform-java +SDK_PLATFORM_JAVA_CONFIG_VERSION=$(get_current_version_from_versions_txt versions.txt "google-cloud-shared-dependencies") +RELEASED_SHARED_DEPENDENCIES_VERSION=$(get_released_version_from_versions_txt versions.txt "google-cloud-shared-dependencies") +echo "This is the SDK_PLATFORM_JAVA_CONFIG_VERSION: ${SDK_PLATFORM_JAVA_CONFIG_VERSION}" +echo "This is the RELEASED_SHARED_DEPENDENCIES_VERSION: ${RELEASED_SHARED_DEPENDENCIES_VERSION}" +pushd sdk-platform-java-config + +# Use released version of google-cloud-shared-dependencies to avoid verifying SNAPSHOT changes. +replace_java_shared_config_version "${JAVA_SHARED_CONFIG_VERSION}" +replace_java_shared_dependencies_version "${RELEASED_SHARED_DEPENDENCIES_VERSION}" +mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q +popd + +# Check javadoc generation with the doclet +git clone "https://github.com/googleapis/${REPO}.git" --depth=1 + +pushd ${REPO} +replace_sdk_platform_java_config_version "${SDK_PLATFORM_JAVA_CONFIG_VERSION}" + +mvn clean -B -ntp \ + -P docFX \ + -DdocletPath="${docletPath}" \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ + -Dcheckstyle.skip=true \ + -Dflatten.skip=true \ + -Danimal.sniffer.skip=true \ + javadoc:aggregate + +RETURN_CODE=$? +if [ "${RETURN_CODE}" == 0 ]; then + echo "Javadocs generated successfully with doclet" +else + echo "Javadoc generation FAILED with doclet" +fi diff --git a/java-shared-config/.kokoro/client-library-check-javadoc-with-doclet.sh b/java-shared-config/.kokoro/client-library-check-javadoc-with-doclet.sh deleted file mode 100755 index de6db6268b9b..000000000000 --- a/java-shared-config/.kokoro/client-library-check-javadoc-with-doclet.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -set -eo pipefail -REPO=$1 -set -x - -# Make artifacts available for 'mvn validate' at the bottom -mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q - -# Read the current version of this BOM in the POM. Example version: '0.116.1-alpha-SNAPSHOT' -VERSION_POM=java-shared-config/pom.xml -# Namespace (xmlns) prevents xmllint from specifying tag names in XPath -VERSION=`sed -e 's/xmlns=".*"//' ${VERSION_POM} | xmllint --xpath '/project/version/text()' -` - -if [ -z "${VERSION}" ]; then - echo "Version is not found in ${VERSION_POM}" - exit 1 -fi -echo "Version: ${VERSION}" - -# Get version of doclet used to generate Cloud RAD -git clone https://github.com/googleapis/java-docfx-doclet.git -cd java-docfx-doclet/third_party/docfx-doclet-143274 -git checkout 1.9.0 -mvn package -Dmaven.test.skip=true - -# work from the root directory -cd ../../../ -docletPath=$(realpath "java-docfx-doclet/third_party/docfx-doclet-143274/target/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies.jar") -echo "This is the doclet path: ${docletPath}" - -# Test with java-bigtable -git clone "https://github.com/googleapis/${REPO}.git" --depth=1 -pushd ${REPO} - -# replace version -xmllint --shell <(cat pom.xml) << EOF -setns x=http://maven.apache.org/POM/4.0.0 -cd .//x:artifactId[text()="google-cloud-shared-config"] -cd ../x:version -set ${VERSION} -save pom.xml -EOF - -mvn clean -B -ntp \ - -P docFX \ - -DdocletPath="${docletPath}" \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ - -Dcheckstyle.skip=true \ - -Dflatten.skip=true \ - -Danimal.sniffer.skip=true \ - javadoc:aggregate - -# go back to the root directory -cd .. -# clean up clones -echo "Removing java-docfx-doclet clone" -rm -rf java-docfx-doclet -echo "Removing java-bigtable clone" -rm -rf ${REPO} \ No newline at end of file From 685a6212d76f4ec3e8de320408e8b936bf409bf9 Mon Sep 17 00:00:00 2001 From: Alice <65933803+alicejli@users.noreply.github.com> Date: Thu, 15 Feb 2024 17:48:49 -0500 Subject: [PATCH 562/794] chore: remove obsolete kokoro release configs (#749) --- .../.kokoro/release/bump_snapshot.cfg | 53 -- .../.kokoro/release/bump_snapshot.sh | 30 -- java-shared-config/.kokoro/release/common.cfg | 49 -- java-shared-config/.kokoro/release/common.sh | 50 -- java-shared-config/.kokoro/release/drop.cfg | 6 - java-shared-config/.kokoro/release/drop.sh | 32 -- .../.kokoro/release/promote.cfg | 6 - java-shared-config/.kokoro/release/promote.sh | 34 -- .../.kokoro/release/publish_javadoc.cfg | 23 - .../.kokoro/release/publish_javadoc.sh | 53 -- .../.kokoro/release/publish_javadoc11.cfg | 30 -- .../.kokoro/release/publish_javadoc11.sh | 63 --- .../.kokoro/release/snapshot.cfg | 6 - .../.kokoro/release/snapshot.sh | 33 -- java-shared-config/.kokoro/release/stage.cfg | 19 - java-shared-config/.kokoro/release/stage.sh | 47 -- java-shared-config/.kokoro/requirements.in | 6 - java-shared-config/.kokoro/requirements.txt | 491 ------------------ java-shared-config/owlbot.py | 4 +- 19 files changed, 3 insertions(+), 1032 deletions(-) delete mode 100644 java-shared-config/.kokoro/release/bump_snapshot.cfg delete mode 100755 java-shared-config/.kokoro/release/bump_snapshot.sh delete mode 100644 java-shared-config/.kokoro/release/common.cfg delete mode 100755 java-shared-config/.kokoro/release/common.sh delete mode 100644 java-shared-config/.kokoro/release/drop.cfg delete mode 100755 java-shared-config/.kokoro/release/drop.sh delete mode 100644 java-shared-config/.kokoro/release/promote.cfg delete mode 100755 java-shared-config/.kokoro/release/promote.sh delete mode 100644 java-shared-config/.kokoro/release/publish_javadoc.cfg delete mode 100755 java-shared-config/.kokoro/release/publish_javadoc.sh delete mode 100644 java-shared-config/.kokoro/release/publish_javadoc11.cfg delete mode 100755 java-shared-config/.kokoro/release/publish_javadoc11.sh delete mode 100644 java-shared-config/.kokoro/release/snapshot.cfg delete mode 100755 java-shared-config/.kokoro/release/snapshot.sh delete mode 100644 java-shared-config/.kokoro/release/stage.cfg delete mode 100755 java-shared-config/.kokoro/release/stage.sh delete mode 100644 java-shared-config/.kokoro/requirements.in delete mode 100644 java-shared-config/.kokoro/requirements.txt diff --git a/java-shared-config/.kokoro/release/bump_snapshot.cfg b/java-shared-config/.kokoro/release/bump_snapshot.cfg deleted file mode 100644 index 87efce51dfa3..000000000000 --- a/java-shared-config/.kokoro/release/bump_snapshot.cfg +++ /dev/null @@ -1,53 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Build logs will be here -action { - define_artifacts { - regex: "**/*sponge_log.xml" - } -} - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "java-shared-config/.kokoro/trampoline.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-shared-config/.kokoro/release/bump_snapshot.sh" -} - -# tokens used by release-please to keep an up-to-date release PR. -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "github-magic-proxy-key-release-please" - } - } -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "github-magic-proxy-token-release-please" - } - } -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "github-magic-proxy-url-release-please" - } - } -} diff --git a/java-shared-config/.kokoro/release/bump_snapshot.sh b/java-shared-config/.kokoro/release/bump_snapshot.sh deleted file mode 100755 index c5d99e7d09f1..000000000000 --- a/java-shared-config/.kokoro/release/bump_snapshot.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# 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. -# You may obtain a copy of the License at -# -# https://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. - -set -eo pipefail - -export NPM_CONFIG_PREFIX=/home/node/.npm-global - -if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then - # Groom the snapshot release PR immediately after publishing a release - npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \ - --repo-url=googleapis/java-shared-config \ - --package-name="google-cloud-shared-config" \ - --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \ - --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \ - --snapshot \ - --release-type=java-auth-yoshi -fi diff --git a/java-shared-config/.kokoro/release/common.cfg b/java-shared-config/.kokoro/release/common.cfg deleted file mode 100644 index 5cf31b784945..000000000000 --- a/java-shared-config/.kokoro/release/common.cfg +++ /dev/null @@ -1,49 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# Download trampoline resources. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" - -# Use the trampoline script to run in docker. -build_file: "java-shared-config/.kokoro/trampoline.sh" - -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 70247 - keyname: "maven-gpg-keyring" - } - } -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 70247 - keyname: "maven-gpg-passphrase" - } - } -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 70247 - keyname: "maven-gpg-pubkeyring" - } - } -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 70247 - keyname: "sonatype-credentials" - } - } -} diff --git a/java-shared-config/.kokoro/release/common.sh b/java-shared-config/.kokoro/release/common.sh deleted file mode 100755 index 7f78ee414faf..000000000000 --- a/java-shared-config/.kokoro/release/common.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# 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. -# 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. - -set -eo pipefail - -# Get secrets from keystore and set and environment variables -setup_environment_secrets() { - export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase) - export GPG_TTY=$(tty) - export GPG_HOMEDIR=/gpg - mkdir $GPG_HOMEDIR - mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GPG_HOMEDIR/pubring.gpg - mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GPG_HOMEDIR/secring.gpg - export SONATYPE_USERNAME=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f1 -d'|') - export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f2 -d'|') -} - -create_settings_xml_file() { - echo " - - - ossrh - ${SONATYPE_USERNAME} - ${SONATYPE_PASSWORD} - - - sonatype-nexus-staging - ${SONATYPE_USERNAME} - ${SONATYPE_PASSWORD} - - - sonatype-nexus-snapshots - ${SONATYPE_USERNAME} - ${SONATYPE_PASSWORD} - - -" > $1 -} \ No newline at end of file diff --git a/java-shared-config/.kokoro/release/drop.cfg b/java-shared-config/.kokoro/release/drop.cfg deleted file mode 100644 index 431f83037dcd..000000000000 --- a/java-shared-config/.kokoro/release/drop.cfg +++ /dev/null @@ -1,6 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-shared-config/.kokoro/release/drop.sh" -} diff --git a/java-shared-config/.kokoro/release/drop.sh b/java-shared-config/.kokoro/release/drop.sh deleted file mode 100755 index 742ec1a88600..000000000000 --- a/java-shared-config/.kokoro/release/drop.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# 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. -# 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. - -set -eo pipefail - -# STAGING_REPOSITORY_ID must be set -if [ -z "${STAGING_REPOSITORY_ID}" ]; then - echo "Missing STAGING_REPOSITORY_ID environment variable" - exit 1 -fi - -source $(dirname "$0")/common.sh -pushd $(dirname "$0")/../../ - -setup_environment_secrets -create_settings_xml_file "settings.xml" - -mvn nexus-staging:drop -B \ - --settings=settings.xml \ - -DstagingRepositoryId=${STAGING_REPOSITORY_ID} diff --git a/java-shared-config/.kokoro/release/promote.cfg b/java-shared-config/.kokoro/release/promote.cfg deleted file mode 100644 index 7ff7c44d5bd9..000000000000 --- a/java-shared-config/.kokoro/release/promote.cfg +++ /dev/null @@ -1,6 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-shared-config/.kokoro/release/promote.sh" -} diff --git a/java-shared-config/.kokoro/release/promote.sh b/java-shared-config/.kokoro/release/promote.sh deleted file mode 100755 index 3cac3d8a97d7..000000000000 --- a/java-shared-config/.kokoro/release/promote.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# 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. -# 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. - -set -eo pipefail - -# STAGING_REPOSITORY_ID must be set -if [ -z "${STAGING_REPOSITORY_ID}" ]; then - echo "Missing STAGING_REPOSITORY_ID environment variable" - exit 1 -fi - -source $(dirname "$0")/common.sh - -pushd $(dirname "$0")/../../ - -setup_environment_secrets -create_settings_xml_file "settings.xml" - -mvn nexus-staging:release -B \ - -DperformRelease=true \ - --settings=settings.xml \ - -DstagingRepositoryId=${STAGING_REPOSITORY_ID} diff --git a/java-shared-config/.kokoro/release/publish_javadoc.cfg b/java-shared-config/.kokoro/release/publish_javadoc.cfg deleted file mode 100644 index 75a531756acf..000000000000 --- a/java-shared-config/.kokoro/release/publish_javadoc.cfg +++ /dev/null @@ -1,23 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/doc-templates/" - -env_vars: { - key: "STAGING_BUCKET" - value: "docs-staging" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-shared-config/.kokoro/release/publish_javadoc.sh" -} - - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "docuploader_service_account" - } - } -} diff --git a/java-shared-config/.kokoro/release/publish_javadoc.sh b/java-shared-config/.kokoro/release/publish_javadoc.sh deleted file mode 100755 index 8a540db17a23..000000000000 --- a/java-shared-config/.kokoro/release/publish_javadoc.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -# 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. -# 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. - -set -eo pipefail - -if [[ -z "${CREDENTIALS}" ]]; then - CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account -fi - -if [[ -z "${STAGING_BUCKET}" ]]; then - echo "Need to set STAGING_BUCKET environment variable" - exit 1 -fi - -# work from the git root directory -pushd $(dirname "$0")/../../ - -# install docuploader package -python3 -m pip install --require-hashes -r .kokoro/requirements.txt - -# compile all packages -mvn clean install -B -q -DskipTests=true - -export NAME=google-cloud-shared-config -export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) - -# build the docs -mvn site -B -q - -pushd target/site/apidocs - -# create metadata -python3 -m docuploader create-metadata \ - --name ${NAME} \ - --version ${VERSION} \ - --language java - -# upload docs -python3 -m docuploader upload . \ - --credentials ${CREDENTIALS} \ - --staging-bucket ${STAGING_BUCKET} diff --git a/java-shared-config/.kokoro/release/publish_javadoc11.cfg b/java-shared-config/.kokoro/release/publish_javadoc11.cfg deleted file mode 100644 index a0609ba19642..000000000000 --- a/java-shared-config/.kokoro/release/publish_javadoc11.cfg +++ /dev/null @@ -1,30 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -# cloud-rad production -env_vars: { - key: "STAGING_BUCKET_V2" - value: "docs-staging-v2" -} - -# Configure the docker image for kokoro-trampoline -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java11" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-shared-config/.kokoro/release/publish_javadoc11.sh" -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "docuploader_service_account" - } - } -} - -# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/ -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx" diff --git a/java-shared-config/.kokoro/release/publish_javadoc11.sh b/java-shared-config/.kokoro/release/publish_javadoc11.sh deleted file mode 100755 index 3dc22d964b0d..000000000000 --- a/java-shared-config/.kokoro/release/publish_javadoc11.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash -# 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. -# 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. - -set -eo pipefail - -if [[ -z "${CREDENTIALS}" ]]; then - CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account -fi - -if [[ -z "${STAGING_BUCKET_V2}" ]]; then - echo "Need to set STAGING_BUCKET_V2 environment variable" - exit 1 -fi - -# work from the git root directory -pushd $(dirname "$0")/../../ - -# install docuploader package -python3 -m pip install --require-hashes -r .kokoro/requirements.txt - -# compile all packages -mvn clean install -B -q -DskipTests=true - -export NAME=google-cloud-shared-config -export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) - -# cloud RAD generation -mvn clean javadoc:aggregate -B -q -P docFX -# include CHANGELOG -cp CHANGELOG.md target/docfx-yml/history.md - -pushd target/docfx-yml - -# create metadata -python3 -m docuploader create-metadata \ - --name ${NAME} \ - --version ${VERSION} \ - --xrefs devsite://java/gax \ - --xrefs devsite://java/google-cloud-core \ - --xrefs devsite://java/api-common \ - --xrefs devsite://java/proto-google-common-protos \ - --xrefs devsite://java/google-api-client \ - --xrefs devsite://java/google-http-client \ - --xrefs devsite://java/protobuf \ - --language java - -# upload yml to production bucket -python3 -m docuploader upload . \ - --credentials ${CREDENTIALS} \ - --staging-bucket ${STAGING_BUCKET_V2} \ - --destination-prefix docfx diff --git a/java-shared-config/.kokoro/release/snapshot.cfg b/java-shared-config/.kokoro/release/snapshot.cfg deleted file mode 100644 index 58304f32127a..000000000000 --- a/java-shared-config/.kokoro/release/snapshot.cfg +++ /dev/null @@ -1,6 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-shared-config/.kokoro/release/snapshot.sh" -} \ No newline at end of file diff --git a/java-shared-config/.kokoro/release/snapshot.sh b/java-shared-config/.kokoro/release/snapshot.sh deleted file mode 100755 index 1f55b77024d8..000000000000 --- a/java-shared-config/.kokoro/release/snapshot.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# 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. -# 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. - -set -eo pipefail - -source $(dirname "$0")/common.sh -MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml -pushd $(dirname "$0")/../../ - -# ensure we're trying to push a snapshot (no-result returns non-zero exit code) -grep SNAPSHOT versions.txt - -setup_environment_secrets -create_settings_xml_file "settings.xml" - -mvn clean deploy -B \ - --settings ${MAVEN_SETTINGS_FILE} \ - -DperformRelease=true \ - -Dgpg.executable=gpg \ - -Dgpg.passphrase=${GPG_PASSPHRASE} \ - -Dgpg.homedir=${GPG_HOMEDIR} diff --git a/java-shared-config/.kokoro/release/stage.cfg b/java-shared-config/.kokoro/release/stage.cfg deleted file mode 100644 index c1a342f6c803..000000000000 --- a/java-shared-config/.kokoro/release/stage.cfg +++ /dev/null @@ -1,19 +0,0 @@ -# Format: //devtools/kokoro/config/proto/build.proto - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-shared-config/.kokoro/release/stage.sh" -} - -# Need to save the properties file -action { - define_artifacts { - regex: "github/java-shared-config/target/nexus-staging/staging/*.properties" - strip_prefix: "github/java-shared-config" - } -} - -env_vars: { - key: "SECRET_MANAGER_KEYS" - value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem" -} diff --git a/java-shared-config/.kokoro/release/stage.sh b/java-shared-config/.kokoro/release/stage.sh deleted file mode 100755 index 61e714d6ba56..000000000000 --- a/java-shared-config/.kokoro/release/stage.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# 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. -# 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. - -set -eo pipefail - -# Start the releasetool reporter -requirementsFile=$(realpath $(dirname "${BASH_SOURCE[0]}")/../requirements.txt) -python3 -m pip install --require-hashes -r $requirementsFile -python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script - -source $(dirname "$0")/common.sh -source $(dirname "$0")/../common.sh -MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml -pushd $(dirname "$0")/../../ - -setup_environment_secrets -create_settings_xml_file "settings.xml" - -# attempt to stage 3 times with exponential backoff (starting with 10 seconds) -retry_with_backoff 3 10 \ - mvn clean deploy -B \ - --settings ${MAVEN_SETTINGS_FILE} \ - -DskipTests=true \ - -Dclirr.skip=true \ - -DperformRelease=true \ - -Dgpg.executable=gpg \ - -Dgpg.passphrase=${GPG_PASSPHRASE} \ - -Dgpg.homedir=${GPG_HOMEDIR} - -if [[ -n "${AUTORELEASE_PR}" ]] -then - mvn nexus-staging:release -B \ - -DperformRelease=true \ - --settings=settings.xml -fi diff --git a/java-shared-config/.kokoro/requirements.in b/java-shared-config/.kokoro/requirements.in deleted file mode 100644 index 2092cc741d9c..000000000000 --- a/java-shared-config/.kokoro/requirements.in +++ /dev/null @@ -1,6 +0,0 @@ -gcp-docuploader -gcp-releasetool>=1.10.5 # required for compatibility with cryptography>=39.x -wheel -setuptools -typing-extensions -click<8.1.0 \ No newline at end of file diff --git a/java-shared-config/.kokoro/requirements.txt b/java-shared-config/.kokoro/requirements.txt deleted file mode 100644 index c5c11bbe7925..000000000000 --- a/java-shared-config/.kokoro/requirements.txt +++ /dev/null @@ -1,491 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile requirements.in --generate-hashes --upgrade -# -attrs==23.1.0 \ - --hash=sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04 \ - --hash=sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015 - # via gcp-releasetool -cachetools==5.3.1 \ - --hash=sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590 \ - --hash=sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b - # via google-auth -certifi==2023.7.22 \ - --hash=sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082 \ - --hash=sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9 - # via requests -cffi==1.15.1 \ - --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \ - --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \ - --hash=sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104 \ - --hash=sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426 \ - --hash=sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405 \ - --hash=sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375 \ - --hash=sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a \ - --hash=sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e \ - --hash=sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc \ - --hash=sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf \ - --hash=sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185 \ - --hash=sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497 \ - --hash=sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3 \ - --hash=sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35 \ - --hash=sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c \ - --hash=sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83 \ - --hash=sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21 \ - --hash=sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca \ - --hash=sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984 \ - --hash=sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac \ - --hash=sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd \ - --hash=sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee \ - --hash=sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a \ - --hash=sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2 \ - --hash=sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192 \ - --hash=sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7 \ - --hash=sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585 \ - --hash=sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f \ - --hash=sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e \ - --hash=sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27 \ - --hash=sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b \ - --hash=sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e \ - --hash=sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e \ - --hash=sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d \ - --hash=sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c \ - --hash=sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415 \ - --hash=sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82 \ - --hash=sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02 \ - --hash=sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314 \ - --hash=sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325 \ - --hash=sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c \ - --hash=sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3 \ - --hash=sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914 \ - --hash=sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045 \ - --hash=sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d \ - --hash=sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9 \ - --hash=sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5 \ - --hash=sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2 \ - --hash=sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c \ - --hash=sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3 \ - --hash=sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2 \ - --hash=sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8 \ - --hash=sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d \ - --hash=sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d \ - --hash=sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9 \ - --hash=sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162 \ - --hash=sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76 \ - --hash=sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4 \ - --hash=sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e \ - --hash=sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9 \ - --hash=sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6 \ - --hash=sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b \ - --hash=sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01 \ - --hash=sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0 - # via cryptography -charset-normalizer==3.2.0 \ - --hash=sha256:04e57ab9fbf9607b77f7d057974694b4f6b142da9ed4a199859d9d4d5c63fe96 \ - --hash=sha256:09393e1b2a9461950b1c9a45d5fd251dc7c6f228acab64da1c9c0165d9c7765c \ - --hash=sha256:0b87549028f680ca955556e3bd57013ab47474c3124dc069faa0b6545b6c9710 \ - --hash=sha256:1000fba1057b92a65daec275aec30586c3de2401ccdcd41f8a5c1e2c87078706 \ - --hash=sha256:1249cbbf3d3b04902ff081ffbb33ce3377fa6e4c7356f759f3cd076cc138d020 \ - --hash=sha256:1920d4ff15ce893210c1f0c0e9d19bfbecb7983c76b33f046c13a8ffbd570252 \ - --hash=sha256:193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad \ - --hash=sha256:1a100c6d595a7f316f1b6f01d20815d916e75ff98c27a01ae817439ea7726329 \ - --hash=sha256:1f30b48dd7fa1474554b0b0f3fdfdd4c13b5c737a3c6284d3cdc424ec0ffff3a \ - --hash=sha256:203f0c8871d5a7987be20c72442488a0b8cfd0f43b7973771640fc593f56321f \ - --hash=sha256:246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6 \ - --hash=sha256:2dee8e57f052ef5353cf608e0b4c871aee320dd1b87d351c28764fc0ca55f9f4 \ - --hash=sha256:2efb1bd13885392adfda4614c33d3b68dee4921fd0ac1d3988f8cbb7d589e72a \ - --hash=sha256:2f4ac36d8e2b4cc1aa71df3dd84ff8efbe3bfb97ac41242fbcfc053c67434f46 \ - --hash=sha256:3170c9399da12c9dc66366e9d14da8bf7147e1e9d9ea566067bbce7bb74bd9c2 \ - --hash=sha256:3b1613dd5aee995ec6d4c69f00378bbd07614702a315a2cf6c1d21461fe17c23 \ - --hash=sha256:3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace \ - --hash=sha256:3bb7fda7260735efe66d5107fb7e6af6a7c04c7fce9b2514e04b7a74b06bf5dd \ - --hash=sha256:41b25eaa7d15909cf3ac4c96088c1f266a9a93ec44f87f1d13d4a0e86c81b982 \ - --hash=sha256:45de3f87179c1823e6d9e32156fb14c1927fcc9aba21433f088fdfb555b77c10 \ - --hash=sha256:46fb8c61d794b78ec7134a715a3e564aafc8f6b5e338417cb19fe9f57a5a9bf2 \ - --hash=sha256:48021783bdf96e3d6de03a6e39a1171ed5bd7e8bb93fc84cc649d11490f87cea \ - --hash=sha256:4957669ef390f0e6719db3613ab3a7631e68424604a7b448f079bee145da6e09 \ - --hash=sha256:5e86d77b090dbddbe78867a0275cb4df08ea195e660f1f7f13435a4649e954e5 \ - --hash=sha256:6339d047dab2780cc6220f46306628e04d9750f02f983ddb37439ca47ced7149 \ - --hash=sha256:681eb3d7e02e3c3655d1b16059fbfb605ac464c834a0c629048a30fad2b27489 \ - --hash=sha256:6c409c0deba34f147f77efaa67b8e4bb83d2f11c8806405f76397ae5b8c0d1c9 \ - --hash=sha256:7095f6fbfaa55defb6b733cfeb14efaae7a29f0b59d8cf213be4e7ca0b857b80 \ - --hash=sha256:70c610f6cbe4b9fce272c407dd9d07e33e6bf7b4aa1b7ffb6f6ded8e634e3592 \ - --hash=sha256:72814c01533f51d68702802d74f77ea026b5ec52793c791e2da806a3844a46c3 \ - --hash=sha256:7a4826ad2bd6b07ca615c74ab91f32f6c96d08f6fcc3902ceeedaec8cdc3bcd6 \ - --hash=sha256:7c70087bfee18a42b4040bb9ec1ca15a08242cf5867c58726530bdf3945672ed \ - --hash=sha256:855eafa5d5a2034b4621c74925d89c5efef61418570e5ef9b37717d9c796419c \ - --hash=sha256:8700f06d0ce6f128de3ccdbc1acaea1ee264d2caa9ca05daaf492fde7c2a7200 \ - --hash=sha256:89f1b185a01fe560bc8ae5f619e924407efca2191b56ce749ec84982fc59a32a \ - --hash=sha256:8b2c760cfc7042b27ebdb4a43a4453bd829a5742503599144d54a032c5dc7e9e \ - --hash=sha256:8c2f5e83493748286002f9369f3e6607c565a6a90425a3a1fef5ae32a36d749d \ - --hash=sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6 \ - --hash=sha256:94aea8eff76ee6d1cdacb07dd2123a68283cb5569e0250feab1240058f53b623 \ - --hash=sha256:95eb302ff792e12aba9a8b8f8474ab229a83c103d74a750ec0bd1c1eea32e669 \ - --hash=sha256:9bd9b3b31adcb054116447ea22caa61a285d92e94d710aa5ec97992ff5eb7cf3 \ - --hash=sha256:9e608aafdb55eb9f255034709e20d5a83b6d60c054df0802fa9c9883d0a937aa \ - --hash=sha256:a103b3a7069b62f5d4890ae1b8f0597618f628b286b03d4bc9195230b154bfa9 \ - --hash=sha256:a386ebe437176aab38c041de1260cd3ea459c6ce5263594399880bbc398225b2 \ - --hash=sha256:a38856a971c602f98472050165cea2cdc97709240373041b69030be15047691f \ - --hash=sha256:a401b4598e5d3f4a9a811f3daf42ee2291790c7f9d74b18d75d6e21dda98a1a1 \ - --hash=sha256:a7647ebdfb9682b7bb97e2a5e7cb6ae735b1c25008a70b906aecca294ee96cf4 \ - --hash=sha256:aaf63899c94de41fe3cf934601b0f7ccb6b428c6e4eeb80da72c58eab077b19a \ - --hash=sha256:b0dac0ff919ba34d4df1b6131f59ce95b08b9065233446be7e459f95554c0dc8 \ - --hash=sha256:baacc6aee0b2ef6f3d308e197b5d7a81c0e70b06beae1f1fcacffdbd124fe0e3 \ - --hash=sha256:bf420121d4c8dce6b889f0e8e4ec0ca34b7f40186203f06a946fa0276ba54029 \ - --hash=sha256:c04a46716adde8d927adb9457bbe39cf473e1e2c2f5d0a16ceb837e5d841ad4f \ - --hash=sha256:c0b21078a4b56965e2b12f247467b234734491897e99c1d51cee628da9786959 \ - --hash=sha256:c1c76a1743432b4b60ab3358c937a3fe1341c828ae6194108a94c69028247f22 \ - --hash=sha256:c4983bf937209c57240cff65906b18bb35e64ae872da6a0db937d7b4af845dd7 \ - --hash=sha256:c4fb39a81950ec280984b3a44f5bd12819953dc5fa3a7e6fa7a80db5ee853952 \ - --hash=sha256:c57921cda3a80d0f2b8aec7e25c8aa14479ea92b5b51b6876d975d925a2ea346 \ - --hash=sha256:c8063cf17b19661471ecbdb3df1c84f24ad2e389e326ccaf89e3fb2484d8dd7e \ - --hash=sha256:ccd16eb18a849fd8dcb23e23380e2f0a354e8daa0c984b8a732d9cfaba3a776d \ - --hash=sha256:cd6dbe0238f7743d0efe563ab46294f54f9bc8f4b9bcf57c3c666cc5bc9d1299 \ - --hash=sha256:d62e51710986674142526ab9f78663ca2b0726066ae26b78b22e0f5e571238dd \ - --hash=sha256:db901e2ac34c931d73054d9797383d0f8009991e723dab15109740a63e7f902a \ - --hash=sha256:e03b8895a6990c9ab2cdcd0f2fe44088ca1c65ae592b8f795c3294af00a461c3 \ - --hash=sha256:e1c8a2f4c69e08e89632defbfabec2feb8a8d99edc9f89ce33c4b9e36ab63037 \ - --hash=sha256:e4b749b9cc6ee664a3300bb3a273c1ca8068c46be705b6c31cf5d276f8628a94 \ - --hash=sha256:e6a5bf2cba5ae1bb80b154ed68a3cfa2fa00fde979a7f50d6598d3e17d9ac20c \ - --hash=sha256:e857a2232ba53ae940d3456f7533ce6ca98b81917d47adc3c7fd55dad8fab858 \ - --hash=sha256:ee4006268ed33370957f55bf2e6f4d263eaf4dc3cfc473d1d90baff6ed36ce4a \ - --hash=sha256:eef9df1eefada2c09a5e7a40991b9fc6ac6ef20b1372abd48d2794a316dc0449 \ - --hash=sha256:f058f6963fd82eb143c692cecdc89e075fa0828db2e5b291070485390b2f1c9c \ - --hash=sha256:f25c229a6ba38a35ae6e25ca1264621cc25d4d38dca2942a7fce0b67a4efe918 \ - --hash=sha256:f2a1d0fd4242bd8643ce6f98927cf9c04540af6efa92323e9d3124f57727bfc1 \ - --hash=sha256:f7560358a6811e52e9c4d142d497f1a6e10103d3a6881f18d04dbce3729c0e2c \ - --hash=sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac \ - --hash=sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa - # via requests -click==8.0.4 \ - --hash=sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1 \ - --hash=sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb - # via - # -r requirements.in - # gcp-docuploader - # gcp-releasetool -colorlog==6.7.0 \ - --hash=sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662 \ - --hash=sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5 - # via gcp-docuploader -cryptography==41.0.2 \ - --hash=sha256:01f1d9e537f9a15b037d5d9ee442b8c22e3ae11ce65ea1f3316a41c78756b711 \ - --hash=sha256:079347de771f9282fbfe0e0236c716686950c19dee1b76240ab09ce1624d76d7 \ - --hash=sha256:182be4171f9332b6741ee818ec27daff9fb00349f706629f5cbf417bd50e66fd \ - --hash=sha256:192255f539d7a89f2102d07d7375b1e0a81f7478925b3bc2e0549ebf739dae0e \ - --hash=sha256:2a034bf7d9ca894720f2ec1d8b7b5832d7e363571828037f9e0c4f18c1b58a58 \ - --hash=sha256:342f3767e25876751e14f8459ad85e77e660537ca0a066e10e75df9c9e9099f0 \ - --hash=sha256:439c3cc4c0d42fa999b83ded80a9a1fb54d53c58d6e59234cfe97f241e6c781d \ - --hash=sha256:49c3222bb8f8e800aead2e376cbef687bc9e3cb9b58b29a261210456a7783d83 \ - --hash=sha256:674b669d5daa64206c38e507808aae49904c988fa0a71c935e7006a3e1e83831 \ - --hash=sha256:7a9a3bced53b7f09da251685224d6a260c3cb291768f54954e28f03ef14e3766 \ - --hash=sha256:7af244b012711a26196450d34f483357e42aeddb04128885d95a69bd8b14b69b \ - --hash=sha256:7d230bf856164de164ecb615ccc14c7fc6de6906ddd5b491f3af90d3514c925c \ - --hash=sha256:84609ade00a6ec59a89729e87a503c6e36af98ddcd566d5f3be52e29ba993182 \ - --hash=sha256:9a6673c1828db6270b76b22cc696f40cde9043eb90373da5c2f8f2158957f42f \ - --hash=sha256:9b6d717393dbae53d4e52684ef4f022444fc1cce3c48c38cb74fca29e1f08eaa \ - --hash=sha256:9c3fe6534d59d071ee82081ca3d71eed3210f76ebd0361798c74abc2bcf347d4 \ - --hash=sha256:a719399b99377b218dac6cf547b6ec54e6ef20207b6165126a280b0ce97e0d2a \ - --hash=sha256:b332cba64d99a70c1e0836902720887fb4529ea49ea7f5462cf6640e095e11d2 \ - --hash=sha256:d124682c7a23c9764e54ca9ab5b308b14b18eba02722b8659fb238546de83a76 \ - --hash=sha256:d73f419a56d74fef257955f51b18d046f3506270a5fd2ac5febbfa259d6c0fa5 \ - --hash=sha256:f0dc40e6f7aa37af01aba07277d3d64d5a03dc66d682097541ec4da03cc140ee \ - --hash=sha256:f14ad275364c8b4e525d018f6716537ae7b6d369c094805cae45300847e0894f \ - --hash=sha256:f772610fe364372de33d76edcd313636a25684edb94cee53fd790195f5989d14 - # via - # gcp-releasetool - # secretstorage -gcp-docuploader==0.6.5 \ - --hash=sha256:30221d4ac3e5a2b9c69aa52fdbef68cc3f27d0e6d0d90e220fc024584b8d2318 \ - --hash=sha256:b7458ef93f605b9d46a4bf3a8dc1755dad1f31d030c8679edf304e343b347eea - # via -r requirements.in -gcp-releasetool==1.16.0 \ - --hash=sha256:27bf19d2e87aaa884096ff941aa3c592c482be3d6a2bfe6f06afafa6af2353e3 \ - --hash=sha256:a316b197a543fd036209d0caba7a8eb4d236d8e65381c80cbc6d7efaa7606d63 - # via -r requirements.in -google-api-core==2.11.1 \ - --hash=sha256:25d29e05a0058ed5f19c61c0a78b1b53adea4d9364b464d014fbda941f6d1c9a \ - --hash=sha256:d92a5a92dc36dd4f4b9ee4e55528a90e432b059f93aee6ad857f9de8cc7ae94a - # via - # google-cloud-core - # google-cloud-storage -google-auth==2.22.0 \ - --hash=sha256:164cba9af4e6e4e40c3a4f90a1a6c12ee56f14c0b4868d1ca91b32826ab334ce \ - --hash=sha256:d61d1b40897407b574da67da1a833bdc10d5a11642566e506565d1b1a46ba873 - # via - # gcp-releasetool - # google-api-core - # google-cloud-core - # google-cloud-storage -google-cloud-core==2.3.3 \ - --hash=sha256:37b80273c8d7eee1ae816b3a20ae43585ea50506cb0e60f3cf5be5f87f1373cb \ - --hash=sha256:fbd11cad3e98a7e5b0343dc07cb1039a5ffd7a5bb96e1f1e27cee4bda4a90863 - # via google-cloud-storage -google-cloud-storage==2.10.0 \ - --hash=sha256:934b31ead5f3994e5360f9ff5750982c5b6b11604dc072bc452c25965e076dc7 \ - --hash=sha256:9433cf28801671de1c80434238fb1e7e4a1ba3087470e90f70c928ea77c2b9d7 - # via gcp-docuploader -google-crc32c==1.5.0 \ - --hash=sha256:024894d9d3cfbc5943f8f230e23950cd4906b2fe004c72e29b209420a1e6b05a \ - --hash=sha256:02c65b9817512edc6a4ae7c7e987fea799d2e0ee40c53ec573a692bee24de876 \ - --hash=sha256:02ebb8bf46c13e36998aeaad1de9b48f4caf545e91d14041270d9dca767b780c \ - --hash=sha256:07eb3c611ce363c51a933bf6bd7f8e3878a51d124acfc89452a75120bc436289 \ - --hash=sha256:1034d91442ead5a95b5aaef90dbfaca8633b0247d1e41621d1e9f9db88c36298 \ - --hash=sha256:116a7c3c616dd14a3de8c64a965828b197e5f2d121fedd2f8c5585c547e87b02 \ - --hash=sha256:19e0a019d2c4dcc5e598cd4a4bc7b008546b0358bd322537c74ad47a5386884f \ - --hash=sha256:1c7abdac90433b09bad6c43a43af253e688c9cfc1c86d332aed13f9a7c7f65e2 \ - --hash=sha256:1e986b206dae4476f41bcec1faa057851f3889503a70e1bdb2378d406223994a \ - --hash=sha256:272d3892a1e1a2dbc39cc5cde96834c236d5327e2122d3aaa19f6614531bb6eb \ - --hash=sha256:278d2ed7c16cfc075c91378c4f47924c0625f5fc84b2d50d921b18b7975bd210 \ - --hash=sha256:2ad40e31093a4af319dadf503b2467ccdc8f67c72e4bcba97f8c10cb078207b5 \ - --hash=sha256:2e920d506ec85eb4ba50cd4228c2bec05642894d4c73c59b3a2fe20346bd00ee \ - --hash=sha256:3359fc442a743e870f4588fcf5dcbc1bf929df1fad8fb9905cd94e5edb02e84c \ - --hash=sha256:37933ec6e693e51a5b07505bd05de57eee12f3e8c32b07da7e73669398e6630a \ - --hash=sha256:398af5e3ba9cf768787eef45c803ff9614cc3e22a5b2f7d7ae116df8b11e3314 \ - --hash=sha256:3b747a674c20a67343cb61d43fdd9207ce5da6a99f629c6e2541aa0e89215bcd \ - --hash=sha256:461665ff58895f508e2866824a47bdee72497b091c730071f2b7575d5762ab65 \ - --hash=sha256:4c6fdd4fccbec90cc8a01fc00773fcd5fa28db683c116ee3cb35cd5da9ef6c37 \ - --hash=sha256:5829b792bf5822fd0a6f6eb34c5f81dd074f01d570ed7f36aa101d6fc7a0a6e4 \ - --hash=sha256:596d1f98fc70232fcb6590c439f43b350cb762fb5d61ce7b0e9db4539654cc13 \ - --hash=sha256:5ae44e10a8e3407dbe138984f21e536583f2bba1be9491239f942c2464ac0894 \ - --hash=sha256:635f5d4dd18758a1fbd1049a8e8d2fee4ffed124462d837d1a02a0e009c3ab31 \ - --hash=sha256:64e52e2b3970bd891309c113b54cf0e4384762c934d5ae56e283f9a0afcd953e \ - --hash=sha256:66741ef4ee08ea0b2cc3c86916ab66b6aef03768525627fd6a1b34968b4e3709 \ - --hash=sha256:67b741654b851abafb7bc625b6d1cdd520a379074e64b6a128e3b688c3c04740 \ - --hash=sha256:6ac08d24c1f16bd2bf5eca8eaf8304812f44af5cfe5062006ec676e7e1d50afc \ - --hash=sha256:6f998db4e71b645350b9ac28a2167e6632c239963ca9da411523bb439c5c514d \ - --hash=sha256:72218785ce41b9cfd2fc1d6a017dc1ff7acfc4c17d01053265c41a2c0cc39b8c \ - --hash=sha256:74dea7751d98034887dbd821b7aae3e1d36eda111d6ca36c206c44478035709c \ - --hash=sha256:759ce4851a4bb15ecabae28f4d2e18983c244eddd767f560165563bf9aefbc8d \ - --hash=sha256:77e2fd3057c9d78e225fa0a2160f96b64a824de17840351b26825b0848022906 \ - --hash=sha256:7c074fece789b5034b9b1404a1f8208fc2d4c6ce9decdd16e8220c5a793e6f61 \ - --hash=sha256:7c42c70cd1d362284289c6273adda4c6af8039a8ae12dc451dcd61cdabb8ab57 \ - --hash=sha256:7f57f14606cd1dd0f0de396e1e53824c371e9544a822648cd76c034d209b559c \ - --hash=sha256:83c681c526a3439b5cf94f7420471705bbf96262f49a6fe546a6db5f687a3d4a \ - --hash=sha256:8485b340a6a9e76c62a7dce3c98e5f102c9219f4cfbf896a00cf48caf078d438 \ - --hash=sha256:84e6e8cd997930fc66d5bb4fde61e2b62ba19d62b7abd7a69920406f9ecca946 \ - --hash=sha256:89284716bc6a5a415d4eaa11b1726d2d60a0cd12aadf5439828353662ede9dd7 \ - --hash=sha256:8b87e1a59c38f275c0e3676fc2ab6d59eccecfd460be267ac360cc31f7bcde96 \ - --hash=sha256:8f24ed114432de109aa9fd317278518a5af2d31ac2ea6b952b2f7782b43da091 \ - --hash=sha256:98cb4d057f285bd80d8778ebc4fde6b4d509ac3f331758fb1528b733215443ae \ - --hash=sha256:998679bf62b7fb599d2878aa3ed06b9ce688b8974893e7223c60db155f26bd8d \ - --hash=sha256:9ba053c5f50430a3fcfd36f75aff9caeba0440b2d076afdb79a318d6ca245f88 \ - --hash=sha256:9c99616c853bb585301df6de07ca2cadad344fd1ada6d62bb30aec05219c45d2 \ - --hash=sha256:a1fd716e7a01f8e717490fbe2e431d2905ab8aa598b9b12f8d10abebb36b04dd \ - --hash=sha256:a2355cba1f4ad8b6988a4ca3feed5bff33f6af2d7f134852cf279c2aebfde541 \ - --hash=sha256:b1f8133c9a275df5613a451e73f36c2aea4fe13c5c8997e22cf355ebd7bd0728 \ - --hash=sha256:b8667b48e7a7ef66afba2c81e1094ef526388d35b873966d8a9a447974ed9178 \ - --hash=sha256:ba1eb1843304b1e5537e1fca632fa894d6f6deca8d6389636ee5b4797affb968 \ - --hash=sha256:be82c3c8cfb15b30f36768797a640e800513793d6ae1724aaaafe5bf86f8f346 \ - --hash=sha256:c02ec1c5856179f171e032a31d6f8bf84e5a75c45c33b2e20a3de353b266ebd8 \ - --hash=sha256:c672d99a345849301784604bfeaeba4db0c7aae50b95be04dd651fd2a7310b93 \ - --hash=sha256:c6c777a480337ac14f38564ac88ae82d4cd238bf293f0a22295b66eb89ffced7 \ - --hash=sha256:cae0274952c079886567f3f4f685bcaf5708f0a23a5f5216fdab71f81a6c0273 \ - --hash=sha256:cd67cf24a553339d5062eff51013780a00d6f97a39ca062781d06b3a73b15462 \ - --hash=sha256:d3515f198eaa2f0ed49f8819d5732d70698c3fa37384146079b3799b97667a94 \ - --hash=sha256:d5280312b9af0976231f9e317c20e4a61cd2f9629b7bfea6a693d1878a264ebd \ - --hash=sha256:de06adc872bcd8c2a4e0dc51250e9e65ef2ca91be023b9d13ebd67c2ba552e1e \ - --hash=sha256:e1674e4307fa3024fc897ca774e9c7562c957af85df55efe2988ed9056dc4e57 \ - --hash=sha256:e2096eddb4e7c7bdae4bd69ad364e55e07b8316653234a56552d9c988bd2d61b \ - --hash=sha256:e560628513ed34759456a416bf86b54b2476c59144a9138165c9a1575801d0d9 \ - --hash=sha256:edfedb64740750e1a3b16152620220f51d58ff1b4abceb339ca92e934775c27a \ - --hash=sha256:f13cae8cc389a440def0c8c52057f37359014ccbc9dc1f0827936bcd367c6100 \ - --hash=sha256:f314013e7dcd5cf45ab1945d92e713eec788166262ae8deb2cfacd53def27325 \ - --hash=sha256:f583edb943cf2e09c60441b910d6a20b4d9d626c75a36c8fcac01a6c96c01183 \ - --hash=sha256:fd8536e902db7e365f49e7d9029283403974ccf29b13fc7028b97e2295b33556 \ - --hash=sha256:fe70e325aa68fa4b5edf7d1a4b6f691eb04bbccac0ace68e34820d283b5f80d4 - # via google-resumable-media -google-resumable-media==2.5.0 \ - --hash=sha256:218931e8e2b2a73a58eb354a288e03a0fd5fb1c4583261ac6e4c078666468c93 \ - --hash=sha256:da1bd943e2e114a56d85d6848497ebf9be6a14d3db23e9fc57581e7c3e8170ec - # via google-cloud-storage -googleapis-common-protos==1.59.1 \ - --hash=sha256:0cbedb6fb68f1c07e18eb4c48256320777707e7d0c55063ae56c15db3224a61e \ - --hash=sha256:b35d530fe825fb4227857bc47ad84c33c809ac96f312e13182bdeaa2abe1178a - # via google-api-core -idna==3.4 \ - --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \ - --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2 - # via requests -importlib-metadata==6.8.0 \ - --hash=sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb \ - --hash=sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743 - # via keyring -jaraco-classes==3.3.0 \ - --hash=sha256:10afa92b6743f25c0cf5f37c6bb6e18e2c5bb84a16527ccfc0040ea377e7aaeb \ - --hash=sha256:c063dd08e89217cee02c8d5e5ec560f2c8ce6cdc2fcdc2e68f7b2e5547ed3621 - # via keyring -jeepney==0.8.0 \ - --hash=sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806 \ - --hash=sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755 - # via - # keyring - # secretstorage -jinja2==3.1.2 \ - --hash=sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 \ - --hash=sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61 - # via gcp-releasetool -keyring==24.2.0 \ - --hash=sha256:4901caaf597bfd3bbd78c9a0c7c4c29fcd8310dab2cffefe749e916b6527acd6 \ - --hash=sha256:ca0746a19ec421219f4d713f848fa297a661a8a8c1504867e55bfb5e09091509 - # via gcp-releasetool -markupsafe==2.1.3 \ - --hash=sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e \ - --hash=sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e \ - --hash=sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431 \ - --hash=sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686 \ - --hash=sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559 \ - --hash=sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc \ - --hash=sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c \ - --hash=sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0 \ - --hash=sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4 \ - --hash=sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9 \ - --hash=sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575 \ - --hash=sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba \ - --hash=sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d \ - --hash=sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3 \ - --hash=sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00 \ - --hash=sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155 \ - --hash=sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac \ - --hash=sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52 \ - --hash=sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f \ - --hash=sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8 \ - --hash=sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b \ - --hash=sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24 \ - --hash=sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea \ - --hash=sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198 \ - --hash=sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0 \ - --hash=sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee \ - --hash=sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be \ - --hash=sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2 \ - --hash=sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707 \ - --hash=sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6 \ - --hash=sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58 \ - --hash=sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779 \ - --hash=sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636 \ - --hash=sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c \ - --hash=sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad \ - --hash=sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee \ - --hash=sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc \ - --hash=sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2 \ - --hash=sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48 \ - --hash=sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7 \ - --hash=sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e \ - --hash=sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b \ - --hash=sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa \ - --hash=sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5 \ - --hash=sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e \ - --hash=sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb \ - --hash=sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9 \ - --hash=sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57 \ - --hash=sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc \ - --hash=sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2 - # via jinja2 -more-itertools==9.1.0 \ - --hash=sha256:cabaa341ad0389ea83c17a94566a53ae4c9d07349861ecb14dc6d0345cf9ac5d \ - --hash=sha256:d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3 - # via jaraco-classes -packaging==23.1 \ - --hash=sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61 \ - --hash=sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f - # via gcp-releasetool -protobuf==3.20.3 \ - --hash=sha256:03038ac1cfbc41aa21f6afcbcd357281d7521b4157926f30ebecc8d4ea59dcb7 \ - --hash=sha256:28545383d61f55b57cf4df63eebd9827754fd2dc25f80c5253f9184235db242c \ - --hash=sha256:2e3427429c9cffebf259491be0af70189607f365c2f41c7c3764af6f337105f2 \ - --hash=sha256:398a9e0c3eaceb34ec1aee71894ca3299605fa8e761544934378bbc6c97de23b \ - --hash=sha256:44246bab5dd4b7fbd3c0c80b6f16686808fab0e4aca819ade6e8d294a29c7050 \ - --hash=sha256:447d43819997825d4e71bf5769d869b968ce96848b6479397e29fc24c4a5dfe9 \ - --hash=sha256:67a3598f0a2dcbc58d02dd1928544e7d88f764b47d4a286202913f0b2801c2e7 \ - --hash=sha256:74480f79a023f90dc6e18febbf7b8bac7508420f2006fabd512013c0c238f454 \ - --hash=sha256:819559cafa1a373b7096a482b504ae8a857c89593cf3a25af743ac9ecbd23480 \ - --hash=sha256:899dc660cd599d7352d6f10d83c95df430a38b410c1b66b407a6b29265d66469 \ - --hash=sha256:8c0c984a1b8fef4086329ff8dd19ac77576b384079247c770f29cc8ce3afa06c \ - --hash=sha256:9aae4406ea63d825636cc11ffb34ad3379335803216ee3a856787bcf5ccc751e \ - --hash=sha256:a7ca6d488aa8ff7f329d4c545b2dbad8ac31464f1d8b1c87ad1346717731e4db \ - --hash=sha256:b6cc7ba72a8850621bfec987cb72623e703b7fe2b9127a161ce61e61558ad905 \ - --hash=sha256:bf01b5720be110540be4286e791db73f84a2b721072a3711efff6c324cdf074b \ - --hash=sha256:c02ce36ec760252242a33967d51c289fd0e1c0e6e5cc9397e2279177716add86 \ - --hash=sha256:d9e4432ff660d67d775c66ac42a67cf2453c27cb4d738fc22cb53b5d84c135d4 \ - --hash=sha256:daa564862dd0d39c00f8086f88700fdbe8bc717e993a21e90711acfed02f2402 \ - --hash=sha256:de78575669dddf6099a8a0f46a27e82a1783c557ccc38ee620ed8cc96d3be7d7 \ - --hash=sha256:e64857f395505ebf3d2569935506ae0dfc4a15cb80dc25261176c784662cdcc4 \ - --hash=sha256:f4bd856d702e5b0d96a00ec6b307b0f51c1982c2bf9c0052cf9019e9a544ba99 \ - --hash=sha256:f4c42102bc82a51108e449cbb32b19b180022941c727bac0cfd50170341f16ee - # via - # gcp-docuploader - # gcp-releasetool - # google-api-core - # googleapis-common-protos -pyasn1==0.5.0 \ - --hash=sha256:87a2121042a1ac9358cabcaf1d07680ff97ee6404333bacca15f76aa8ad01a57 \ - --hash=sha256:97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde - # via - # pyasn1-modules - # rsa -pyasn1-modules==0.3.0 \ - --hash=sha256:5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c \ - --hash=sha256:d3ccd6ed470d9ffbc716be08bd90efbd44d0734bc9303818f7336070984a162d - # via google-auth -pycparser==2.21 \ - --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \ - --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206 - # via cffi -pyjwt==2.7.0 \ - --hash=sha256:ba2b425b15ad5ef12f200dc67dd56af4e26de2331f965c5439994dad075876e1 \ - --hash=sha256:bd6ca4a3c4285c1a2d4349e5a035fdf8fb94e04ccd0fcbe6ba289dae9cc3e074 - # via gcp-releasetool -pyperclip==1.8.2 \ - --hash=sha256:105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57 - # via gcp-releasetool -python-dateutil==2.8.2 \ - --hash=sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86 \ - --hash=sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9 - # via gcp-releasetool -requests==2.31.0 \ - --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \ - --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 - # via - # gcp-releasetool - # google-api-core - # google-cloud-storage -rsa==4.9 \ - --hash=sha256:90260d9058e514786967344d0ef75fa8727eed8a7d2e43ce9f4bcf1b536174f7 \ - --hash=sha256:e38464a49c6c85d7f1351b0126661487a7e0a14a50f1675ec50eb34d4f20ef21 - # via google-auth -secretstorage==3.3.3 \ - --hash=sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77 \ - --hash=sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99 - # via keyring -six==1.16.0 \ - --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ - --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 - # via - # gcp-docuploader - # google-auth - # python-dateutil -typing-extensions==4.7.1 \ - --hash=sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36 \ - --hash=sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2 - # via -r requirements.in -urllib3==1.26.18 \ - --hash=sha256:34b97092d7e0a3a8cf7cd10e386f401b3737364026c45e622aa02903dffe0f07 \ - --hash=sha256:f8ecc1bba5667413457c529ab955bf8c67b45db799d159066261719e328580a0 - # via - # google-auth - # requests -wheel==0.40.0 \ - --hash=sha256:cd1196f3faee2b31968d626e1731c94f99cbdb67cf5a46e4f5656cbee7738873 \ - --hash=sha256:d236b20e7cb522daf2390fa84c55eea81c5c30190f90f29ae2ca1ad8355bf247 - # via -r requirements.in -zipp==3.16.1 \ - --hash=sha256:0b37c326d826d5ca35f2b9685cd750292740774ef16190008b00a0227c256fe0 \ - --hash=sha256:857b158da2cbf427b376da1c24fd11faecbac5a4ac7523c3607f8a01f94c2ec0 - # via importlib-metadata - -# WARNING: The following packages were not pinned, but pip requires them to be -# pinned when the requirements file includes hashes and the requirement is not -# satisfied by a package already installed. Consider using the --allow-unsafe flag. -# setuptools diff --git a/java-shared-config/owlbot.py b/java-shared-config/owlbot.py index 2ed7d600aa59..1a854685ab12 100644 --- a/java-shared-config/owlbot.py +++ b/java-shared-config/owlbot.py @@ -31,6 +31,8 @@ "renovate.json", ".kokoro/presubmit/graalvm-native.cfg", ".kokoro/presubmit/graalvm-native-17.cfg", - ".kokoro/presubmit/common.cfg" + ".kokoro/presubmit/common.cfg", + ".kokoro/requirements.txt", + ".kokoro/requirements.in" ] ) From 3462f1cc3f64e5576d4da2d23cd5f4b9121fdc09 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Fri, 23 Feb 2024 10:28:49 -0500 Subject: [PATCH 563/794] chore: fix storage downstream check to use sdk-platform-java-config artifact (#759) * chore: fix storage downstream check to use sdk-platform-java-config artifact --- java-shared-config/.kokoro/client-library-check.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.kokoro/client-library-check.sh b/java-shared-config/.kokoro/client-library-check.sh index 33e012d24935..e68e80430b48 100755 --- a/java-shared-config/.kokoro/client-library-check.sh +++ b/java-shared-config/.kokoro/client-library-check.sh @@ -111,6 +111,7 @@ replace_java_shared_config_version "${JAVA_SHARED_CONFIG_VERSION}" replace_java_shared_dependencies_version "${RELEASED_SHARED_DEPENDENCIES_VERSION}" mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q popd +popd # Check this BOM against a few java client libraries # java-bigquery @@ -122,9 +123,9 @@ fi pushd ${REPO} -# TODO(#748): Replace the version of sdk-platform-java-config for all libraries. This logic will no longer -# be needed after the rest of the handwritten libraries are migrated to use this artifact. -if [ "$REPO" == "java-storage" ]; then +# If using an older version of java-storage, continue replacing java-shared-config version otherwise replace +# the version of sdk-platform-java-config. +if [ "${REPO_TAG}" == "v2.9.3" ] && [ "${REPO}" == "java-storage" ]; then replace_java_shared_config_version "${JAVA_SHARED_CONFIG_VERSION}" else replace_sdk_platform_java_config_version "${SDK_PLATFORM_JAVA_CONFIG_VERSION}" @@ -137,7 +138,9 @@ dependencies) ;; flatten-plugin) # This creates .flattened-pom.xml + echo "Before running .kokoro/build.sh" .kokoro/build.sh + echo "After running .kokoro/build.sh" pushd google-cloud-* mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true \ | grep '\[INFO] .*:.*:.*:.*:.*' |awk '{print $2}' > .actual-flattened-dependencies-list.txt From e0ce9e332ad7a407d008cc8d44606b18bd4f9d7e Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Fri, 23 Feb 2024 10:36:16 -0500 Subject: [PATCH 564/794] chore: remove Kokoro - Docker Image Validation check (#758) This check is now running in the stage job and is no longer needed in Github. --- java-shared-config/.github/sync-repo-settings.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index e6662ac08701..494a051019e9 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -34,7 +34,6 @@ branchProtectionRules: - "units (8)" - "units (11)" - "Kokoro - Test: Integration" - - "Kokoro - Test: Docker Image Validation" - "dependencies (11, java-bigquery)" - "dependencies (11, java-spanner)" - "dependencies (11, java-storage)" From 663c17d452c2c150a2a157de577160e23b8a4c0e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 26 Feb 2024 18:51:46 +0100 Subject: [PATCH 565/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.6.3 (#706) --- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index f8c44dfdcb74..fc765b186131 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -415,7 +415,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.3 html @@ -581,7 +581,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.3 com.microsoft.doclet.DocFxDoclet false diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index d3075458c8e2..684e7a7d9ebd 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -122,7 +122,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.3 attach-javadocs From cd922ff9b788cb855d57c7994272dc87544008b7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 15:35:43 -0500 Subject: [PATCH 566/794] chore(main): release 1.7.2 (#733) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .../.cloudbuild/cloudbuild-test-a.yaml | 2 +- .../.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 14 ++++++++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- .../native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 277573551a11..6d8e20ae5967 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.2' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 1bce50e82bc4..a9b6bed34903 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.2' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index e9c434c2f0cc..4d51951ab21b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.2' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index a52a804d7707..a3631032634a 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [1.7.2](https://github.com/googleapis/java-shared-config/compare/v1.7.1...v1.7.2) (2024-02-26) + + +### Bug Fixes + +* Update docFX config ([#744](https://github.com/googleapis/java-shared-config/issues/744)) ([096cd22](https://github.com/googleapis/java-shared-config/commit/096cd225e22d39a0d2a03cb0dd5beafedc289454)) + + +### Dependencies + +* Update actions/github-script action to v7 ([#708](https://github.com/googleapis/java-shared-config/issues/708)) ([a4738d1](https://github.com/googleapis/java-shared-config/commit/a4738d13277edd15bb3f5f0cf69f2600cf93c607)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.28 ([#647](https://github.com/googleapis/java-shared-config/issues/647)) ([28b2c77](https://github.com/googleapis/java-shared-config/commit/28b2c77ddd2078d628cb8f2b16fae8efd0e673a5)) +* Update dependency org.junit.vintage:junit-vintage-engine to v5.10.2 ([#638](https://github.com/googleapis/java-shared-config/issues/638)) ([4fa0021](https://github.com/googleapis/java-shared-config/commit/4fa0021ec8d187d9c7c5775f0518aee83059ef65)) + ## [1.7.1](https://github.com/googleapis/java-shared-config/compare/v1.7.0...v1.7.1) (2023-12-07) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index fc765b186131..c455296767f6 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.2-SNAPSHOT + 1.7.2 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.2-SNAPSHOT + 1.7.2 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 684e7a7d9ebd..acc288ae300b 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.2-SNAPSHOT + 1.7.2 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 509d28367eca..a68d898fbc59 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.1:1.7.2-SNAPSHOT +google-cloud-shared-config:1.7.2:1.7.2 From 771f6f2d190d97f7254135f561bdab41001bb55e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 27 Feb 2024 16:47:46 +0100 Subject: [PATCH 567/794] deps: update dependency org.graalvm.sdk:graal-sdk to v22.3.5 (#751) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index acc288ae300b..0c57cba1c2b7 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -59,7 +59,7 @@ 3.2.1 - 22.3.3 + 22.3.5 From 09f7ac88ac89fdd7b4d0136b102ec4374a6680d9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 12:56:29 -0500 Subject: [PATCH 568/794] chore(main): release 1.7.3-SNAPSHOT (#761) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 6d8e20ae5967..3ae0162071fa 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index a9b6bed34903..0a2ea7f58930 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 4d51951ab21b..8bc8d868ff5c 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index c455296767f6..359fc616abb3 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.2 + 1.7.3-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.2 + 1.7.3-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 0c57cba1c2b7..3bbf45e43764 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.2 + 1.7.3-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index a68d898fbc59..496edf9308e8 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.2:1.7.2 +google-cloud-shared-config:1.7.2:1.7.3-SNAPSHOT From 0ff854246908b2e0db9c36e17f3790503acce053 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 13:51:58 -0500 Subject: [PATCH 569/794] chore(main): release 1.7.3 (#764) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 3ae0162071fa..7ea914744b8b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.3' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 0a2ea7f58930..0c79234e9460 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.3' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 8bc8d868ff5c..9ee5122a5dfd 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.3' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index a3631032634a..ff4440dee6ba 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.7.3](https://github.com/googleapis/java-shared-config/compare/v1.7.2...v1.7.3) (2024-02-27) + + +### Dependencies + +* Update dependency org.graalvm.sdk:graal-sdk to v22.3.5 ([#751](https://github.com/googleapis/java-shared-config/issues/751)) ([4d76805](https://github.com/googleapis/java-shared-config/commit/4d7680580f30a26f7e6bb55ed5175948754b25f7)) + ## [1.7.2](https://github.com/googleapis/java-shared-config/compare/v1.7.1...v1.7.2) (2024-02-26) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 359fc616abb3..819e406247e5 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.3-SNAPSHOT + 1.7.3 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.3-SNAPSHOT + 1.7.3 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 3bbf45e43764..e70913ee91e9 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.3-SNAPSHOT + 1.7.3 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 496edf9308e8..054c74344e5c 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.2:1.7.3-SNAPSHOT +google-cloud-shared-config:1.7.3:1.7.3 From de54b5680ab90030f76a3c9ce1bcc06262f5fa64 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 16:59:36 -0500 Subject: [PATCH 570/794] chore(main): release 1.7.4-SNAPSHOT (#765) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 7ea914744b8b..7078877a1643 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.3' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 0c79234e9460..816aa40314e3 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.3' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 9ee5122a5dfd..1c9dbb6c3e38 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.3' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 819e406247e5..3917c7be7527 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.3 + 1.7.4-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.3 + 1.7.4-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index e70913ee91e9..9f0282108577 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.3 + 1.7.4-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 054c74344e5c..d50f4ca676e0 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.3:1.7.3 +google-cloud-shared-config:1.7.3:1.7.4-SNAPSHOT From 52f6bee4e738d0f1286eef5400dcd78930d9c8f7 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 28 Feb 2024 16:00:28 -0500 Subject: [PATCH 571/794] Revert "build(deps): update dependency org.codehaus.mojo:flatten-maven-plugin to v1.6.0 (#595)" (#767) This reverts commit c8d96553b444e89b08671314ccf621d800a615db. --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 3917c7be7527..8d7d71e1dd69 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -186,7 +186,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.6.0 + 1.3.0 From 83f4f8032578006761e2bf09d9c25e18815d2fb1 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 16:42:39 -0500 Subject: [PATCH 572/794] chore(main): release 1.7.4 (#769) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 7078877a1643..a4563c761b4b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.4' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 816aa40314e3..109bc3dc6e67 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.4' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 1c9dbb6c3e38..a254c9c50a89 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.4' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index ff4440dee6ba..1c0044162f2c 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.7.4](https://github.com/googleapis/java-shared-config/compare/v1.7.3...v1.7.4) (2024-02-28) + + +### Bug Fixes + +* **deps:** Revert dependency org.codehaus.mojo:flatten-maven-plugin to v1.3.0 ([2c3e38a](https://github.com/googleapis/java-shared-config/commit/2c3e38a531105b8c3ad5f70d3c17e0ef641ed24b)) + ## [1.7.3](https://github.com/googleapis/java-shared-config/compare/v1.7.2...v1.7.3) (2024-02-27) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 8d7d71e1dd69..52911bc68782 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.4-SNAPSHOT + 1.7.4 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.4-SNAPSHOT + 1.7.4 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 9f0282108577..02881f11ea80 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.4-SNAPSHOT + 1.7.4 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index d50f4ca676e0..810a1e7c5096 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.3:1.7.4-SNAPSHOT +google-cloud-shared-config:1.7.4:1.7.4 From 132045845d8b075ce6145944ed4e83f83573d9e8 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 7 Mar 2024 11:25:41 -0500 Subject: [PATCH 573/794] chore: updating contribution guideline (#757) * chore: updating contribution guideline b/323263307 * exclude CONTRIBUTING.md from templates --- java-shared-config/CONTRIBUTING.md | 7 +++++-- java-shared-config/owlbot.py | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/java-shared-config/CONTRIBUTING.md b/java-shared-config/CONTRIBUTING.md index b65dd279c946..5ea51573c5ec 100644 --- a/java-shared-config/CONTRIBUTING.md +++ b/java-shared-config/CONTRIBUTING.md @@ -1,7 +1,10 @@ # How to Contribute -We'd love to accept your patches and contributions to this project. There are -just a few small guidelines you need to follow. +The code in this repository is only intended to be used as part of the Google Cloud SDK build/test/release infrastructure, and it is not a supported Google product. Please make sure you understand the purpose of this repo before contributing. If you still would like to contribute, please follow the guidelines below before opening an issue or a PR: +1. Ensure the issue was not already reported. +2. Open a new issue if you are unable to find an existing issue addressing your problem. Make sure to include a title and clear description, as much relevant information as possible, and a code sample or an executable test case demonstrating the expected behavior that is not occurring. +3. Discuss the priority and potential solutions with the maintainers in the issue. The maintainers would review the issue and add a label "Accepting Contributions" once the issue is ready for accepting contributions. +4. Open a PR only if the issue is labeled with "Accepting Contributions", ensure the PR description clearly describes the problem and solution. Note that an open PR without an "Accepting Contributions" issue will not be accepted. ## Contributor License Agreement diff --git a/java-shared-config/owlbot.py b/java-shared-config/owlbot.py index 1a854685ab12..8bdec8da0ca7 100644 --- a/java-shared-config/owlbot.py +++ b/java-shared-config/owlbot.py @@ -23,6 +23,7 @@ s.remove_staging_dirs() java.common_templates( excludes=[ + "CONTRIBUTING.md", "README.md", ".github/release-please.yml", ".github/workflows/auto-release.yaml", From 6eaa25fa8677fa65ccf52ad5127b8ab00ca0394e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 15:14:16 +0000 Subject: [PATCH 574/794] chore(main): release 1.7.5-SNAPSHOT (#770) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index a4563c761b4b..04b9abcd5df5 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.4' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 109bc3dc6e67..cde6cbb7d670 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.4' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index a254c9c50a89..53f0e1377bb6 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.4' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _GRAALVM_A: 'graalvm22_3_jdk11' _GRAALVM_B: 'graalvm22_3_jdk17' steps: diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 52911bc68782..6261db2ac233 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.4 + 1.7.5-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.4 + 1.7.5-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 02881f11ea80..6690ee74a234 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.4 + 1.7.5-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 810a1e7c5096..d76c2168e584 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.4:1.7.4 +google-cloud-shared-config:1.7.4:1.7.5-SNAPSHOT From e066ad6fd1c46d66ecae0bb8707689206702320d Mon Sep 17 00:00:00 2001 From: Alice <65933803+alicejli@users.noreply.github.com> Date: Tue, 12 Mar 2024 10:34:35 -0400 Subject: [PATCH 575/794] test: update CI Javadoc testing to include all handwritten libraries (#771) * fix: update DocFX profile with properties * test: see if these changes are needed --- .../.github/workflows/downstream-maven-plugins.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml index 4088864ba58c..e885e2c655f9 100644 --- a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml +++ b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml @@ -41,6 +41,18 @@ jobs: matrix: repo: - java-bigtable + - java-bigquery + - java-storage + - java-storage-nio + - java-spanner + - java-spanner-jdbc + - java-pubsub + - java-pubsublite + - java-logging + - java-logging-logback + - java-firestore + - java-datastore + - java-bigquerystorage steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - uses: actions/setup-java@v3 From b99350f0f85bcc87fcd6e346bbc7af48587196d2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Mar 2024 15:49:38 +0100 Subject: [PATCH 576/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.5.0 (#763) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 6261db2ac233..301fe7b65114 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -388,7 +388,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.4.5 + 3.5.0 From b62838b6a43166e069c088b38b60d599aae9c2e2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Mar 2024 15:50:00 +0100 Subject: [PATCH 577/794] build(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.12.1 (#760) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 301fe7b65114..6032ca44fc4f 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -114,7 +114,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 1.8 1.8 From 907e54680ce343cd0dfd34057d2b033882dd8190 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Mar 2024 15:50:20 +0100 Subject: [PATCH 578/794] deps: update actions/github-script action to v7 (#753) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * deps: update actions/github-script action to v7 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot From 5f1c15a0dfe2b548efef7f24ecad4690157d3bdd Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Mar 2024 15:50:40 +0100 Subject: [PATCH 579/794] build(deps): update dependency org.apache.maven.plugins:maven-jxr-plugin to v3.3.2 (#750) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 6032ca44fc4f..fd9997331b54 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -456,7 +456,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.3.1 + 3.3.2 true From c25fcc411d29523dfc9aff29ab36bd2679e20dc8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Mar 2024 16:04:42 +0100 Subject: [PATCH 580/794] build(deps): update surefire.version to v3.2.5 (#707) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 6690ee74a234..ec3a174b3797 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -58,7 +58,7 @@ - 3.2.1 + 3.2.5 22.3.5 From 3f058f9b7c08f9f1d341307d98944dd4b591191f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Mar 2024 16:22:54 +0100 Subject: [PATCH 581/794] build(deps): update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.0 (#773) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index ec3a174b3797..e772749c5d7a 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -138,7 +138,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.1.0 + 3.2.0 sign-artifacts From ad741bb5e9e48e7374a2c4bffb1da6c9eca810b7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Mar 2024 16:28:38 +0100 Subject: [PATCH 582/794] build(deps): update dependency org.codehaus.mojo:flatten-maven-plugin to v1.6.0 (#772) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index fd9997331b54..86c868eb0ba3 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -186,7 +186,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.3.0 + 1.6.0 From 44a093c94679ced18995abd84cd42323816db2ff Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Mar 2024 16:56:01 +0100 Subject: [PATCH 583/794] build(deps): update dependency org.codehaus.mojo:exec-maven-plugin to v3.2.0 (#732) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 86c868eb0ba3..e5fe3c6dff8f 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -61,7 +61,7 @@ org.codehaus.mojo exec-maven-plugin - 3.1.0 + 3.2.0 + 1.7.5 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.5-SNAPSHOT + 1.7.5 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 8a6b920fa4f9..b0f3d430ee5a 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.5-SNAPSHOT + 1.7.5 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index d76c2168e584..1513c0a0278b 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.4:1.7.5-SNAPSHOT +google-cloud-shared-config:1.7.5:1.7.5 From 35eae0159bcb640cdc2073d0c0257f4b4af7ceb0 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Thu, 14 Mar 2024 14:46:46 -0400 Subject: [PATCH 591/794] chore: ignore flatten-maven-plugin updates temporarily (#786) * chore: ignore flatten-maven-plugin updates temporarily * fix: dependency name. --- java-shared-config/renovate.json | 1 + 1 file changed, 1 insertion(+) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index e0b754bdfeeb..6eb596ac5f0a 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -11,6 +11,7 @@ ":autodetectPinVersions" ], "ignorePaths": [".kokoro/requirements.txt"], + "ignoreDeps": ["org.codehaus.mojo:flatten-maven-plugin"], "packageRules": [ { "packagePatterns": [ From 8b8182ca288f4e8ccbeeaec6d38b9428fe9e27ff Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Thu, 14 Mar 2024 14:56:14 -0400 Subject: [PATCH 592/794] =?UTF-8?q?Revert=20"build(deps):=20update=20depen?= =?UTF-8?q?dency=20org.codehaus.mojo:flatten-maven-plugin=E2=80=A6"=20(#78?= =?UTF-8?q?7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ad741bb5e9e48e7374a2c4bffb1da6c9eca810b7. --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 002cc8e6a0b8..e7ed9f0a4ad8 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -186,7 +186,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.6.0 + 1.3.0 From 5a8d082380b5e2d1139f4bb077639fa8c847f984 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 16:37:57 -0400 Subject: [PATCH 593/794] chore(main): release 1.7.6-SNAPSHOT (#785) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 7c16119744d9..328ad7994675 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.5' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.6-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 558583400431..aae886eb888f 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.5' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.6-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index fd1229edc6e3..75d65330422c 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.5' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.6-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index e7ed9f0a4ad8..40c2eac203e9 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.5 + 1.7.6-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.5 + 1.7.6-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index b0f3d430ee5a..238178a227f8 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.5 + 1.7.6-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 1513c0a0278b..0b13bc3db0c1 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.5:1.7.5 +google-cloud-shared-config:1.7.5:1.7.6-SNAPSHOT From 217a624e8560821c24ba60bd04b4721641dbc7b8 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 17:03:05 -0400 Subject: [PATCH 594/794] chore(main): release 1.7.6 (#788) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 328ad7994675..cbfdcb2c2d2b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.6-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.6' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index aae886eb888f..a2f03ba670c4 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.6-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.6' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 75d65330422c..1f9d6e9f8633 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.6-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.6' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 85058845bdb1..ea445d7fca90 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.7.6](https://github.com/googleapis/java-shared-config/compare/v1.7.5...v1.7.6) (2024-03-14) + + +### Bug Fixes + +* Revert update dependency `org.codehaus.mojo:flatten-maven-plugin` to `v1.6.0` ([597683f](https://github.com/googleapis/java-shared-config/commit/597683fb59047d92c86b728885433163f736590e)) + ## [1.7.5](https://github.com/googleapis/java-shared-config/compare/v1.7.4...v1.7.5) (2024-03-13) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 40c2eac203e9..0a65e55ce1bf 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.6-SNAPSHOT + 1.7.6 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.6-SNAPSHOT + 1.7.6 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 238178a227f8..e99f2dca0bbc 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.6-SNAPSHOT + 1.7.6 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 0b13bc3db0c1..13a433c53d43 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.5:1.7.6-SNAPSHOT +google-cloud-shared-config:1.7.6:1.7.6 From b1bf44d57b822d7bbafa37d7d754913464bb4396 Mon Sep 17 00:00:00 2001 From: Burke Davison <40617934+burkedavison@users.noreply.github.com> Date: Tue, 16 Apr 2024 12:43:36 -0400 Subject: [PATCH 595/794] fix: graalvm image terraform install (#806) * fix: graalvm image terraform install * fix: use modified hashicorp repo configuration --- java-shared-config/.cloudbuild/graalvm-a.Dockerfile | 2 ++ java-shared-config/.cloudbuild/graalvm-b.Dockerfile | 2 ++ java-shared-config/.cloudbuild/hashicorp.repo | 13 +++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 java-shared-config/.cloudbuild/hashicorp.repo diff --git a/java-shared-config/.cloudbuild/graalvm-a.Dockerfile b/java-shared-config/.cloudbuild/graalvm-a.Dockerfile index d0cfee89ab3c..41505aa633db 100644 --- a/java-shared-config/.cloudbuild/graalvm-a.Dockerfile +++ b/java-shared-config/.cloudbuild/graalvm-a.Dockerfile @@ -37,6 +37,8 @@ ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin RUN yum install -y docker-engine docker-cli # Install terraform +# See also https://www.hashicorp.com/official-packaging-guide +COPY hashicorp.repo /etc/yum.repos.d/hashicorp.repo RUN yum -y install terraform # Install jq diff --git a/java-shared-config/.cloudbuild/graalvm-b.Dockerfile b/java-shared-config/.cloudbuild/graalvm-b.Dockerfile index 722e066bdc48..743c53b23103 100644 --- a/java-shared-config/.cloudbuild/graalvm-b.Dockerfile +++ b/java-shared-config/.cloudbuild/graalvm-b.Dockerfile @@ -37,6 +37,8 @@ ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin RUN yum install -y docker-engine docker-cli # Install terraform +# See also https://www.hashicorp.com/official-packaging-guide +COPY hashicorp.repo /etc/yum.repos.d/hashicorp.repo RUN yum -y install terraform # Install jq diff --git a/java-shared-config/.cloudbuild/hashicorp.repo b/java-shared-config/.cloudbuild/hashicorp.repo new file mode 100644 index 000000000000..68ae2f8f9a23 --- /dev/null +++ b/java-shared-config/.cloudbuild/hashicorp.repo @@ -0,0 +1,13 @@ +[hashicorp] +name=Hashicorp Stable - $basearch +baseurl=https://rpm.releases.hashicorp.com/RHEL/7/$basearch/stable +enabled=1 +gpgcheck=1 +gpgkey=https://rpm.releases.hashicorp.com/gpg + +[hashicorp-test] +name=Hashicorp Test - $basearch +baseurl=https://rpm.releases.hashicorp.com/RHEL/7/$basearch/test +enabled=0 +gpgcheck=1 +gpgkey=https://rpm.releases.hashicorp.com/gpg \ No newline at end of file From 5a8b4090b28486142eff3ae21de6a81186ba46b6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 16 Apr 2024 20:48:59 +0200 Subject: [PATCH 596/794] build(deps): update dependency org.apache.maven.plugins:maven-source-plugin to v3.3.1 (#802) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index e99f2dca0bbc..112a6e5f85d3 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -109,7 +109,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 attach-sources From 73653edbab0af6992dbd9d6e6dae8836ada02412 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 16 Apr 2024 20:49:32 +0200 Subject: [PATCH 597/794] build(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.13.0 (#794) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 0a65e55ce1bf..0fdc7c2f7f14 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -114,7 +114,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.1 + 3.13.0 1.8 1.8 From ba4f78e47c18c1feb058118406f2f02d84637e2f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 16 Apr 2024 20:50:54 +0200 Subject: [PATCH 598/794] build(deps): update dependency org.jacoco:jacoco-maven-plugin to v0.8.12 (#799) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 0fdc7c2f7f14..fc45c9872fe9 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -135,7 +135,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 org.apache.maven.plugins From 983f9fce665ceb64eef57edec11985630f875aa2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 16 Apr 2024 20:51:03 +0200 Subject: [PATCH 599/794] build(deps): update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.3 (#793) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 112a6e5f85d3..618d04ecc9ae 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -138,7 +138,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.0 + 3.2.3 sign-artifacts From ec80d8558a0fe434d0c1d886d6f9bee93a739d28 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 16 Apr 2024 20:51:11 +0200 Subject: [PATCH 600/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.15.0 (#792) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index fc45c9872fe9..88b913bcf9f7 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -521,7 +521,7 @@ com.puppycrawl.tools checkstyle - 10.14.1 + 10.15.0 From 54cfde07baea82506afec91eca9319c1c8b0304c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 17 Apr 2024 18:04:38 +0200 Subject: [PATCH 601/794] build(deps): update dependency org.apache.maven.plugins:maven-jar-plugin to v3.4.0 (#807) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 88b913bcf9f7..e34a0882037b 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -94,7 +94,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.0 true From f549464bcd733b3c2857829105c849eb9f136a31 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:00:23 -0400 Subject: [PATCH 602/794] chore(main): release 1.7.7-SNAPSHOT (#789) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index cbfdcb2c2d2b..d277d21ace5b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.6' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.7-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index a2f03ba670c4..1ea736f5097f 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.6' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.7-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 1f9d6e9f8633..9bfc32c8d437 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.6' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.7-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index e34a0882037b..29700e5a5f91 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.6 + 1.7.7-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.6 + 1.7.7-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 618d04ecc9ae..bea9e0a7c2c9 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.6 + 1.7.7-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 13a433c53d43..c1eaa8158413 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.6:1.7.6 +google-cloud-shared-config:1.7.6:1.7.7-SNAPSHOT From 4e22b30f19bb8d435fa4f16b88a2ed48b5571201 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:49:33 -0400 Subject: [PATCH 603/794] chore(main): release 1.7.7 (#808) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .../.cloudbuild/cloudbuild-test-a.yaml | 2 +- .../.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 17 +++++++++++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- .../native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 24 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index d277d21ace5b..bd91a2ad7722 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.7-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.7' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 1ea736f5097f..a18401c7dee5 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.7-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.7' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 9bfc32c8d437..cbf34c0699e6 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.7-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.7' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index ea445d7fca90..04a6d8860a10 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [1.7.7](https://github.com/googleapis/java-shared-config/compare/v1.7.6...v1.7.7) (2024-04-17) + + +### Bug Fixes + +* Graalvm image terraform install ([#806](https://github.com/googleapis/java-shared-config/issues/806)) ([96589ef](https://github.com/googleapis/java-shared-config/commit/96589efd2d4abbda8623c855c92be092293133ce)) + + +### Dependencies + +* Update dependency com.puppycrawl.tools:checkstyle to v10.15.0 ([#792](https://github.com/googleapis/java-shared-config/issues/792)) ([984f434](https://github.com/googleapis/java-shared-config/commit/984f434ddbb9ddbf60d80d14dae6a92d8639596a)) +* Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.13.0 ([8136d33](https://github.com/googleapis/java-shared-config/commit/8136d33b21a7492bee3673836db035be14240c44)) +* Update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.3 ([e485b45](https://github.com/googleapis/java-shared-config/commit/e485b45aff22a0528feabfa9348152c20a146560)) +* Update dependency org.apache.maven.plugins:maven-jar-plugin to v3.4.0 ([567ba39](https://github.com/googleapis/java-shared-config/commit/567ba397399c67fbbad3558358a7d86f30e8b3e7)) +* Update dependency org.apache.maven.plugins:maven-source-plugin to v3.3.1 ([8b625c0](https://github.com/googleapis/java-shared-config/commit/8b625c0c05f90c0df5fa5f2e11da8e8b8067ce85)) +* Update dependency org.jacoco:jacoco-maven-plugin to v0.8.12 ([15870f4](https://github.com/googleapis/java-shared-config/commit/15870f491eba6132ae60239eda1ebec5b307b4e6)) + ## [1.7.6](https://github.com/googleapis/java-shared-config/compare/v1.7.5...v1.7.6) (2024-03-14) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 29700e5a5f91..0bfc989b7a97 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.7-SNAPSHOT + 1.7.7 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.7-SNAPSHOT + 1.7.7 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index bea9e0a7c2c9..f424532c700a 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.7-SNAPSHOT + 1.7.7 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index c1eaa8158413..f8dc4eb7c7e1 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.6:1.7.7-SNAPSHOT +google-cloud-shared-config:1.7.7:1.7.7 From c8789ec4d3ec4d0aa9aedc4923d53bb0fb16e3a3 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 15:36:53 -0400 Subject: [PATCH 604/794] chore(main): release 1.7.8-SNAPSHOT (#809) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index bd91a2ad7722..272418adb972 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.7' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index a18401c7dee5..bfaf4f2c5d9c 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.7' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index cbf34c0699e6..fe5a5cfa5665 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.7' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 0bfc989b7a97..7f2feb273bf4 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.7 + 1.7.8-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.7 + 1.7.8-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index f424532c700a..71d61a0bcfbf 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.7 + 1.7.8-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index f8dc4eb7c7e1..2ceb1a83351a 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.7:1.7.7 +google-cloud-shared-config:1.7.7:1.7.8-SNAPSHOT From 102cc65c3d1f72f541edc2d1f97a0a07c55b6dad Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 15:51:30 -0400 Subject: [PATCH 605/794] feat: add `libraries_bom_version` in metadata (#1956) (#805) * feat: add libraries_bom_version * add unit tests * remove isfile * add tempdir * restore * add current dir * restore template * remove unit test * restore templates Source-Link: https://github.com/googleapis/synthtool/commit/63cc541da2c45fcfca2136c43e638da1fbae174d Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:dc11e2119c854b57b7f7ed9962391decf002454700020a52b5d0d46c40b80a7e Co-authored-by: Owl Bot Co-authored-by: Lawrence Qiu --- java-shared-config/.github/.OwlBot.lock.yaml | 6 ++--- .../workflows/renovate_config_check.yaml | 25 +++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 java-shared-config/.github/workflows/renovate_config_check.yaml diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index d304652e1c44..291f8e29cac6 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:6f431774e11cc46619cf093fd1481193c4024031073697fa18f0099b943aab88 -# created: 2023-12-01T19:50:20.444857406Z + digest: sha256:dc11e2119c854b57b7f7ed9962391decf002454700020a52b5d0d46c40b80a7e +# created: 2024-04-15T22:37:28.944513098Z diff --git a/java-shared-config/.github/workflows/renovate_config_check.yaml b/java-shared-config/.github/workflows/renovate_config_check.yaml new file mode 100644 index 000000000000..87d8eb2be8cd --- /dev/null +++ b/java-shared-config/.github/workflows/renovate_config_check.yaml @@ -0,0 +1,25 @@ +name: Renovate Bot Config Validation + +on: + pull_request: + paths: + - 'renovate.json' + +jobs: + renovate_bot_config_validation: + runs-on: ubuntu-22.04 + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + node-version: '20' + + - name: Install Renovate and Config Validator + run: | + npm install -g npm@latest + npm install --global renovate + renovate-config-validator From 13767ad8345068cd3dac6c02727b12c0f8b788c3 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Thu, 18 Apr 2024 15:35:55 -0400 Subject: [PATCH 606/794] chore: pin autovalue temporarily and delete guava rule. (#800) disable renovate bot from updating autovalue temporarily. current autovalue version is 1.10.4 ([here](https://github.com/googleapis/java-shared-config/blob/217a624e8560821c24ba60bd04b4721641dbc7b8/java-shared-config/pom.xml#L29)) This is for lts 7, and I will manually remove this disable later. remove renovate config for guava as there is no guava version setup in this repo, instead, it is updated in sdk-platform-java [here](https://github.com/googleapis/sdk-platform-java/blob/56775a61a054fb67a15023481cd3d0a0cf2b0496/gapic-generator-java-pom-parent/pom.xml#L33). --- java-shared-config/renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index 6eb596ac5f0a..2a13846cd26f 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -15,9 +15,9 @@ "packageRules": [ { "packagePatterns": [ - "^com.google.guava:" + "^com.google.auto.value:" ], - "versionScheme": "docker" + "enabled": false }, { "packagePatterns": [ From e4bb7bddb59fad472532b23bea8bf1ab13a9c182 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 30 Apr 2024 17:30:19 +0200 Subject: [PATCH 607/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.16.0 (#816) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `10.15.0` -> `10.16.0` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.puppycrawl.tools:checkstyle/10.16.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.puppycrawl.tools:checkstyle/10.16.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.puppycrawl.tools:checkstyle/10.15.0/10.16.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.puppycrawl.tools:checkstyle/10.15.0/10.16.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-shared-config). --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 7f2feb273bf4..fc099a424938 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -521,7 +521,7 @@ com.puppycrawl.tools checkstyle - 10.15.0 + 10.16.0 From e62b2391decbbc9899142ce3f46d1e299dbd5b06 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 30 Apr 2024 17:30:23 +0200 Subject: [PATCH 608/794] build(deps): update dependency org.apache.maven.plugins:maven-jar-plugin to v3.4.1 (#813) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-jar-plugin](https://maven.apache.org/plugins/) | `3.4.0` -> `3.4.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.apache.maven.plugins:maven-jar-plugin/3.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.apache.maven.plugins:maven-jar-plugin/3.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.apache.maven.plugins:maven-jar-plugin/3.4.0/3.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.apache.maven.plugins:maven-jar-plugin/3.4.0/3.4.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-shared-config). --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index fc099a424938..41b6bdb8a690 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -94,7 +94,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.0 + 3.4.1 true From 9e93d46821cb5b5e2de5e8f1ddab897fc73d852a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 30 Apr 2024 17:32:18 +0200 Subject: [PATCH 609/794] deps: update actions/setup-node action to v4 (#811) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [actions/setup-node](https://togithub.com/actions/setup-node) | action | major | `v3` -> `v4` | --- ### Release Notes
actions/setup-node (actions/setup-node) ### [`v4`](https://togithub.com/actions/setup-node/compare/v3...v4) [Compare Source](https://togithub.com/actions/setup-node/compare/v3...v4)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-shared-config). From 0f4516c109fd54fce33574d38ee2f09a923bf330 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 30 Apr 2024 17:32:32 +0200 Subject: [PATCH 610/794] build(deps): update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.4 (#812) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-gpg-plugin](https://maven.apache.org/plugins/) | `3.2.3` -> `3.2.4` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.apache.maven.plugins:maven-gpg-plugin/3.2.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.apache.maven.plugins:maven-gpg-plugin/3.2.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.apache.maven.plugins:maven-gpg-plugin/3.2.3/3.2.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.apache.maven.plugins:maven-gpg-plugin/3.2.3/3.2.4?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-shared-config). --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 71d61a0bcfbf..de066603c395 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -138,7 +138,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sign-artifacts From 7df534a390d23de27e685483778d418c53cd47a4 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 30 Apr 2024 22:04:26 +0200 Subject: [PATCH 611/794] build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.2 (#817) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [org.apache.maven.plugins:maven-deploy-plugin](https://maven.apache.org/plugins/) | `3.1.1` -> `3.1.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/org.apache.maven.plugins:maven-deploy-plugin/3.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.apache.maven.plugins:maven-deploy-plugin/3.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.apache.maven.plugins:maven-deploy-plugin/3.1.1/3.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.apache.maven.plugins:maven-deploy-plugin/3.1.1/3.1.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-shared-config). --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 524af717adb7..22322fc733d2 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -22,7 +22,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + 3.1.2 true From b642b2d36368e76e56957ee1c966a48947d983b8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 30 Apr 2024 22:06:23 +0200 Subject: [PATCH 612/794] deps: update actions/setup-node action to v4 (#818) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [actions/setup-node](https://togithub.com/actions/setup-node) | action | major | `v3` -> `v4` | --- ### Release Notes
actions/setup-node (actions/setup-node) ### [`v4`](https://togithub.com/actions/setup-node/compare/v3...v4) [Compare Source](https://togithub.com/actions/setup-node/compare/v3...v4)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-shared-config). From 3ad1f066ceb73eb5b28c920d4ded40f7023544cc Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 30 Apr 2024 22:12:18 +0200 Subject: [PATCH 613/794] deps: update actions/setup-node action to v4 (#819) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [actions/setup-node](https://togithub.com/actions/setup-node) | action | major | `v3` -> `v4` | --- ### Release Notes
actions/setup-node (actions/setup-node) ### [`v4`](https://togithub.com/actions/setup-node/compare/v3...v4) [Compare Source](https://togithub.com/actions/setup-node/compare/v3...v4)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/googleapis/java-shared-config). From 21d40a2ffe6c255f9e2f696e469334ebd16b30bf Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Tue, 14 May 2024 16:28:07 -0400 Subject: [PATCH 614/794] feat: use maven properties to manage dependency versions for native profile (#824) --- java-shared-config/native-image-shared-config/pom.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index de066603c395..a033efab143e 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -60,6 +60,9 @@ 3.2.5 22.3.5 + 0.10.1 + 5.10.2 + 1.3.0 @@ -166,12 +169,12 @@ org.opentest4j opentest4j - 1.3.0 + ${opentest4j.version} org.junit.vintage junit-vintage-engine - 5.10.2 + ${junit-vintage-engine.version} test @@ -185,7 +188,7 @@ org.junit.vintage junit-vintage-engine - 5.10.2 + ${junit-vintage-engine.version} @@ -201,7 +204,7 @@ org.graalvm.buildtools native-maven-plugin - 0.10.1 + ${native-maven-plugin.version} true From 2476ab392541191c828e504c791afe5af4fb5346 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Thu, 23 May 2024 21:32:39 -0400 Subject: [PATCH 615/794] chore: tag graalvm test images with infrastructure-public-image- suffix (#829) * chore: tag graalvm test images with infrastructure-public-image- suffix --- java-shared-config/.cloudbuild/cloudbuild.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index fe5a5cfa5665..75ce84b6034b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -18,7 +18,10 @@ substitutions: steps: # GraalVM A build - name: gcr.io/cloud-builders/docker - args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-a.Dockerfile", "."] + args: ["build", + "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", + "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:infrastructure-public-image-$SHORT_SHA", + "--file", "graalvm-a.Dockerfile", "."] dir: .cloudbuild id: graalvm-a-build waitFor: ["-"] @@ -29,7 +32,9 @@ steps: # GraalVM B build - name: gcr.io/cloud-builders/docker - args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-b.Dockerfile", "." ] + args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", + "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:infrastructure-public-image-$SHORT_SHA", + "--file", "graalvm-b.Dockerfile", "." ] dir: .cloudbuild id: graalvm-b-build waitFor: [ "-" ] @@ -42,3 +47,5 @@ steps: images: - gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION} - gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION} + - gcr.io/cloud-devrel-public-resources/graalvm_a:infrastructure-public-image-$SHORT_SHA + - gcr.io/cloud-devrel-public-resources/graalvm_b:infrastructure-public-image-$SHORT_SHA From c37b07d92946bafad51ee35b5c48cce8a381f4ca Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 28 May 2024 21:06:15 +0200 Subject: [PATCH 616/794] build(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.6.0 (#827) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 41b6bdb8a690..c2b7ed4cd207 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -160,7 +160,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.5.0 + 3.6.0 org.codehaus.mojo From d5107d287aa0e889b0b73e12e9e9954551d21747 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 28 May 2024 21:06:42 +0200 Subject: [PATCH 617/794] build(deps): update dependency org.codehaus.mojo:exec-maven-plugin to v3.3.0 (#828) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index c2b7ed4cd207..015e918e120d 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -61,7 +61,7 @@ org.codehaus.mojo exec-maven-plugin - 3.2.0 + 3.3.0 org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + 1.7.0 true sonatype-nexus-staging From 3cf05d8eb2bbfe7a52e623fb2ca6be0ecb3b46fb Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 29 May 2024 00:26:35 +0200 Subject: [PATCH 621/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.17.0 (#831) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 015e918e120d..2808476d3348 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -521,7 +521,7 @@ com.puppycrawl.tools checkstyle - 10.16.0 + 10.17.0 From 39865613fad70b3bdb20de2be14526113a844132 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 11:32:45 -0400 Subject: [PATCH 622/794] feat: [java] allow passing libraries_bom_version from env (#1967) (#825) * feat: [java] allow passing libraries_bom_version from env * reformat Source-Link: https://github.com/googleapis/synthtool/commit/e36d2f164ca698f0264fb6f79ddc4b0fa024a940 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea Co-authored-by: Owl Bot Co-authored-by: Diego Marquez --- java-shared-config/.github/.OwlBot.lock.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 5db36a5f7d8e..18c720b86b6a 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:68ba5f5164a4b55529d358bb262feaa000536a0c62980727dd05a91bbb47ea5e -# created: 2024-05-09T16:31:37.168667071Z + digest: sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea +# created: 2024-05-17T15:15:57.6714113Z \ No newline at end of file From 0730b0654a47d55a0b8ed2e601c96d9367800662 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 13:00:58 -0400 Subject: [PATCH 623/794] chore(main): release 1.8.0 (#810) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .../.cloudbuild/cloudbuild-test-a.yaml | 2 +- .../.cloudbuild/cloudbuild-test-b.yaml | 2 +- .../.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 19 +++++++++++++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- .../native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 26 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 272418adb972..46732385a26c 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index bfaf4f2c5d9c..03c51e6a1d88 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 75ce84b6034b..a663a88cfdcc 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 04a6d8860a10..880f262131b4 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [1.8.0](https://github.com/googleapis/java-shared-config/compare/v1.7.7...v1.8.0) (2024-05-29) + + +### Features + +* [java] allow passing libraries_bom_version from env ([#1967](https://github.com/googleapis/java-shared-config/issues/1967)) ([#825](https://github.com/googleapis/java-shared-config/issues/825)) ([07c7cec](https://github.com/googleapis/java-shared-config/commit/07c7cece6ddc793e01b108e96416750fd00c09da)) +* Add `libraries_bom_version` in metadata ([#1956](https://github.com/googleapis/java-shared-config/issues/1956)) ([#805](https://github.com/googleapis/java-shared-config/issues/805)) ([a30f02d](https://github.com/googleapis/java-shared-config/commit/a30f02d78d39ee8a2a2be0fd8401a647871d10ca)) +* Use maven properties to manage dependency versions for native profile ([#824](https://github.com/googleapis/java-shared-config/issues/824)) ([465bb39](https://github.com/googleapis/java-shared-config/commit/465bb399aef9aa8383f11c23f10a97df49c1d057)) + + +### Dependencies + +* Update actions/setup-node action to v4 ([#811](https://github.com/googleapis/java-shared-config/issues/811)) ([fdb1044](https://github.com/googleapis/java-shared-config/commit/fdb1044693c2175782f02a670b550e96f1c15d0b)) +* Update actions/setup-node action to v4 ([#818](https://github.com/googleapis/java-shared-config/issues/818)) ([6222364](https://github.com/googleapis/java-shared-config/commit/6222364b4795661f282593b135d415827700d635)) +* Update actions/setup-node action to v4 ([#819](https://github.com/googleapis/java-shared-config/issues/819)) ([ffb2a7a](https://github.com/googleapis/java-shared-config/commit/ffb2a7a3ff131a8d5af869098fdd69d0cdd87c4d)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.16.0 ([#816](https://github.com/googleapis/java-shared-config/issues/816)) ([efc5585](https://github.com/googleapis/java-shared-config/commit/efc5585ec817e327e0381412c2b2436e3ef0510d)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.17.0 ([#831](https://github.com/googleapis/java-shared-config/issues/831)) ([b0c9e75](https://github.com/googleapis/java-shared-config/commit/b0c9e75e778950401df28adb10998a676d6a24ff)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 ([#826](https://github.com/googleapis/java-shared-config/issues/826)) ([881e72f](https://github.com/googleapis/java-shared-config/commit/881e72f7e5dc1304929b89e9ec9d1ba9d4d0bead)) + ## [1.7.7](https://github.com/googleapis/java-shared-config/compare/v1.7.6...v1.7.7) (2024-04-17) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 2808476d3348..ce4c67cdd34d 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.7.8-SNAPSHOT + 1.8.0 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.8-SNAPSHOT + 1.8.0 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index c33d5fa9d928..73238372cdf4 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.7.8-SNAPSHOT + 1.8.0 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 2ceb1a83351a..5441812203e9 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.7:1.7.8-SNAPSHOT +google-cloud-shared-config:1.8.0:1.8.0 From 1c9488ce7df0607c2c1f25080aeb20f343cd4c4c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 11:22:46 -0400 Subject: [PATCH 624/794] chore(main): release 1.8.1-SNAPSHOT (#832) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 46732385a26c..f0b324268750 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.8.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 03c51e6a1d88..4ed6569bd0aa 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.8.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index a663a88cfdcc..497afcf375b9 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.8.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index ce4c67cdd34d..035ce05f8134 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.8.0 + 1.8.1-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.8.0 + 1.8.1-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 73238372cdf4..d56bac88035f 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.8.0 + 1.8.1-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 5441812203e9..0d9107c3690f 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.8.0:1.8.0 +google-cloud-shared-config:1.8.0:1.8.1-SNAPSHOT From 5ff968165f4d7a555304eb9a01f8deb153ad887f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 24 Jun 2024 17:23:02 +0200 Subject: [PATCH 625/794] build(deps): update dependency org.apache.maven.plugins:maven-jar-plugin to v3.4.2 (#844) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 035ce05f8134..05aed57609eb 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -94,7 +94,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.1 + 3.4.2 true From 9bb9d72b354812ff40ae98c030770a60c367337f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 24 Jun 2024 17:23:28 +0200 Subject: [PATCH 626/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.6.0 (#843) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 05aed57609eb..5f73abe81955 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -388,7 +388,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.5.0 + 3.6.0 From 7aea2383cb27f3c290335f7ece14a2d8d474c8bb Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 24 Jun 2024 17:23:49 +0200 Subject: [PATCH 627/794] build(deps): update surefire.version to v3.3.0 (#842) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index d56bac88035f..533733eb6ddd 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -58,7 +58,7 @@ - 3.2.5 + 3.3.0 22.3.5 0.10.2 5.10.2 From 56a16e6a9883756daf6854af92a0e6a60e4eaf3b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 11:24:10 -0400 Subject: [PATCH 628/794] ci: [java] automatic kokoro label in and /gcbrun comment (#1965) (#841) Source-Link: https://github.com/googleapis/synthtool/commit/bd2bae89f70bad380da47fab9ec25985dfb87d67 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3 Co-authored-by: Owl Bot --- java-shared-config/.github/.OwlBot.lock.yaml | 4 ++-- java-shared-config/.github/trusted-contribution.yml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml index 18c720b86b6a..359fe71c1964 100644 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ b/java-shared-config/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:31aa2ef27b071c2e7844b0eb1d5a24254daff06615b1b138b994dd6345c0b0ea -# created: 2024-05-17T15:15:57.6714113Z \ No newline at end of file + digest: sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3 +# created: 2024-06-05T18:32:21.724930324Z diff --git a/java-shared-config/.github/trusted-contribution.yml b/java-shared-config/.github/trusted-contribution.yml index a0ba1f7d9078..88d3ac9bf1a7 100644 --- a/java-shared-config/.github/trusted-contribution.yml +++ b/java-shared-config/.github/trusted-contribution.yml @@ -1,3 +1,9 @@ trustedContributors: - renovate-bot - gcf-owl-bot[bot] + +annotations: +- type: comment + text: "/gcbrun" +- type: label + text: "kokoro:force-run" From 13c36ff631d124879ed55722ae1bb42202bd5264 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 24 Jun 2024 17:24:35 +0200 Subject: [PATCH 629/794] build(deps): update dependency org.apache.maven.plugins:maven-jxr-plugin to v3.4.0 (#839) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 5f73abe81955..c813e2d609d3 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -456,7 +456,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.3.2 + 3.4.0 true From a7008333b5a4c3093ced9e2e04a11600b5ca43fd Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 24 Jun 2024 17:24:55 +0200 Subject: [PATCH 630/794] build(deps): update dependency org.apache.maven.plugins:maven-enforcer-plugin to v3.5.0 (#835) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index c813e2d609d3..848fd9013182 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -49,7 +49,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.4.1 + 3.5.0 org.codehaus.mojo From 7c7021be57c76001bf4ef4466559c8013823bbd6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 24 Jun 2024 17:25:16 +0200 Subject: [PATCH 631/794] build(deps): update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.4.0 (#840) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 848fd9013182..10e16ae6b1cc 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -516,7 +516,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.3.1 + 3.4.0 com.puppycrawl.tools From d5d486ffb9ee8b6fe5d5bbd208f62f5f0b3fbcab Mon Sep 17 00:00:00 2001 From: Burke Davison <40617934+burkedavison@users.noreply.github.com> Date: Mon, 24 Jun 2024 15:34:05 +0000 Subject: [PATCH 632/794] ci: make graalvm docker image checks required (#823) * ci: make graalvm docker image checks required * ci: provide full check name to required check list --- java-shared-config/.github/sync-repo-settings.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index 494a051019e9..6d24843d1e31 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -49,6 +49,8 @@ branchProtectionRules: - "build (11, java-bigtable, javadoc)" - "javadoc-with-doclet (java-bigtable)" - "cla/google" + - "graalvm-presubmit-shared-config-a (cloud-devrel-kokoro-resources)" + - "graalvm-presubmit-shared-config-b (cloud-devrel-kokoro-resources)" - pattern: java7 # Can admins overwrite branch protection. # Defaults to `true` From 83799f1ab86ed4af23025e0222daa5fb271b8b13 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 24 Jun 2024 18:14:47 +0200 Subject: [PATCH 633/794] deps: update actions/checkout digest to 692973e (#814) --- .../.github/workflows/downstream-dependencies.yaml | 4 ++-- .../.github/workflows/downstream-maven-plugins.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-shared-config/.github/workflows/downstream-dependencies.yaml b/java-shared-config/.github/workflows/downstream-dependencies.yaml index 631e7c3c32aa..5c9c372a53c6 100644 --- a/java-shared-config/.github/workflows/downstream-dependencies.yaml +++ b/java-shared-config/.github/workflows/downstream-dependencies.yaml @@ -18,7 +18,7 @@ jobs: - java-storage - java-pubsub steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - uses: actions/setup-java@v4 with: distribution: zulu @@ -31,7 +31,7 @@ jobs: flatten-plugin-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - uses: actions/setup-java@v4 with: distribution: zulu diff --git a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml index 3668d5cd6c01..ac9a5afa081c 100644 --- a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml +++ b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml @@ -25,7 +25,7 @@ jobs: - javadoc # maven-javadoc-plugin - javadoc-with-doclet # test javadoc generation with doclet steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - uses: actions/setup-java@v4 with: distribution: zulu @@ -54,7 +54,7 @@ jobs: - java-datastore - java-bigquerystorage steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - uses: actions/setup-java@v4 with: distribution: temurin From d0dd8d57b7050b4cfac4b70df24c74e7bba7cf72 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 12:52:53 -0400 Subject: [PATCH 634/794] chore(main): release 1.8.1 (#846) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index f0b324268750..5768105044c4 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.8.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 4ed6569bd0aa..94d7819a67a6 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.8.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 497afcf375b9..ae302805e969 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.8.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 880f262131b4..122a352c5e78 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.8.1](https://github.com/googleapis/java-shared-config/compare/v1.8.0...v1.8.1) (2024-06-24) + + +### Dependencies + +* Update actions/checkout digest to 692973e ([#814](https://github.com/googleapis/java-shared-config/issues/814)) ([ebece6b](https://github.com/googleapis/java-shared-config/commit/ebece6b7df6208527450c12368fcc0c6ce07ac67)) + ## [1.8.0](https://github.com/googleapis/java-shared-config/compare/v1.7.7...v1.8.0) (2024-05-29) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 10e16ae6b1cc..8a1b22f5e4db 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.8.1-SNAPSHOT + 1.8.1 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.8.1-SNAPSHOT + 1.8.1 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 533733eb6ddd..40ec3da9801e 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.8.1-SNAPSHOT + 1.8.1 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 0d9107c3690f..59b0becf722b 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.8.0:1.8.1-SNAPSHOT +google-cloud-shared-config:1.8.1:1.8.1 From 4148470e4545be672efcaf1dcaa8cea440d8ec7c Mon Sep 17 00:00:00 2001 From: Burke Davison <40617934+burkedavison@users.noreply.github.com> Date: Tue, 2 Jul 2024 18:12:21 +0000 Subject: [PATCH 635/794] feat: add org.graalvm.sdk:nativeimage dependency (#852) --- java-shared-config/native-image-shared-config/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 40ec3da9801e..f91d7727f5d7 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -60,6 +60,7 @@ 3.3.0 22.3.5 + 24.0.1 0.10.2 5.10.2 1.3.0 @@ -72,6 +73,11 @@ graal-sdk ${graal-sdk.version} + + org.graalvm.sdk + nativeimage + ${graal-sdk-nativeimage.version} + From 3e59b9590aa40993b6513b48fec3332f462f378a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 8 Jul 2024 21:47:23 +0200 Subject: [PATCH 636/794] build(deps): update dependency org.codehaus.mojo:animal-sniffer-maven-plugin to v1.24 (#853) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 8a1b22f5e4db..6531a7e65aed 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -363,7 +363,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.23 + 1.24 java8 From 5105036387f32d6f637a1ace098bf3b5d86abb60 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 8 Jul 2024 21:47:57 +0200 Subject: [PATCH 637/794] deps: update dependency org.junit.vintage:junit-vintage-engine to v5.10.3 (#850) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index f91d7727f5d7..88c17b8d703c 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -62,7 +62,7 @@ 22.3.5 24.0.1 0.10.2 - 5.10.2 + 5.10.3 1.3.0 From edb6480cefec29a2d611d206c96065b1572c87e9 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 8 Jul 2024 21:48:33 +0200 Subject: [PATCH 638/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.6.1 (#849) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 6531a7e65aed..6bea7bb15443 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -388,7 +388,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.6.0 + 3.6.1 From 06d44cb78b0029a134330c4c0c92cff9658d41ed Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 8 Jul 2024 22:19:59 +0200 Subject: [PATCH 639/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.7.0 (#838) --- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 6bea7bb15443..4fbeb9655e66 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -415,7 +415,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 html @@ -581,7 +581,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 com.microsoft.doclet.DocFxDoclet false diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 88c17b8d703c..707fdc2ae13c 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.3 + 3.7.0 attach-javadocs From 9ae08239110f18a39f8ee97ce5303ec99a3617fa Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:09:56 -0400 Subject: [PATCH 640/794] chore: update graalvm jdk 11 image to Graalvm for JDK 17 community image (#854) * chore: update graal-11 image to Graalvm for JDK 17 community image. --- java-shared-config/.cloudbuild/graalvm-a.Dockerfile | 3 +-- java-shared-config/.cloudbuild/graalvm-a.yaml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/java-shared-config/.cloudbuild/graalvm-a.Dockerfile b/java-shared-config/.cloudbuild/graalvm-a.Dockerfile index 41505aa633db..af96946f7e40 100644 --- a/java-shared-config/.cloudbuild/graalvm-a.Dockerfile +++ b/java-shared-config/.cloudbuild/graalvm-a.Dockerfile @@ -12,8 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ghcr.io/graalvm/graalvm-ce:ol7-java11-22.3.3-b1 - +FROM ghcr.io/graalvm/graalvm-community:17.0.9-ol7 RUN gu install native-image && \ yum update -y && \ yum install -y wget unzip git && \ diff --git a/java-shared-config/.cloudbuild/graalvm-a.yaml b/java-shared-config/.cloudbuild/graalvm-a.yaml index 9416153e5140..06db3dcf291f 100644 --- a/java-shared-config/.cloudbuild/graalvm-a.yaml +++ b/java-shared-config/.cloudbuild/graalvm-a.yaml @@ -17,7 +17,7 @@ commandTests: - name: "version" command: ["java", "-version"] # java -version outputs to stderr... - expectedError: ["openjdk version \"11.0.20\"", "GraalVM CE 22.3.3"] + expectedError: ["openjdk version \"17.0.9\"", "GraalVM CE 17.0.9"] - name: "maven" command: ["mvn", "-version"] expectedOutput: ["Apache Maven 3.9.4"] From b1780f8aad0d08712eacc8085ecc61c032334e65 Mon Sep 17 00:00:00 2001 From: Mike Eltsufin Date: Mon, 8 Jul 2024 20:17:14 -0400 Subject: [PATCH 641/794] chore: remove invalid CODOWNERS file (#855) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: remove invalid CODOWNERS file * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * update generatedFiles list to exclude CODEOWNERS --------- Co-authored-by: Owl Bot --- java-shared-config/synth.metadata | 1 - 1 file changed, 1 deletion(-) diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata index 8c24a9be852c..bd174a05df66 100644 --- a/java-shared-config/synth.metadata +++ b/java-shared-config/synth.metadata @@ -16,7 +16,6 @@ } ], "generatedFiles": [ - ".github/CODEOWNERS", ".github/ISSUE_TEMPLATE/bug_report.md", ".github/ISSUE_TEMPLATE/feature_request.md", ".github/ISSUE_TEMPLATE/support_request.md", From e807dd5b4e6371fe141058f0c0cff2a220c02c11 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 20:54:30 -0400 Subject: [PATCH 642/794] chore(main): release 1.8.2-SNAPSHOT (#847) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 5768105044c4..fdd9c7b98d93 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.8.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 94d7819a67a6..b6d9f5cd6bda 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.8.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index ae302805e969..e16868ed7428 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.8.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 4fbeb9655e66..965f9f6a77b0 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.8.1 + 1.8.2-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.8.1 + 1.8.2-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 707fdc2ae13c..a9f53c708609 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.8.1 + 1.8.2-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 59b0becf722b..d407487143ac 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.8.1:1.8.1 +google-cloud-shared-config:1.8.1:1.8.2-SNAPSHOT From 2a36f10300d7b1cc6b129d09bd073176550db743 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 21:31:13 -0400 Subject: [PATCH 643/794] chore(main): release 1.9.0 (#857) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .../.cloudbuild/cloudbuild-test-a.yaml | 2 +- .../.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 12 ++++++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- .../native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 19 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index fdd9c7b98d93..c77ede7b34e1 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.8.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.9.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index b6d9f5cd6bda..adadf25a4bf5 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.8.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.9.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index e16868ed7428..a64de1992e5e 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.8.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.9.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 122a352c5e78..ba0348e6be4c 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.9.0](https://github.com/googleapis/java-shared-config/compare/v1.8.1...v1.9.0) (2024-07-09) + + +### Features + +* Add org.graalvm.sdk:nativeimage dependency ([#852](https://github.com/googleapis/java-shared-config/issues/852)) ([658ebed](https://github.com/googleapis/java-shared-config/commit/658ebed528d2fedca69356979b3201089176da10)) + + +### Dependencies + +* Update dependency org.junit.vintage:junit-vintage-engine to v5.10.3 ([#850](https://github.com/googleapis/java-shared-config/issues/850)) ([43e0d7d](https://github.com/googleapis/java-shared-config/commit/43e0d7dc9f103de1846c117454a7fba3edbee06a)) + ## [1.8.1](https://github.com/googleapis/java-shared-config/compare/v1.8.0...v1.8.1) (2024-06-24) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 965f9f6a77b0..6bd82c81eee0 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.8.2-SNAPSHOT + 1.9.0 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.8.2-SNAPSHOT + 1.9.0 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index a9f53c708609..f341fcd1d2b8 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.8.2-SNAPSHOT + 1.9.0 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index d407487143ac..82a47cde5e16 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.8.1:1.8.2-SNAPSHOT +google-cloud-shared-config:1.9.0:1.9.0 From 5e80b98de7618712d11e184bed69dfd737ddf85a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 10:23:42 -0400 Subject: [PATCH 644/794] chore(main): release 1.9.1-SNAPSHOT (#858) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index c77ede7b34e1..85c979eb24a0 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.9.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.9.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index adadf25a4bf5..81d76792b0c1 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.9.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.9.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index a64de1992e5e..bfda3166cdb6 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.9.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.9.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 6bd82c81eee0..28811ffa86bb 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.9.0 + 1.9.1-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.9.0 + 1.9.1-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index f341fcd1d2b8..67297881bc25 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.9.0 + 1.9.1-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 82a47cde5e16..d3bbc515b2df 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.9.0:1.9.0 +google-cloud-shared-config:1.9.0:1.9.1-SNAPSHOT From 686fbbc1d9fb97e98ce14f39b3d5397f8d4aa9f3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 22 Jul 2024 18:59:15 +0200 Subject: [PATCH 645/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.6.2 (#865) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 28811ffa86bb..11062906280f 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -388,7 +388,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.6.1 + 3.6.2 From 853ca35df24dcf3fa2f9fb75d182cdad6abe97e8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 22 Jul 2024 18:59:36 +0200 Subject: [PATCH 646/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.8.0 (#868) --- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 11062906280f..8823a2361847 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -415,7 +415,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + 3.8.0 html @@ -581,7 +581,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + 3.8.0 com.microsoft.doclet.DocFxDoclet false diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 67297881bc25..df5bf50b69ff 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + 3.8.0 attach-javadocs From cc347bbb4092dc243bee65861d17b1608a0f24b7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 22 Jul 2024 18:59:49 +0200 Subject: [PATCH 647/794] build(deps): update surefire.version to v3.3.1 (#859) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index df5bf50b69ff..f3b1bde15ea9 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -58,7 +58,7 @@ - 3.3.0 + 3.3.1 22.3.5 24.0.1 0.10.2 From c65c10c7d53f7981dc0cb6fddbd87d9472307a7e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 22 Jul 2024 19:46:39 +0200 Subject: [PATCH 648/794] deps: update dependency org.graalvm.sdk:nativeimage to v24.0.2 (#867) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index f3b1bde15ea9..d9edbf8d075f 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -60,7 +60,7 @@ 3.3.1 22.3.5 - 24.0.1 + 24.0.2 0.10.2 5.10.3 1.3.0 From 972ac018db4cb8cad44b5312f417f8807846c6fe Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:08:05 -0400 Subject: [PATCH 649/794] chore(main): release 1.9.1 (#870) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 85c979eb24a0..49d4bf0cc827 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.9.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.9.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 81d76792b0c1..99d662d41e8c 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.9.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.9.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index bfda3166cdb6..9b5b56852a0d 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.9.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.9.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index ba0348e6be4c..1904d82c9395 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.9.1](https://github.com/googleapis/java-shared-config/compare/v1.9.0...v1.9.1) (2024-07-22) + + +### Dependencies + +* Update dependency org.graalvm.sdk:nativeimage to v24.0.2 ([#867](https://github.com/googleapis/java-shared-config/issues/867)) ([3f45150](https://github.com/googleapis/java-shared-config/commit/3f45150ae55eb7dfc0adf56e2ceb5e93ae513bda)) + ## [1.9.0](https://github.com/googleapis/java-shared-config/compare/v1.8.1...v1.9.0) (2024-07-09) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 8823a2361847..1d44c069d231 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.9.1-SNAPSHOT + 1.9.1 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.9.1-SNAPSHOT + 1.9.1 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index d9edbf8d075f..617abd1c79f5 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.9.1-SNAPSHOT + 1.9.1 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index d3bbc515b2df..7345ec542230 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.9.0:1.9.1-SNAPSHOT +google-cloud-shared-config:1.9.1:1.9.1 From afc3a7db705827c1f23436fdcb8f85ca65c98ee0 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Tue, 23 Jul 2024 13:10:52 -0400 Subject: [PATCH 650/794] chore: lift temp autovalue vertion pin for renovate. (#851) --- java-shared-config/renovate.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index 2a13846cd26f..d740036f5aba 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -13,12 +13,6 @@ "ignorePaths": [".kokoro/requirements.txt"], "ignoreDeps": ["org.codehaus.mojo:flatten-maven-plugin"], "packageRules": [ - { - "packagePatterns": [ - "^com.google.auto.value:" - ], - "enabled": false - }, { "packagePatterns": [ "*" From cc11e8d0ae99575ee7759aa89a86a0a8bd0b73b5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:36:43 -0400 Subject: [PATCH 651/794] chore(main): release 1.9.2-SNAPSHOT (#871) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 49d4bf0cc827..50acafefd971 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.9.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.9.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 99d662d41e8c..ff00d545582b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.9.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.9.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 9b5b56852a0d..90da55976c40 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.9.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.9.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 1d44c069d231..285f58eb589b 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.9.1 + 1.9.2-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.9.1 + 1.9.2-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 617abd1c79f5..5ec1217cfb2d 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.9.1 + 1.9.2-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 7345ec542230..2eada5d1753e 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.9.1:1.9.1 +google-cloud-shared-config:1.9.1:1.9.2-SNAPSHOT From 604474dd032daf61adce9ddb6e5bdf1fce0af08c Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:43:18 -0400 Subject: [PATCH 652/794] feat: update graal-sdk to 24 and graalvm-A to 21.x (#815) * feat: update graal-sdk to 24 and graalvm-A to 22.x --- java-shared-config/.cloudbuild/graalvm-a.Dockerfile | 6 +++--- java-shared-config/.cloudbuild/graalvm-a.yaml | 2 +- java-shared-config/.kokoro/presubmit/downstream-build.sh | 3 +-- java-shared-config/native-image-shared-config/pom.xml | 3 ++- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/graalvm-a.Dockerfile b/java-shared-config/.cloudbuild/graalvm-a.Dockerfile index af96946f7e40..4a22a0559690 100644 --- a/java-shared-config/.cloudbuild/graalvm-a.Dockerfile +++ b/java-shared-config/.cloudbuild/graalvm-a.Dockerfile @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ghcr.io/graalvm/graalvm-community:17.0.9-ol7 -RUN gu install native-image && \ - yum update -y && \ +FROM ghcr.io/graalvm/graalvm-community:21.0.2-ol7-20240116 + +RUN yum update -y && \ yum install -y wget unzip git && \ # Install maven wget -q https://archive.apache.org/dist/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.zip -O /tmp/maven.zip && \ diff --git a/java-shared-config/.cloudbuild/graalvm-a.yaml b/java-shared-config/.cloudbuild/graalvm-a.yaml index 06db3dcf291f..50f8dc14c6be 100644 --- a/java-shared-config/.cloudbuild/graalvm-a.yaml +++ b/java-shared-config/.cloudbuild/graalvm-a.yaml @@ -17,7 +17,7 @@ commandTests: - name: "version" command: ["java", "-version"] # java -version outputs to stderr... - expectedError: ["openjdk version \"17.0.9\"", "GraalVM CE 17.0.9"] + expectedError: ["openjdk version \"21.0.2\"", "GraalVM CE 21.0.2"] - name: "maven" command: ["mvn", "-version"] expectedOutput: ["Apache Maven 3.9.4"] diff --git a/java-shared-config/.kokoro/presubmit/downstream-build.sh b/java-shared-config/.kokoro/presubmit/downstream-build.sh index 710bfd4e2a69..3ca932fc626a 100755 --- a/java-shared-config/.kokoro/presubmit/downstream-build.sh +++ b/java-shared-config/.kokoro/presubmit/downstream-build.sh @@ -16,7 +16,6 @@ set -eo pipefail set -x - function modify_shared_config() { xmllint --shell pom.xml < + 24.0.2 3.3.1 - 22.3.5 24.0.2 0.10.2 5.10.3 1.3.0 + org.graalvm.sdk:nativeimage From bf04a06230dfb0e38b02d94aedceb14dcca8217c Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:39:32 -0400 Subject: [PATCH 653/794] fix: address terraform installation failure by updating hashicorp baseurl (#881) * fix: address terraform installation failure by updating hashicorp baseurl --- java-shared-config/.cloudbuild/hashicorp.repo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.cloudbuild/hashicorp.repo b/java-shared-config/.cloudbuild/hashicorp.repo index 68ae2f8f9a23..390e8ff4262d 100644 --- a/java-shared-config/.cloudbuild/hashicorp.repo +++ b/java-shared-config/.cloudbuild/hashicorp.repo @@ -1,13 +1,13 @@ [hashicorp] name=Hashicorp Stable - $basearch -baseurl=https://rpm.releases.hashicorp.com/RHEL/7/$basearch/stable +baseurl=https://rpm.releases.hashicorp.com/RHEL/9/$basearch/stable enabled=1 gpgcheck=1 gpgkey=https://rpm.releases.hashicorp.com/gpg [hashicorp-test] name=Hashicorp Test - $basearch -baseurl=https://rpm.releases.hashicorp.com/RHEL/7/$basearch/test +baseurl=https://rpm.releases.hashicorp.com/RHEL/9/$basearch/test enabled=0 gpgcheck=1 gpgkey=https://rpm.releases.hashicorp.com/gpg \ No newline at end of file From 818e12290afd5f6868751482c41b6e0c0993df30 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 10:08:57 -0400 Subject: [PATCH 654/794] chore(main): release 1.10.0 (#874) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .../.cloudbuild/cloudbuild-test-a.yaml | 2 +- .../.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 12 ++++++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- .../native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 19 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 50acafefd971..7de99e8c0288 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.9.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.10.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index ff00d545582b..1c9625103e81 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.9.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.10.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 90da55976c40..ba90d6231e91 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.9.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.10.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 1904d82c9395..3bce74b2f6c7 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.10.0](https://github.com/googleapis/java-shared-config/compare/v1.9.1...v1.10.0) (2024-08-13) + + +### Features + +* Update graal-sdk to 24 and graalvm-A to 21.x ([#815](https://github.com/googleapis/java-shared-config/issues/815)) ([3c3c630](https://github.com/googleapis/java-shared-config/commit/3c3c6307ea88dc56f5901a95c295d1b2d53a3559)) + + +### Bug Fixes + +* Address terraform installation failure by updating hashicorp baseurl ([#881](https://github.com/googleapis/java-shared-config/issues/881)) ([0b7164f](https://github.com/googleapis/java-shared-config/commit/0b7164fd15150cb26668d381dbcd89671f1e66e4)) + ## [1.9.1](https://github.com/googleapis/java-shared-config/compare/v1.9.0...v1.9.1) (2024-07-22) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 285f58eb589b..02614cf00632 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.9.2-SNAPSHOT + 1.10.0 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.9.2-SNAPSHOT + 1.10.0 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 273a016603f9..51bf0f7b6303 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.9.2-SNAPSHOT + 1.10.0 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 2eada5d1753e..dbc07564d287 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.9.1:1.9.2-SNAPSHOT +google-cloud-shared-config:1.10.0:1.10.0 From eb7a77cd8039ae44960697e9fb52de1972d9b9f1 Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:00:44 -0400 Subject: [PATCH 655/794] feat: update test image to ol9 (#877) * feat: update test image to ol9 * use microdnf * use docker-ce * setup docker-ce repo * update hashicorp repo * update base image * add comment * add comment * update graalvm b image * restore graalvm-b test image --- java-shared-config/.cloudbuild/docker-ce.repo | 6 ++++++ .../.cloudbuild/graalvm-a.Dockerfile | 17 ++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 java-shared-config/.cloudbuild/docker-ce.repo diff --git a/java-shared-config/.cloudbuild/docker-ce.repo b/java-shared-config/.cloudbuild/docker-ce.repo new file mode 100644 index 000000000000..4ca9a24a6468 --- /dev/null +++ b/java-shared-config/.cloudbuild/docker-ce.repo @@ -0,0 +1,6 @@ +[docker-ce-stable] +name=Docker CE Stable - $basearch +baseurl=https://download.docker.com/linux/rhel/$releasever/$basearch/stable +enabled=1 +gpgcheck=1 +gpgkey=https://download.docker.com/linux/rhel/gpg \ No newline at end of file diff --git a/java-shared-config/.cloudbuild/graalvm-a.Dockerfile b/java-shared-config/.cloudbuild/graalvm-a.Dockerfile index 4a22a0559690..dd2c160b520b 100644 --- a/java-shared-config/.cloudbuild/graalvm-a.Dockerfile +++ b/java-shared-config/.cloudbuild/graalvm-a.Dockerfile @@ -12,10 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ghcr.io/graalvm/graalvm-community:21.0.2-ol7-20240116 +FROM ghcr.io/graalvm/graalvm-community:21.0.2-ol9-20240116 -RUN yum update -y && \ - yum install -y wget unzip git && \ +# use microdnf, see https://github.com/graalvm/container/issues/10 +RUN microdnf update -y oraclelinux-release-el9 && \ + microdnf install -y wget unzip git && \ # Install maven wget -q https://archive.apache.org/dist/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.zip -O /tmp/maven.zip && \ unzip /tmp/maven.zip -d /tmp/maven && \ @@ -27,20 +28,22 @@ ENV PATH $PATH:/usr/local/lib/maven/bin # Install gcloud SDK COPY google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo -RUN yum install -y google-cloud-sdk +RUN microdnf install -y google-cloud-sdk # Adding the package path to local ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin # Install docker -RUN yum install -y docker-engine docker-cli +# See also https://docs.docker.com/engine/install/rhel/#set-up-the-repository +COPY docker-ce.repo /etc/yum.repos.d/docker-ce.repo +RUN microdnf install -y docker-ce docker-ce-cli # Install terraform # See also https://www.hashicorp.com/official-packaging-guide COPY hashicorp.repo /etc/yum.repos.d/hashicorp.repo -RUN yum -y install terraform +RUN microdnf -y install terraform # Install jq -RUN yum -y install jq +RUN microdnf -y install jq WORKDIR /workspace From 7caee7de04c0f065fcd8dea2b2d2b82d58e91e11 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Thu, 15 Aug 2024 19:59:51 -0400 Subject: [PATCH 656/794] deps: update com.google.auto.value:auto-value-annotations to 1.11.0 (#886) --- .../java-storage-v2.9.3-expected-flattened-dependencies.txt | 2 +- java-shared-config/java-shared-config/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt b/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt index f418bfe63756..c3eaa9f9a629 100644 --- a/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt +++ b/java-shared-config/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt @@ -8,7 +8,7 @@ com.google.api:gax:jar:2.18.2:compile com.google.apis:google-api-services-storage:jar:v1-rev20220705-1.32.1:compile com.google.auth:google-auth-library-credentials:jar:1.7.0:compile com.google.auth:google-auth-library-oauth2-http:jar:1.7.0:compile -com.google.auto.value:auto-value-annotations:jar:1.10.4:compile +com.google.auto.value:auto-value-annotations:jar:1.11.0:compile com.google.cloud:google-cloud-core-http:jar:2.8.0:compile com.google.cloud:google-cloud-core:jar:2.8.0:compile com.google.code.findbugs:jsr305:jar:3.0.2:compile diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 02614cf00632..35e3504cb5dd 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -26,7 +26,7 @@ ${project.artifactId} false true - 1.10.4 + 1.11.0 /java/docs/reference/ From 5fe265c8ed6687fd16613714ddb681364df95c19 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 20:54:27 -0400 Subject: [PATCH 657/794] chore(main): release 1.10.1-SNAPSHOT (#883) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 7de99e8c0288..72ec76e65ddb 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.10.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.10.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 1c9625103e81..7c8830610e3c 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.10.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.10.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index ba90d6231e91..01cf4d828d0e 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.10.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.10.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 35e3504cb5dd..705d204d55ab 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.10.0 + 1.10.1-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.10.0 + 1.10.1-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 51bf0f7b6303..68bede3901a9 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.10.0 + 1.10.1-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index dbc07564d287..46eb74612a52 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.10.0:1.10.0 +google-cloud-shared-config:1.10.0:1.10.1-SNAPSHOT From 468d1f27f218965bfd4d1cac28b4d3c83cc58a4f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 21:20:12 -0400 Subject: [PATCH 658/794] chore(main): release 1.11.0 (#887) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .../.cloudbuild/cloudbuild-test-a.yaml | 2 +- .../.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 12 ++++++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- .../native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 19 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 72ec76e65ddb..d9a443c1e52a 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.10.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 7c8830610e3c..667e75063925 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.10.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 01cf4d828d0e..c2b431384d92 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.10.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 3bce74b2f6c7..157cd78815b3 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.11.0](https://github.com/googleapis/java-shared-config/compare/v1.10.0...v1.11.0) (2024-08-16) + + +### Features + +* Update test image to ol9 ([#877](https://github.com/googleapis/java-shared-config/issues/877)) ([0dd80f0](https://github.com/googleapis/java-shared-config/commit/0dd80f007e75afffb28aa7daefd179007bf38068)) + + +### Dependencies + +* Update com.google.auto.value:auto-value-annotations to 1.11.0 ([#886](https://github.com/googleapis/java-shared-config/issues/886)) ([97cceb3](https://github.com/googleapis/java-shared-config/commit/97cceb38ea3b23b959be74dd19371dfd836e5b9d)) + ## [1.10.0](https://github.com/googleapis/java-shared-config/compare/v1.9.1...v1.10.0) (2024-08-13) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 705d204d55ab..92b0222b63b3 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.10.1-SNAPSHOT + 1.11.0 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.10.1-SNAPSHOT + 1.11.0 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 68bede3901a9..0e1973fe5b15 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.10.1-SNAPSHOT + 1.11.0 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 46eb74612a52..ff320da87542 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.10.0:1.10.1-SNAPSHOT +google-cloud-shared-config:1.11.0:1.11.0 From d0a0d9f627433c8484f50bfc5e941af9a559a10f Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:38:59 +0000 Subject: [PATCH 659/794] chore: remove owlbot (#895) * chore: remove owlbot * revert owlbot.py to test ci * remove owlbot.py --- java-shared-config/.github/.OwlBot.lock.yaml | 17 ---- java-shared-config/.github/.OwlBot.yaml | 16 ---- .../.github/generated-files-bot.yml | 12 --- java-shared-config/codecov.yaml | 4 - java-shared-config/owlbot.py | 39 --------- java-shared-config/synth.metadata | 86 ------------------- 6 files changed, 174 deletions(-) delete mode 100644 java-shared-config/.github/.OwlBot.lock.yaml delete mode 100644 java-shared-config/.github/.OwlBot.yaml delete mode 100644 java-shared-config/.github/generated-files-bot.yml delete mode 100644 java-shared-config/codecov.yaml delete mode 100644 java-shared-config/owlbot.py delete mode 100644 java-shared-config/synth.metadata diff --git a/java-shared-config/.github/.OwlBot.lock.yaml b/java-shared-config/.github/.OwlBot.lock.yaml deleted file mode 100644 index 359fe71c1964..000000000000 --- a/java-shared-config/.github/.OwlBot.lock.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2024 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:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3 -# created: 2024-06-05T18:32:21.724930324Z diff --git a/java-shared-config/.github/.OwlBot.yaml b/java-shared-config/.github/.OwlBot.yaml deleted file mode 100644 index 5d9a9d8b5607..000000000000 --- a/java-shared-config/.github/.OwlBot.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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. -# 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" diff --git a/java-shared-config/.github/generated-files-bot.yml b/java-shared-config/.github/generated-files-bot.yml deleted file mode 100644 index c644a24e1129..000000000000 --- a/java-shared-config/.github/generated-files-bot.yml +++ /dev/null @@ -1,12 +0,0 @@ -externalManifests: -- type: json - file: 'synth.metadata' - jsonpath: '$.generatedFiles[*]' -- type: json - file: '.github/readme/synth.metadata/synth.metadata' - jsonpath: '$.generatedFiles[*]' -ignoreAuthors: -- 'renovate-bot' -- 'yoshi-automation' -- 'release-please[bot]' -- 'gcf-owl-bot[bot]' diff --git a/java-shared-config/codecov.yaml b/java-shared-config/codecov.yaml deleted file mode 100644 index 5724ea9478d7..000000000000 --- a/java-shared-config/codecov.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -codecov: - ci: - - source.cloud.google.com diff --git a/java-shared-config/owlbot.py b/java-shared-config/owlbot.py deleted file mode 100644 index 8bdec8da0ca7..000000000000 --- a/java-shared-config/owlbot.py +++ /dev/null @@ -1,39 +0,0 @@ -# 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. -# You may obtain a copy of the License at -# -# https://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. - -import synthtool as s -from synthtool.languages import java - - -for library in s.get_staging_dirs(): - # put any special-case replacements here - s.move(library) - -s.remove_staging_dirs() -java.common_templates( - excludes=[ - "CONTRIBUTING.md", - "README.md", - ".github/release-please.yml", - ".github/workflows/auto-release.yaml", - ".github/workflows/samples.yaml", - "samples/*", - "renovate.json", - ".kokoro/presubmit/graalvm-native.cfg", - ".kokoro/presubmit/graalvm-native-17.cfg", - ".kokoro/presubmit/common.cfg", - ".kokoro/requirements.txt", - ".kokoro/requirements.in" - ] -) diff --git a/java-shared-config/synth.metadata b/java-shared-config/synth.metadata deleted file mode 100644 index bd174a05df66..000000000000 --- a/java-shared-config/synth.metadata +++ /dev/null @@ -1,86 +0,0 @@ -{ - "sources": [ - { - "git": { - "name": ".", - "remote": "https://github.com/googleapis/java-shared-config.git", - "sha": "6504eada4851f554d25a8fa3479904e8b44e738d" - } - }, - { - "git": { - "name": "synthtool", - "remote": "https://github.com/googleapis/synthtool.git", - "sha": "396d9b84a1e93880f5bf88b59ecd38a0a6dffc5e" - } - } - ], - "generatedFiles": [ - ".github/ISSUE_TEMPLATE/bug_report.md", - ".github/ISSUE_TEMPLATE/feature_request.md", - ".github/ISSUE_TEMPLATE/support_request.md", - ".github/PULL_REQUEST_TEMPLATE.md", - ".github/blunderbuss.yml", - ".github/generated-files-bot.yml", - ".github/release-trigger.yml", - ".github/snippet-bot.yml", - ".github/sync-repo-settings.yaml", - ".github/trusted-contribution.yml", - ".github/workflows/approve-readme.yaml", - ".github/workflows/ci.yaml", - ".kokoro/build.bat", - ".kokoro/build.sh", - ".kokoro/coerce_logs.sh", - ".kokoro/common.cfg", - ".kokoro/common.sh", - ".kokoro/continuous/common.cfg", - ".kokoro/continuous/java8.cfg", - ".kokoro/dependencies.sh", - ".kokoro/nightly/common.cfg", - ".kokoro/nightly/integration.cfg", - ".kokoro/nightly/java11.cfg", - ".kokoro/nightly/java7.cfg", - ".kokoro/nightly/java8-osx.cfg", - ".kokoro/nightly/java8-win.cfg", - ".kokoro/nightly/java8.cfg", - ".kokoro/nightly/samples.cfg", - ".kokoro/populate-secrets.sh", - ".kokoro/presubmit/clirr.cfg", - ".kokoro/presubmit/common.cfg", - ".kokoro/presubmit/dependencies.cfg", - ".kokoro/presubmit/integration.cfg", - ".kokoro/presubmit/java11.cfg", - ".kokoro/presubmit/java7.cfg", - ".kokoro/presubmit/java8-osx.cfg", - ".kokoro/presubmit/java8-win.cfg", - ".kokoro/presubmit/java8.cfg", - ".kokoro/presubmit/linkage-monitor.cfg", - ".kokoro/presubmit/lint.cfg", - ".kokoro/presubmit/samples.cfg", - ".kokoro/readme.sh", - ".kokoro/release/bump_snapshot.cfg", - ".kokoro/release/common.cfg", - ".kokoro/release/common.sh", - ".kokoro/release/drop.cfg", - ".kokoro/release/drop.sh", - ".kokoro/release/promote.cfg", - ".kokoro/release/promote.sh", - ".kokoro/release/publish_javadoc.cfg", - ".kokoro/release/publish_javadoc.sh", - ".kokoro/release/publish_javadoc11.cfg", - ".kokoro/release/publish_javadoc11.sh", - ".kokoro/release/snapshot.cfg", - ".kokoro/release/snapshot.sh", - ".kokoro/release/stage.cfg", - ".kokoro/release/stage.sh", - ".kokoro/trampoline.sh", - "CODE_OF_CONDUCT.md", - "CONTRIBUTING.md", - "LICENSE", - "SECURITY.md", - "codecov.yaml", - "java.header", - "license-checks.xml", - "renovate.json" - ] -} \ No newline at end of file From 7885253e97d50d7bbb1d85c253110fe2be968925 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 3 Sep 2024 20:02:48 +0200 Subject: [PATCH 660/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.18.1 (#899) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 92b0222b63b3..917340f06f2c 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -521,7 +521,7 @@ com.puppycrawl.tools checkstyle - 10.17.0 + 10.18.1 From 29ae164183ea39a3031563548a550e1b0f3bfcd9 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 3 Sep 2024 20:02:59 +0200 Subject: [PATCH 661/794] build(deps): update dependency org.apache.maven.plugins:maven-jxr-plugin to v3.5.0 (#898) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 917340f06f2c..8981e281f44f 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -456,7 +456,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.4.0 + 3.5.0 true From fa9b5a497146342b57beaafdac55392cbc928568 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 3 Sep 2024 20:04:06 +0200 Subject: [PATCH 662/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.10.0 (#897) --- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 8981e281f44f..f161c5c83d12 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -415,7 +415,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.10.0 html @@ -581,7 +581,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.10.0 com.microsoft.doclet.DocFxDoclet false diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 0e1973fe5b15..daf3132af9b7 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.10.0 attach-javadocs From bba056b59e923771c35777e1dfcbeb53bb4f257c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 3 Sep 2024 20:04:18 +0200 Subject: [PATCH 663/794] build(deps): update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.5.0 (#894) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index f161c5c83d12..700092073012 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -516,7 +516,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.4.0 + 3.5.0 com.puppycrawl.tools From a2787f8c58a65e3525e3447d0e019e651dad14f8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 3 Sep 2024 20:04:32 +0200 Subject: [PATCH 664/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.7.0 (#893) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 700092073012..83a6760d1aa4 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -388,7 +388,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.6.2 + 3.7.0 From 3a77a03c7a0894ba3173f7f1abee103f714bbc7c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 3 Sep 2024 20:04:51 +0200 Subject: [PATCH 665/794] build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.3 (#891) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 58462df36129..a4173c5a0377 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -22,7 +22,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.3 true From 47b0b332cf7984541b0e258637b8d141ed34ea54 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 3 Sep 2024 20:05:06 +0200 Subject: [PATCH 666/794] build(deps): update dependency org.codehaus.mojo:exec-maven-plugin to v3.4.1 (#879) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 83a6760d1aa4..08304cf266c5 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -61,7 +61,7 @@ org.codehaus.mojo exec-maven-plugin - 3.3.0 + 3.4.1 + 1.11.1-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.11.0 + 1.11.1-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 132ee20c5605..cf1fd9239e2b 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.11.0 + 1.11.1-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index ff320da87542..8d092314f0b1 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.11.0:1.11.0 +google-cloud-shared-config:1.11.0:1.11.1-SNAPSHOT From 29dadcd7d641925615f259925c914c4ce26a8cfa Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 3 Sep 2024 21:38:46 +0200 Subject: [PATCH 671/794] build(deps): update surefire.version to v3.5.0 (#890) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index cf1fd9239e2b..08f01755ac50 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -59,7 +59,7 @@ 24.0.2 - 3.3.1 + 3.5.0 24.0.2 0.10.2 5.11.0 From a9e99aea056ac28cfc85a75a9baeda4097736a58 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 13:15:24 -0400 Subject: [PATCH 672/794] chore(main): release 1.11.1 (#900) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 8 ++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 73d4d725a237..29f10d342c5a 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 03c8a3c27c46..fb65e18302e9 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index f5d723f3a7a6..807b7c8f459d 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 157cd78815b3..af1f4573c623 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [1.11.1](https://github.com/googleapis/java-shared-config/compare/v1.11.0...v1.11.1) (2024-09-03) + + +### Dependencies + +* Update dependency com.puppycrawl.tools:checkstyle to v10.18.1 ([#899](https://github.com/googleapis/java-shared-config/issues/899)) ([47317ef](https://github.com/googleapis/java-shared-config/commit/47317efcc5db0beee90ae20adfd85d51f8c838e7)) +* Update dependency org.junit.vintage:junit-vintage-engine to v5.11.0 ([#882](https://github.com/googleapis/java-shared-config/issues/882)) ([893967e](https://github.com/googleapis/java-shared-config/commit/893967e34347c14c1abcf778893e3b2fe790c215)) + ## [1.11.0](https://github.com/googleapis/java-shared-config/compare/v1.10.0...v1.11.0) (2024-08-16) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 7e001c3d0f03..951797e62aa1 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.11.1-SNAPSHOT + 1.11.1 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.11.1-SNAPSHOT + 1.11.1 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 08f01755ac50..42b94610b201 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.11.1-SNAPSHOT + 1.11.1 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 8d092314f0b1..947b8c65cc2d 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.11.0:1.11.1-SNAPSHOT +google-cloud-shared-config:1.11.1:1.11.1 From 1aefb9385cd098174cbd653fe4fca2a93d3dbe1e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 15:17:02 -0400 Subject: [PATCH 673/794] chore(main): release 1.11.2-SNAPSHOT (#901) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 29f10d342c5a..45b1c96d9c24 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index fb65e18302e9..1c98a09153c1 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 807b7c8f459d..25b3ab028483 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 951797e62aa1..84a8c222b897 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.11.1 + 1.11.2-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.11.1 + 1.11.2-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 42b94610b201..43d9c5d351c4 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.11.1 + 1.11.2-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 947b8c65cc2d..15bcde57f6f7 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.11.1:1.11.1 +google-cloud-shared-config:1.11.1:1.11.2-SNAPSHOT From 7cfb8cc37868cd83ff9619f2130c6df6efb24a75 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 19 Sep 2024 23:34:34 +0200 Subject: [PATCH 674/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.3 (#903) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 43d9c5d351c4..1537e66d9866 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -61,7 +61,7 @@ 24.0.2 3.5.0 24.0.2 - 0.10.2 + 0.10.3 5.11.0 1.3.0 org.graalvm.sdk:nativeimage From 095cdb5f36792866ca3c069d4bbf095a4716598f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 20 Sep 2024 00:25:30 +0200 Subject: [PATCH 675/794] build(deps): update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.6 (#904) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 1537e66d9866..f54ac13719dc 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -148,7 +148,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.5 + 3.2.6 sign-artifacts From 7a59df22896c887bb495df84f04c1025c518bf63 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 20 Sep 2024 00:25:50 +0200 Subject: [PATCH 676/794] deps: update dependency org.graalvm.sdk:graal-sdk to v24.1.0 (#905) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index f54ac13719dc..d278bd127663 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -58,7 +58,7 @@ - 24.0.2 + 24.1.0 3.5.0 24.0.2 0.10.3 From f33a17d92012dd149b953d803dd7c6305c81d01c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 20 Sep 2024 00:26:04 +0200 Subject: [PATCH 677/794] deps: update dependency org.graalvm.sdk:nativeimage to v24.1.0 (#906) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index d278bd127663..c12acfbd4729 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -60,7 +60,7 @@ 24.1.0 3.5.0 - 24.0.2 + 24.1.0 0.10.3 5.11.0 1.3.0 From 61bcc8df52fa674af2a7aa33e284afc73b6d0dc9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 22:56:25 +0000 Subject: [PATCH 678/794] chore(main): release 1.11.2 (#907) :robot: I have created a release *beep* *boop* --- ## [1.11.2](https://togithub.com/googleapis/java-shared-config/compare/v1.11.1...v1.11.2) (2024-09-19) ### Dependencies * Update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.3 ([#903](https://togithub.com/googleapis/java-shared-config/issues/903)) ([7cfb8cc](https://togithub.com/googleapis/java-shared-config/commit/7cfb8cc37868cd83ff9619f2130c6df6efb24a75)) * Update dependency org.graalvm.sdk:graal-sdk to v24.1.0 ([#905](https://togithub.com/googleapis/java-shared-config/issues/905)) ([7a59df2](https://togithub.com/googleapis/java-shared-config/commit/7a59df22896c887bb495df84f04c1025c518bf63)) * Update dependency org.graalvm.sdk:nativeimage to v24.1.0 ([#906](https://togithub.com/googleapis/java-shared-config/issues/906)) ([f33a17d](https://togithub.com/googleapis/java-shared-config/commit/f33a17d92012dd149b953d803dd7c6305c81d01c)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 9 +++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 45b1c96d9c24..85812b395963 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.2' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 1c98a09153c1..adf222579beb 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.2' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 25b3ab028483..ed87e67dda2c 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.2' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index af1f4573c623..4fc1b5b81f8f 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [1.11.2](https://github.com/googleapis/java-shared-config/compare/v1.11.1...v1.11.2) (2024-09-19) + + +### Dependencies + +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.3 ([#903](https://github.com/googleapis/java-shared-config/issues/903)) ([86debb4](https://github.com/googleapis/java-shared-config/commit/86debb4ec4d5aebb746c06b793e91884ce8b0287)) +* Update dependency org.graalvm.sdk:graal-sdk to v24.1.0 ([#905](https://github.com/googleapis/java-shared-config/issues/905)) ([8be882d](https://github.com/googleapis/java-shared-config/commit/8be882de14af7a3bdb8d7f51c18fd66795035f80)) +* Update dependency org.graalvm.sdk:nativeimage to v24.1.0 ([#906](https://github.com/googleapis/java-shared-config/issues/906)) ([9a48630](https://github.com/googleapis/java-shared-config/commit/9a486305ecb77d83ecb1d089e8272108af32d77e)) + ## [1.11.1](https://github.com/googleapis/java-shared-config/compare/v1.11.0...v1.11.1) (2024-09-03) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 84a8c222b897..2ee5a6004f4d 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.11.2-SNAPSHOT + 1.11.2 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.11.2-SNAPSHOT + 1.11.2 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index c12acfbd4729..61ff06a737d8 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.11.2-SNAPSHOT + 1.11.2 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 15bcde57f6f7..2cf3e61ab168 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.11.1:1.11.2-SNAPSHOT +google-cloud-shared-config:1.11.2:1.11.2 From 3d898950790b073f83ee09e4c06d0f76ad65d77c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 01:38:25 +0000 Subject: [PATCH 679/794] chore(main): release 1.11.3-SNAPSHOT (#908) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 85812b395963..13c22361a70b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index adf222579beb..accc89a4f663 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index ed87e67dda2c..367557178b33 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 2ee5a6004f4d..0568d04d0663 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.11.2 + 1.11.3-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.11.2 + 1.11.3-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 61ff06a737d8..eca84eaca753 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.11.2 + 1.11.3-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 2cf3e61ab168..d4cf3ca3c2b4 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.11.2:1.11.2 +google-cloud-shared-config:1.11.2:1.11.3-SNAPSHOT From ce6cb2f0087c86852f572ea225af7703c3ccabf8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 1 Oct 2024 19:30:00 +0200 Subject: [PATCH 680/794] deps: update dependency org.junit.vintage:junit-vintage-engine to v5.11.1 (#910) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index eca84eaca753..069b36757f8a 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -62,7 +62,7 @@ 3.5.0 24.1.0 0.10.3 - 5.11.0 + 5.11.1 1.3.0 org.graalvm.sdk:nativeimage From 2a74d231effaa8bcc26733d319c7c6850773a79f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 1 Oct 2024 19:30:28 +0200 Subject: [PATCH 681/794] build(deps): update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.7 (#912) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 069b36757f8a..ea09b9580eac 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -148,7 +148,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.6 + 3.2.7 sign-artifacts From b440b16e55490d7d86fe5aa2d179fc3716f49754 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 1 Oct 2024 19:33:20 +0200 Subject: [PATCH 682/794] deps: update dependency ubuntu to v24 (#911) --- java-shared-config/.github/workflows/renovate_config_check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/.github/workflows/renovate_config_check.yaml b/java-shared-config/.github/workflows/renovate_config_check.yaml index 7c5ec7865e11..36da117bc7b0 100644 --- a/java-shared-config/.github/workflows/renovate_config_check.yaml +++ b/java-shared-config/.github/workflows/renovate_config_check.yaml @@ -7,7 +7,7 @@ on: jobs: renovate_bot_config_validation: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout code From cdc7611331431c3a0e2ea274ad8498a2a5841b28 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 1 Oct 2024 22:34:50 +0200 Subject: [PATCH 683/794] build(deps): update dependency org.codehaus.mojo:extra-enforcer-rules to v1.9.0 (#909) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 0568d04d0663..85519950f2a0 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -54,7 +54,7 @@ org.codehaus.mojo extra-enforcer-rules - 1.8.0 + 1.9.0 From 0a8d3f7ff709938a81f31a0ffa75cf9eabd53652 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 1 Oct 2024 22:35:15 +0200 Subject: [PATCH 684/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.18.2 (#913) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 85519950f2a0..60f75e5ff67a 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -521,7 +521,7 @@ com.puppycrawl.tools checkstyle - 10.18.1 + 10.18.2 From 1076aa9c4d701648423974a504793f89230a195e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 1 Oct 2024 22:35:40 +0200 Subject: [PATCH 685/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.10.1 (#914) --- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 60f75e5ff67a..4c8cc03481e2 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -415,7 +415,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.0 + 3.10.1 html @@ -581,7 +581,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.0 + 3.10.1 com.microsoft.doclet.DocFxDoclet false diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index ea09b9580eac..1bd45da3f2f8 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.0 + 3.10.1 attach-javadocs From 8274f599e24e1b73be860634819750f43a257959 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 17:33:22 -0400 Subject: [PATCH 686/794] chore(main): release 1.11.3 (#915) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 9 +++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 13c22361a70b..711415753676 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.3' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index accc89a4f663..d333d6671a62 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.3' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 367557178b33..fcc0c6201193 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.11.3' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 4fc1b5b81f8f..4d276118f358 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [1.11.3](https://github.com/googleapis/java-shared-config/compare/v1.11.2...v1.11.3) (2024-10-01) + + +### Dependencies + +* Update dependency com.puppycrawl.tools:checkstyle to v10.18.2 ([#913](https://github.com/googleapis/java-shared-config/issues/913)) ([0144982](https://github.com/googleapis/java-shared-config/commit/014498208f4bb825ae708c1aa07695c554397db2)) +* Update dependency org.junit.vintage:junit-vintage-engine to v5.11.1 ([#910](https://github.com/googleapis/java-shared-config/issues/910)) ([29fa51b](https://github.com/googleapis/java-shared-config/commit/29fa51b59e161db6eaded919552c2fd119a8fd5d)) +* Update dependency ubuntu to v24 ([#911](https://github.com/googleapis/java-shared-config/issues/911)) ([e69e1dd](https://github.com/googleapis/java-shared-config/commit/e69e1ddfd512b17da240386e7778f0e08822a159)) + ## [1.11.2](https://github.com/googleapis/java-shared-config/compare/v1.11.1...v1.11.2) (2024-09-19) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 4c8cc03481e2..0caf261636da 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.11.3-SNAPSHOT + 1.11.3 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.11.3-SNAPSHOT + 1.11.3 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 1bd45da3f2f8..8d2c327bb2c3 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.11.3-SNAPSHOT + 1.11.3 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index d4cf3ca3c2b4..ead890773330 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.11.2:1.11.3-SNAPSHOT +google-cloud-shared-config:1.11.3:1.11.3 From ac4dd079de72695ff19bfca94b10fa93d1c5aeb9 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Thu, 10 Oct 2024 13:50:54 -0400 Subject: [PATCH 687/794] chore: add options.logging in cloud build trigger configs (#921) --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 ++ java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 5 ++++- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 711415753676..c5e4c314f6fd 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -32,3 +32,5 @@ steps: args: [ './.kokoro/presubmit/downstream-build.sh' ] waitFor: [ "graalvm-a-build" ] +options: + logging: CLOUD_LOGGING_ONLY diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index d333d6671a62..c1a0b1e899ee 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -30,4 +30,7 @@ steps: - name: gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION} entrypoint: bash args: [ './.kokoro/presubmit/downstream-build.sh' ] - waitFor: [ "graalvm-b-build" ] \ No newline at end of file + waitFor: [ "graalvm-b-build" ] + +options: + logging: CLOUD_LOGGING_ONLY \ No newline at end of file diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index fcc0c6201193..7094b404e230 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -43,6 +43,8 @@ steps: [ "-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-b.yaml", "-v" ] waitFor: [ "graalvm-b-build" ] +options: + logging: CLOUD_LOGGING_ONLY images: - gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION} From e07461f3460f6494a3fa55ae123755cbd50382bb Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Wed, 6 Nov 2024 16:12:32 -0500 Subject: [PATCH 688/794] feat: publish graalvm images to new java-graalvm-ci-prod project (#922) --- .../.cloudbuild/cloudbuild-test-a.yaml | 6 +++--- .../.cloudbuild/cloudbuild-test-b.yaml | 6 +++--- .../.cloudbuild/cloudbuild.yaml | 20 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index c5e4c314f6fd..eee3c0906c3a 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -19,15 +19,15 @@ substitutions: steps: # GraalVM A build - name: gcr.io/cloud-builders/docker - args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-a.Dockerfile", "."] + args: ["build", "-t", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-a.Dockerfile", "."] dir: .cloudbuild id: graalvm-a-build waitFor: ["-"] - name: gcr.io/gcp-runtimes/structure_test args: - ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-a.yaml", "-v"] + ["-i", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-a.yaml", "-v"] waitFor: ["graalvm-a-build"] - - name: gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION} + - name: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION} entrypoint: bash args: [ './.kokoro/presubmit/downstream-build.sh' ] waitFor: [ "graalvm-a-build" ] diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index c1a0b1e899ee..46b3830fef4f 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -19,15 +19,15 @@ substitutions: steps: # GraalVM B build - name: gcr.io/cloud-builders/docker - args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-b.Dockerfile", "."] + args: ["build", "-t", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-b.Dockerfile", "."] dir: .cloudbuild id: graalvm-b-build waitFor: ["-"] - name: gcr.io/gcp-runtimes/structure_test args: - ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-b.yaml", "-v"] + ["-i", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-b.yaml", "-v"] waitFor: ["graalvm-b-build"] - - name: gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION} + - name: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION} entrypoint: bash args: [ './.kokoro/presubmit/downstream-build.sh' ] waitFor: [ "graalvm-b-build" ] diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 7094b404e230..b436755bc565 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -19,35 +19,35 @@ steps: # GraalVM A build - name: gcr.io/cloud-builders/docker args: ["build", - "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", - "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:infrastructure-public-image-$SHORT_SHA", + "-t", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", + "-t", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:infrastructure-public-image-$SHORT_SHA", "--file", "graalvm-a.Dockerfile", "."] dir: .cloudbuild id: graalvm-a-build waitFor: ["-"] - name: gcr.io/gcp-runtimes/structure_test args: - ["-i", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-a.yaml", "-v"] + ["-i", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-a.yaml", "-v"] waitFor: ["graalvm-a-build"] # GraalVM B build - name: gcr.io/cloud-builders/docker - args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", - "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:infrastructure-public-image-$SHORT_SHA", + args: [ "build", "-t", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", + "-t", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:infrastructure-public-image-$SHORT_SHA", "--file", "graalvm-b.Dockerfile", "." ] dir: .cloudbuild id: graalvm-b-build waitFor: [ "-" ] - name: gcr.io/gcp-runtimes/structure_test args: - [ "-i", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-b.yaml", "-v" ] + [ "-i", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-b.yaml", "-v" ] waitFor: [ "graalvm-b-build" ] options: logging: CLOUD_LOGGING_ONLY images: - - gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION} - - gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION} - - gcr.io/cloud-devrel-public-resources/graalvm_a:infrastructure-public-image-$SHORT_SHA - - gcr.io/cloud-devrel-public-resources/graalvm_b:infrastructure-public-image-$SHORT_SHA + - us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION} + - us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION} + - us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:infrastructure-public-image-$SHORT_SHA + - us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:infrastructure-public-image-$SHORT_SHA From 40022456024b6ea3d3aa267e074d6af568d53b08 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 11 Nov 2024 17:14:08 +0100 Subject: [PATCH 689/794] build(deps): update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.6.0 (#927) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 0caf261636da..3fb9227d2679 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -516,7 +516,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.5.0 + 3.6.0 com.puppycrawl.tools From 6c438629822aa7cc72cfb517b8901e4aae857731 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 11 Nov 2024 19:02:39 -0500 Subject: [PATCH 690/794] feat: Maven profile for Airlock (#928) * feat: Maven profile for Airlock b/356854847 --- java-shared-config/java-shared-config/pom.xml | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 3fb9227d2679..5bf767ee42c3 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -381,6 +381,18 @@ + + + + com.google.cloud.artifactregistry + artifactregistry-maven-wagon + 2.2.3 + + @@ -658,5 +670,36 @@ 8 + + + airlock-trusted + + + airlock + Airlock + artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p-trusted + default + + true + + + true + + + + central + + Maven Central remote repository + https://repo1.maven.org/maven2 + default + + false + + + false + + + + From 859b5181f48e5fe0bbf399323a7ac16f4ae5586b Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Nov 2024 20:18:10 +0100 Subject: [PATCH 691/794] deps: update dependency org.graalvm.sdk:nativeimage to v24.1.1 (#924) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 8d2c327bb2c3..af1a48c7a8d9 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -60,7 +60,7 @@ 24.1.0 3.5.0 - 24.1.0 + 24.1.1 0.10.3 5.11.1 1.3.0 From ae17d321842df809fa9c1db19aa91cde69af2bfa Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Nov 2024 20:19:19 +0100 Subject: [PATCH 692/794] deps: update dependency org.graalvm.sdk:graal-sdk to v24.1.1 (#923) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index af1a48c7a8d9..13dd1aa1765b 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -58,7 +58,7 @@ - 24.1.0 + 24.1.1 3.5.0 24.1.1 0.10.3 From 387c25fefc1c9c1056a34777628905f33c7a26df Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Nov 2024 21:43:06 +0100 Subject: [PATCH 693/794] build(deps): update dependency org.apache.maven.plugins:maven-jxr-plugin to v3.6.0 (#930) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 5bf767ee42c3..7be10d5124cb 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -468,7 +468,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.5.0 + 3.6.0 true From a22407f98d1ff56ffe69c74b65c2ed9f2f202bad Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Nov 2024 21:46:07 +0100 Subject: [PATCH 694/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.11.1 (#929) --- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 7be10d5124cb..5cb4e798c938 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -427,7 +427,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.11.1 html @@ -593,7 +593,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.11.1 com.microsoft.doclet.DocFxDoclet false diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 13dd1aa1765b..c5c7d012b5cb 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.10.1 + 3.11.1 attach-javadocs From 27b33cc4dd2c43e7e11c6ad23ecd7d6694f13fec Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Nov 2024 21:46:35 +0100 Subject: [PATCH 695/794] build(deps): update surefire.version to v3.5.2 (#918) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index c5c7d012b5cb..2d5facafd2a2 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -59,7 +59,7 @@ 24.1.1 - 3.5.0 + 3.5.2 24.1.1 0.10.3 5.11.1 From e559c7c9f87b3e9511709ab19ed7af524614b4f1 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Nov 2024 21:46:58 +0100 Subject: [PATCH 696/794] build(deps): update dependency org.apache.maven.plugins:maven-dependency-plugin to v3.8.1 (#892) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 5cb4e798c938..5d50e4b24b55 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -140,7 +140,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.5.0 + 3.8.1 javax.annotation:javax.annotation-api From 996ddad738ee2849ee3e182fcf4b4a7ee54b5b3f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Nov 2024 21:51:42 +0100 Subject: [PATCH 697/794] build(deps): update dependency org.apache.maven.plugins:maven-site-plugin to v3.21.0 (#926) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 5d50e4b24b55..794abe29cde2 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -127,7 +127,7 @@ org.apache.maven.plugins maven-site-plugin - 3.20.0 + 3.21.0 true From 4fba02f1a4f461c9c5b1a59760f12b1ad65e8af3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Nov 2024 21:53:21 +0100 Subject: [PATCH 698/794] deps: update actions/checkout digest to 11bd719 (#919) --- .../.github/workflows/downstream-dependencies.yaml | 4 ++-- .../.github/workflows/downstream-maven-plugins.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java-shared-config/.github/workflows/downstream-dependencies.yaml b/java-shared-config/.github/workflows/downstream-dependencies.yaml index 5c9c372a53c6..77f38eb9f18b 100644 --- a/java-shared-config/.github/workflows/downstream-dependencies.yaml +++ b/java-shared-config/.github/workflows/downstream-dependencies.yaml @@ -18,7 +18,7 @@ jobs: - java-storage - java-pubsub steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - uses: actions/setup-java@v4 with: distribution: zulu @@ -31,7 +31,7 @@ jobs: flatten-plugin-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - uses: actions/setup-java@v4 with: distribution: zulu diff --git a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml index ac9a5afa081c..850f42efc7f6 100644 --- a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml +++ b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml @@ -25,7 +25,7 @@ jobs: - javadoc # maven-javadoc-plugin - javadoc-with-doclet # test javadoc generation with doclet steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - uses: actions/setup-java@v4 with: distribution: zulu @@ -54,7 +54,7 @@ jobs: - java-datastore - java-bigquerystorage steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - uses: actions/setup-java@v4 with: distribution: temurin From 67ae74c79803a6ceaed0671fe83da3d84a45e7c3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Nov 2024 22:14:48 +0100 Subject: [PATCH 699/794] build(deps): update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.8.0 (#925) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 794abe29cde2..9015c34d4e4c 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -400,7 +400,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.7.0 + 3.8.0 From 38441f77adc6cf3b75fe0dea12b557f4b16d64a3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Nov 2024 22:33:28 +0100 Subject: [PATCH 700/794] deps: update dependency org.junit.vintage:junit-vintage-engine to v5.11.3 (#917) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 2d5facafd2a2..f729483c94c4 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -62,7 +62,7 @@ 3.5.2 24.1.1 0.10.3 - 5.11.1 + 5.11.3 1.3.0 org.graalvm.sdk:nativeimage From 8bc4e90d5be095ecd5aefe3ca9911a18e362f4a3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 12 Nov 2024 23:01:33 +0100 Subject: [PATCH 701/794] build(deps): update dependency org.codehaus.mojo:exec-maven-plugin to v3.5.0 (#931) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 9015c34d4e4c..3b299797e74d 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -61,7 +61,7 @@ org.codehaus.mojo exec-maven-plugin - 3.4.1 + 3.5.0 + 1.11.4-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.11.3 + 1.11.4-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index f729483c94c4..ccca47ddbe65 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.11.3 + 1.11.4-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index ead890773330..f575a4ae2bef 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.11.3:1.11.3 +google-cloud-shared-config:1.11.3:1.11.4-SNAPSHOT From 0fe48b1112a225a124d5801a3a7dde2288592084 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 21:21:52 -0500 Subject: [PATCH 704/794] chore(main): release 1.12.0 (#933) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .../.cloudbuild/cloudbuild-test-a.yaml | 2 +- .../.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 17 +++++++++++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- .../native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 24 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 1ec0adc3ef99..711b7d1a073e 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index f0fdde82ae0c..19094e7f4496 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 34b0696fda8f..46f22eeca764 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.11.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 4d276118f358..64706540c580 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [1.12.0](https://github.com/googleapis/java-shared-config/compare/v1.11.3...v1.12.0) (2024-11-13) + + +### Features + +* Maven profile for Airlock ([#928](https://github.com/googleapis/java-shared-config/issues/928)) ([10da584](https://github.com/googleapis/java-shared-config/commit/10da5843f6c3fa50c3fff4a4fd01326a1cc68158)) +* Publish graalvm images to new java-graalvm-ci-prod project ([#922](https://github.com/googleapis/java-shared-config/issues/922)) ([69ccd0f](https://github.com/googleapis/java-shared-config/commit/69ccd0f0dce6d4b3b01ac067000007292d7fff95)) + + +### Dependencies + +* Update actions/checkout digest to 11bd719 ([#919](https://github.com/googleapis/java-shared-config/issues/919)) ([eb0ae86](https://github.com/googleapis/java-shared-config/commit/eb0ae8622b330045efd76cf6d14f0a9b79071fd7)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.20.1 ([#932](https://github.com/googleapis/java-shared-config/issues/932)) ([ba72db5](https://github.com/googleapis/java-shared-config/commit/ba72db54f809e8a1dbed4f70736328e3f6bf06ee)) +* Update dependency org.graalvm.sdk:graal-sdk to v24.1.1 ([#923](https://github.com/googleapis/java-shared-config/issues/923)) ([b22170a](https://github.com/googleapis/java-shared-config/commit/b22170a8fb8fddfb79927ab98cb2e299152cbc8e)) +* Update dependency org.graalvm.sdk:nativeimage to v24.1.1 ([#924](https://github.com/googleapis/java-shared-config/issues/924)) ([fa97ca8](https://github.com/googleapis/java-shared-config/commit/fa97ca825159016aee31dbac7e9967a572b02a33)) +* Update dependency org.junit.vintage:junit-vintage-engine to v5.11.3 ([#917](https://github.com/googleapis/java-shared-config/issues/917)) ([13766a3](https://github.com/googleapis/java-shared-config/commit/13766a3837c647398f2c8fea6a3b089287f07a25)) + ## [1.11.3](https://github.com/googleapis/java-shared-config/compare/v1.11.2...v1.11.3) (2024-10-01) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index c1099dab60b6..dace2f4ec9bd 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.11.4-SNAPSHOT + 1.12.0 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.11.4-SNAPSHOT + 1.12.0 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index ccca47ddbe65..1fbc6442ae04 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.11.4-SNAPSHOT + 1.12.0 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index f575a4ae2bef..1fe25cddd0c4 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.11.3:1.11.4-SNAPSHOT +google-cloud-shared-config:1.12.0:1.12.0 From ae1afd47409512cbf9e9c9720feaac4bd5ec6bdd Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 21:49:20 -0500 Subject: [PATCH 705/794] chore(main): release 1.12.1-SNAPSHOT (#934) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 711b7d1a073e..91beed6ca229 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 19094e7f4496..f4c321ee3228 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 46f22eeca764..5f5409a4e6b5 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index dace2f4ec9bd..b07edb1df969 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.12.0 + 1.12.1-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.12.0 + 1.12.1-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 1fbc6442ae04..9073934caa51 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.12.0 + 1.12.1-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 1fe25cddd0c4..feb002066b5b 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.12.0:1.12.0 +google-cloud-shared-config:1.12.0:1.12.1-SNAPSHOT From 6fafd93e7aff2bb5a406320446dd826474d45359 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 26 Nov 2024 10:01:12 -0500 Subject: [PATCH 706/794] ci: sync-repo-settings.yaml to point to java-graalvm-ci-prod (#937) --- java-shared-config/.github/sync-repo-settings.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index 6d24843d1e31..bfe5bfbfc7f5 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -49,8 +49,8 @@ branchProtectionRules: - "build (11, java-bigtable, javadoc)" - "javadoc-with-doclet (java-bigtable)" - "cla/google" - - "graalvm-presubmit-shared-config-a (cloud-devrel-kokoro-resources)" - - "graalvm-presubmit-shared-config-b (cloud-devrel-kokoro-resources)" + - "graalvm-presubmit-shared-config-a (java-graalvm-ci-prod)" + - "graalvm-presubmit-shared-config-b (java-graalvm-ci-prod)" - pattern: java7 # Can admins overwrite branch protection. # Defaults to `true` From b522dd109fed5e80dee52d8e66d7b731b00dc4ac Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 26 Nov 2024 11:02:03 -0500 Subject: [PATCH 707/794] ci: Maven profile for Artifact Registry release (#936) * ci: profile for Artifact Registry release --- java-shared-config/java-shared-config/pom.xml | 12 --- .../native-image-shared-config/pom.xml | 92 ++++++++++++++----- 2 files changed, 69 insertions(+), 35 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index b07edb1df969..bff7fa06cb7b 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -381,18 +381,6 @@ - - - - com.google.cloud.artifactregistry - artifactregistry-maven-wagon - 2.2.3 - - diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 9073934caa51..1936648c536c 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -81,32 +81,78 @@ - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - true - - ossrh - https://google.oss.sonatype.org/ - false - 15 - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - + + + + com.google.cloud.artifactregistry + artifactregistry-maven-wagon + 2.2.3 + + + + + release-sonatype + + true + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.7.0 + true + + ossrh + https://google.oss.sonatype.org/ + false + 15 + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + + + + + release-gcp-artifact-registry + + false + + + artifactregistry://undefined-artifact-registry-url-value + + + + gcp-artifact-registry-repository + ${artifact-registry-url} + + + gcp-artifact-registry-repository + ${artifact-registry-url} + + + release From a2db423f89cf417d8ec93f6378e7fb5d7acd04c3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 9 Dec 2024 16:59:02 +0100 Subject: [PATCH 708/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.4 (#939) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 1936648c536c..55b3fc1a09ff 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -61,7 +61,7 @@ 24.1.1 3.5.2 24.1.1 - 0.10.3 + 0.10.4 5.11.3 1.3.0 org.graalvm.sdk:nativeimage From 02aeae2a85c23418191ce1c5066fa89f4f667829 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 9 Dec 2024 16:59:16 +0100 Subject: [PATCH 709/794] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.11.2 (#940) --- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index bff7fa06cb7b..198947a15db8 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -415,7 +415,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.1 + 3.11.2 html @@ -581,7 +581,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.1 + 3.11.2 com.microsoft.doclet.DocFxDoclet false diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 55b3fc1a09ff..293c662c5322 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -178,7 +178,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.11.1 + 3.11.2 attach-javadocs From 8ae36135c5912a4989e9b40829878a8a846e4efc Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 9 Dec 2024 17:09:19 +0100 Subject: [PATCH 710/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.20.2 (#938) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 198947a15db8..eee94214c335 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -521,7 +521,7 @@ com.puppycrawl.tools checkstyle - 10.20.1 + 10.20.2 From 1cc1aad047bda47e4d3e8f2d9046ed18302c5642 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:07:45 -0500 Subject: [PATCH 711/794] chore(main): release 1.12.1 (#941) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 8 ++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 91beed6ca229..9d01e4b23f84 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index f4c321ee3228..f86858d58811 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 5f5409a4e6b5..00bc76cbd145 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 64706540c580..9008614500ed 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [1.12.1](https://github.com/googleapis/java-shared-config/compare/v1.12.0...v1.12.1) (2024-12-09) + + +### Dependencies + +* Update dependency com.puppycrawl.tools:checkstyle to v10.20.2 ([#938](https://github.com/googleapis/java-shared-config/issues/938)) ([d5c3385](https://github.com/googleapis/java-shared-config/commit/d5c3385396815bcd57f5717b5e2db22185cf223c)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.4 ([#939](https://github.com/googleapis/java-shared-config/issues/939)) ([1c5920c](https://github.com/googleapis/java-shared-config/commit/1c5920c3cdca5163b4290ec85b3c1d804377e3e1)) + ## [1.12.0](https://github.com/googleapis/java-shared-config/compare/v1.11.3...v1.12.0) (2024-11-13) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index eee94214c335..aae293da4f12 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.12.1-SNAPSHOT + 1.12.1 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.12.1-SNAPSHOT + 1.12.1 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 293c662c5322..72e6dd8f58e2 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.12.1-SNAPSHOT + 1.12.1 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index feb002066b5b..2f80fa5754c6 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.12.0:1.12.1-SNAPSHOT +google-cloud-shared-config:1.12.1:1.12.1 From 388f9783a54145a5d6968cf6407664b976030d8c Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 10 Dec 2024 09:31:54 -0500 Subject: [PATCH 712/794] Revert "ci: Maven profile for Artifact Registry release (#936)" (#949) This reverts commit b522dd109fed5e80dee52d8e66d7b731b00dc4ac. --- java-shared-config/java-shared-config/pom.xml | 12 +++ .../native-image-shared-config/pom.xml | 92 +++++-------------- 2 files changed, 35 insertions(+), 69 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index aae293da4f12..df04af97341d 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -381,6 +381,18 @@ + + + + com.google.cloud.artifactregistry + artifactregistry-maven-wagon + 2.2.3 + + diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 72e6dd8f58e2..147f23daba56 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -81,78 +81,32 @@ + - - - - com.google.cloud.artifactregistry - artifactregistry-maven-wagon - 2.2.3 - - + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.7.0 + true + + ossrh + https://google.oss.sonatype.org/ + false + 15 + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + - - - release-sonatype - - true - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - true - - ossrh - https://google.oss.sonatype.org/ - false - 15 - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - - - - - - release-gcp-artifact-registry - - false - - - artifactregistry://undefined-artifact-registry-url-value - - - - gcp-artifact-registry-repository - ${artifact-registry-url} - - - gcp-artifact-registry-repository - ${artifact-registry-url} - - - release From 4770f0e708022144e63e72e8490ef576a9f13791 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 10:01:20 -0500 Subject: [PATCH 713/794] chore(main): release 1.12.2-SNAPSHOT (#942) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 9d01e4b23f84..0cbe20ae7a98 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index f86858d58811..3b1787a92bfc 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 00bc76cbd145..e5b5b5ed394c 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index df04af97341d..9b5c361d4eeb 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.12.1 + 1.12.2-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.12.1 + 1.12.2-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 147f23daba56..d21602e15ef9 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.12.1 + 1.12.2-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 2f80fa5754c6..5d0b874aaf48 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.12.1:1.12.1 +google-cloud-shared-config:1.12.1:1.12.2-SNAPSHOT From 6ac8d0b159a5d9df6f9219acfc4637704da097dd Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 10 Dec 2024 13:09:49 -0500 Subject: [PATCH 714/794] fix: fixed the profile for Artifact Registry deployment (#950) The java-shared-config repository was able to publish the artifacts to my Artifact Registry: mvn deploy -P=release-gcp-artifact-registry -P=-release-sonatype \ -P=-release-staging-repository -Dartifact-registry-url=artifactregistry://us-maven.pkg.dev/... --- java-shared-config/java-shared-config/pom.xml | 12 ---- .../native-image-shared-config/pom.xml | 60 +++++++++++++++++-- 2 files changed, 54 insertions(+), 18 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 9b5c361d4eeb..b8b5dc5e8001 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -381,18 +381,6 @@ - - - - com.google.cloud.artifactregistry - artifactregistry-maven-wagon - 2.2.3 - - diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index d21602e15ef9..5058a5f195ca 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -99,14 +99,62 @@ - - - org.sonatype.plugins - nexus-staging-maven-plugin - - + + + + com.google.cloud.artifactregistry + artifactregistry-maven-wagon + 2.2.3 + + + + + release-sonatype + + + + !artifact-registry-url + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + + + + + release-gcp-artifact-registry + + artifactregistry://undefined-artifact-registry-url-value + + + + gcp-artifact-registry-repository + ${artifact-registry-url} + + + gcp-artifact-registry-repository + ${artifact-registry-url} + + + release From 1801100c5ac7fd818c237d287639e653d509d9fc Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 13:45:12 -0500 Subject: [PATCH 715/794] chore(main): release 1.12.2 (#951) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 0cbe20ae7a98..4d94c25dfe92 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.2' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 3b1787a92bfc..0cc6c0110cde 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.2' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index e5b5b5ed394c..78ff6c5e2331 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.2' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 9008614500ed..c6b159bcf22b 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.12.2](https://github.com/googleapis/java-shared-config/compare/v1.12.1...v1.12.2) (2024-12-10) + + +### Bug Fixes + +* Fixed the profile for Artifact Registry deployment ([#950](https://github.com/googleapis/java-shared-config/issues/950)) ([8a496d3](https://github.com/googleapis/java-shared-config/commit/8a496d3c4efafee21c07ebca0836657882e76b2e)) + ## [1.12.1](https://github.com/googleapis/java-shared-config/compare/v1.12.0...v1.12.1) (2024-12-09) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index b8b5dc5e8001..2787ea4df5b3 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.12.2-SNAPSHOT + 1.12.2 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.12.2-SNAPSHOT + 1.12.2 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 5058a5f195ca..3ab12b7d641e 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.12.2-SNAPSHOT + 1.12.2 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 5d0b874aaf48..7bfada6b96c3 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.12.1:1.12.2-SNAPSHOT +google-cloud-shared-config:1.12.2:1.12.2 From 4daeb986a4e7d15d929d4085692fface692abaf9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 14:55:26 -0500 Subject: [PATCH 716/794] chore(main): release 1.12.3-SNAPSHOT (#952) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 4d94c25dfe92..b2f0e6d328be 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 0cc6c0110cde..2f85365482ce 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 78ff6c5e2331..fd34a81f8bb9 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 2787ea4df5b3..58cafd3c6512 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.12.2 + 1.12.3-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.12.2 + 1.12.3-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 3ab12b7d641e..9389e1f5972e 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.12.2 + 1.12.3-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 7bfada6b96c3..898bd9b15561 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.12.2:1.12.2 +google-cloud-shared-config:1.12.2:1.12.3-SNAPSHOT From 6be9e6f89ddb6a8484977ad9fb9ca3fd26fe13fb Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 6 Jan 2025 17:27:59 +0100 Subject: [PATCH 717/794] deps: update dependency org.junit.vintage:junit-vintage-engine to v5.11.4 (#954) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 9389e1f5972e..3c740c8c9782 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -62,7 +62,7 @@ 3.5.2 24.1.1 0.10.4 - 5.11.3 + 5.11.4 1.3.0 org.graalvm.sdk:nativeimage From 164f7dd45eda30f2eaa3046e90533a6cbf94ef12 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 6 Jan 2025 19:08:31 +0100 Subject: [PATCH 718/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.21.1 (#953) --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 58cafd3c6512..93d660b1142c 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -521,7 +521,7 @@ com.puppycrawl.tools checkstyle - 10.20.2 + 10.21.1 From b6ca4adf8b0eef1fe47c5f15c385c24fe23ed592 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 6 Jan 2025 19:12:48 +0100 Subject: [PATCH 719/794] deps: update dependency com.google.cloud.artifactregistry:artifactregistry-maven-wagon to v2.2.4 (#945) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 3c740c8c9782..2728dcf18cc2 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -108,7 +108,7 @@ --> com.google.cloud.artifactregistry artifactregistry-maven-wagon - 2.2.3 + 2.2.4 From 72dd6a01f822b9910cd5cdc07a3a73cd73570f20 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 14:57:54 -0500 Subject: [PATCH 720/794] chore(main): release 1.12.3 (#955) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 9 +++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index b2f0e6d328be..b9384900d691 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.3' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 2f85365482ce..10d77ad1568a 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.3' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index fd34a81f8bb9..8412fd4c9d1b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.3' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index c6b159bcf22b..8b4a4ee2fa9f 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [1.12.3](https://github.com/googleapis/java-shared-config/compare/v1.12.2...v1.12.3) (2025-01-06) + + +### Dependencies + +* Update dependency com.google.cloud.artifactregistry:artifactregistry-maven-wagon to v2.2.4 ([#945](https://github.com/googleapis/java-shared-config/issues/945)) ([279bff2](https://github.com/googleapis/java-shared-config/commit/279bff267c8e1ce899a0c00cee72b3cd44c85f91)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.21.1 ([#953](https://github.com/googleapis/java-shared-config/issues/953)) ([10c198d](https://github.com/googleapis/java-shared-config/commit/10c198dc1c0976a29997569bbd2add64564c0579)) +* Update dependency org.junit.vintage:junit-vintage-engine to v5.11.4 ([#954](https://github.com/googleapis/java-shared-config/issues/954)) ([c4e0159](https://github.com/googleapis/java-shared-config/commit/c4e0159d4bf7cf2d561b8bda9ef335c59966bec8)) + ## [1.12.2](https://github.com/googleapis/java-shared-config/compare/v1.12.1...v1.12.2) (2024-12-10) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 93d660b1142c..948850ab6cea 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.12.3-SNAPSHOT + 1.12.3 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.12.3-SNAPSHOT + 1.12.3 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 2728dcf18cc2..1920a40ff4cb 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.12.3-SNAPSHOT + 1.12.3 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 898bd9b15561..9361c95d1154 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.12.2:1.12.3-SNAPSHOT +google-cloud-shared-config:1.12.3:1.12.3 From e29c889078adbe1f7b53fec66eca6d0fe9ddce51 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 7 Jan 2025 09:55:42 -0500 Subject: [PATCH 721/794] feat: ability to avoid CLIRR dependency resolution (#959) --- java-shared-config/java-shared-config/pom.xml | 48 +++++++++++++------ 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 948850ab6cea..912563bd9daf 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -345,21 +345,6 @@ - - org.codehaus.mojo - clirr-maven-plugin - - clirr-ignored-differences.xml - true - - - - - check - - - - org.codehaus.mojo animal-sniffer-maven-plugin @@ -689,5 +674,38 @@ + + clirr-compatibility-check + + + + [1.8,) + + + + + org.codehaus.mojo + clirr-maven-plugin + + clirr-ignored-differences.xml + true + + + + + check + + + + + + + From b97cfed9480e0a5ac4bd0cfbcd8b878cb288287c Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 7 Jan 2025 10:20:56 -0500 Subject: [PATCH 722/794] deps: declare Maven clean and install plugins versions (#960) The Airlock only works new versions of these plugins --- java-shared-config/java-shared-config/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 912563bd9daf..bfd708404dcb 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -213,6 +213,16 @@ + + org.apache.maven.plugins + maven-clean-plugin + 3.4.0 + + + org.apache.maven.plugins + maven-install-plugin + 3.1.3 + From 2340d5c634342bd5e84ff269c15322652c279f54 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:32:21 +0000 Subject: [PATCH 723/794] chore(main): release 1.12.4-SNAPSHOT (#957) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index b9384900d691..02c2fbb1a139 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.3' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 10d77ad1568a..884585ddf0fe 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.3' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 8412fd4c9d1b..2d20b7b9c03f 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.3' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.12.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index bfd708404dcb..aef5e0ea8345 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.12.3 + 1.12.4-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.12.3 + 1.12.4-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 1920a40ff4cb..2861618fac12 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.12.3 + 1.12.4-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 9361c95d1154..e51ff14bae32 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.12.3:1.12.3 +google-cloud-shared-config:1.12.3:1.12.4-SNAPSHOT From 5d7881df47f07ef7e31aee2e82c6af6f27d8029b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:54:22 +0000 Subject: [PATCH 724/794] chore(main): release 1.13.0 (#961) :robot: I have created a release *beep* *boop* --- ## [1.13.0](https://togithub.com/googleapis/java-shared-config/compare/v1.12.3...v1.13.0) (2025-01-07) ### Features * Ability to avoid CLIRR dependency resolution ([#959](https://togithub.com/googleapis/java-shared-config/issues/959)) ([e29c889](https://togithub.com/googleapis/java-shared-config/commit/e29c889078adbe1f7b53fec66eca6d0fe9ddce51)) ### Dependencies * Declare Maven clean and install plugins versions ([#960](https://togithub.com/googleapis/java-shared-config/issues/960)) ([b97cfed](https://togithub.com/googleapis/java-shared-config/commit/b97cfed9480e0a5ac4bd0cfbcd8b878cb288287c)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- .../.cloudbuild/cloudbuild-test-a.yaml | 2 +- .../.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 12 ++++++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- .../native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 19 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 02c2fbb1a139..88c284af787a 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.13.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 884585ddf0fe..f7527daceac4 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.13.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 2d20b7b9c03f..4853439e3528 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.12.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.13.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 8b4a4ee2fa9f..ff8a0e4191b0 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.13.0](https://github.com/googleapis/java-shared-config/compare/v1.12.3...v1.13.0) (2025-01-07) + + +### Features + +* Ability to avoid CLIRR dependency resolution ([#959](https://github.com/googleapis/java-shared-config/issues/959)) ([50198dd](https://github.com/googleapis/java-shared-config/commit/50198dd2f809752f1e483650a134f4439840f7c7)) + + +### Dependencies + +* Declare Maven clean and install plugins versions ([#960](https://github.com/googleapis/java-shared-config/issues/960)) ([22c5fa5](https://github.com/googleapis/java-shared-config/commit/22c5fa5740d4a077121d33bfeb556949fcb4a7e6)) + ## [1.12.3](https://github.com/googleapis/java-shared-config/compare/v1.12.2...v1.12.3) (2025-01-06) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index aef5e0ea8345..ec51aa93dd3d 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.12.4-SNAPSHOT + 1.13.0 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.12.4-SNAPSHOT + 1.13.0 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 2861618fac12..06184f27f3c6 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.12.4-SNAPSHOT + 1.13.0 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index e51ff14bae32..ac0a38a090af 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.12.3:1.12.4-SNAPSHOT +google-cloud-shared-config:1.13.0:1.13.0 From 55d891e1415914daaba308a772e7d29bf2dfa782 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Mon, 13 Jan 2025 17:01:34 +0000 Subject: [PATCH 725/794] chore: temporarily disable auto value dependency updates until after LTS release (#965) --- java-shared-config/renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index d740036f5aba..2a13846cd26f 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -13,6 +13,12 @@ "ignorePaths": [".kokoro/requirements.txt"], "ignoreDeps": ["org.codehaus.mojo:flatten-maven-plugin"], "packageRules": [ + { + "packagePatterns": [ + "^com.google.auto.value:" + ], + "enabled": false + }, { "packagePatterns": [ "*" From df545aeb5dc4afcfbf4117c4614bd1b54951b422 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 17 Jan 2025 10:09:06 -0500 Subject: [PATCH 726/794] chore(main): release 1.13.1-SNAPSHOT (#962) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 88c284af787a..9596e25b7a61 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.13.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.13.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index f7527daceac4..e06722b77502 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.13.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.13.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 4853439e3528..1e2397b6443b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.13.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.13.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index ec51aa93dd3d..82e917d85b76 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.13.0 + 1.13.1-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.13.0 + 1.13.1-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 06184f27f3c6..0b7ad7ce0417 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.13.0 + 1.13.1-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index ac0a38a090af..26f0ba3f7dca 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.13.0:1.13.0 +google-cloud-shared-config:1.13.0:1.13.1-SNAPSHOT From d0d935fe83f951e0cfccfa8e84c4fc466f23def0 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Fri, 24 Jan 2025 14:02:49 -0500 Subject: [PATCH 727/794] chore: update GraalVM image B to GraalVM for JDK 23 (#967) * chore: update GraalVM image B to GraalVM for JDK 23 * fix dockerfile based on https://github.com/googleapis/java-shared-config/pull/877/files * upgrade graalvm b yaml --- .../.cloudbuild/graalvm-b.Dockerfile | 20 +++++++++++-------- java-shared-config/.cloudbuild/graalvm-b.yaml | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/java-shared-config/.cloudbuild/graalvm-b.Dockerfile b/java-shared-config/.cloudbuild/graalvm-b.Dockerfile index 743c53b23103..9f1dde1b2cc0 100644 --- a/java-shared-config/.cloudbuild/graalvm-b.Dockerfile +++ b/java-shared-config/.cloudbuild/graalvm-b.Dockerfile @@ -12,11 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ghcr.io/graalvm/graalvm-ce:ol7-java17-22.3.3-b1 +FROM ghcr.io/graalvm/graalvm-community:23.0.1-ol9-20241015 -RUN gu install native-image && \ - yum update -y && \ - yum install -y wget unzip git && \ +# native-image comes out of the box +RUN native-image --version + +RUN microdnf update -y oraclelinux-release-el9 && \ + microdnf install -y wget unzip git && \ # Install maven wget -q https://archive.apache.org/dist/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.zip -O /tmp/maven.zip && \ unzip /tmp/maven.zip -d /tmp/maven && \ @@ -28,20 +30,22 @@ ENV PATH $PATH:/usr/local/lib/maven/bin # Install gcloud SDK COPY google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo -RUN yum install -y google-cloud-sdk +RUN microdnf install -y google-cloud-sdk # Adding the package path to local ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin # Install docker -RUN yum install -y docker-engine docker-cli +# See also https://docs.docker.com/engine/install/rhel/#set-up-the-repository +COPY docker-ce.repo /etc/yum.repos.d/docker-ce.repo +RUN microdnf install -y docker-ce docker-ce-cli # Install terraform # See also https://www.hashicorp.com/official-packaging-guide COPY hashicorp.repo /etc/yum.repos.d/hashicorp.repo -RUN yum -y install terraform +RUN microdnf -y install terraform # Install jq -RUN yum -y install jq +RUN microdnf -y install jq WORKDIR /workspace diff --git a/java-shared-config/.cloudbuild/graalvm-b.yaml b/java-shared-config/.cloudbuild/graalvm-b.yaml index e447328815d5..abc41e3d0745 100644 --- a/java-shared-config/.cloudbuild/graalvm-b.yaml +++ b/java-shared-config/.cloudbuild/graalvm-b.yaml @@ -17,7 +17,7 @@ commandTests: - name: "version" command: ["java", "-version"] # java -version outputs to stderr... - expectedError: ["openjdk version \"17.0.8\"", "GraalVM CE 22.3.3"] + expectedError: ["openjdk version \"23.0.1\"", "GraalVM CE 23.0.1"] - name: "maven" command: ["mvn", "-version"] expectedOutput: ["Apache Maven 3.9.4"] From f2c61cf447509d3ef09cc7a7135b9e13685aecd8 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 15:18:03 -0500 Subject: [PATCH 728/794] chore(main): release 1.14.0 (#970) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 9596e25b7a61..e5de3887c178 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.13.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index e06722b77502..422355d3438b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.13.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 1e2397b6443b..b2941263c8e4 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.13.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index ff8a0e4191b0..04f8be7720a2 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.14.0](https://github.com/googleapis/java-shared-config/compare/v1.13.0...v1.14.0) (2025-01-24) + + +### Features + +* Update GraalVM image B to GraalVM for JDK 23 ([79c31bc](https://github.com/googleapis/java-shared-config/commit/79c31bcfb0ae4767eaa8ea5045b20729d9cb3fb8)) + ## [1.13.0](https://github.com/googleapis/java-shared-config/compare/v1.12.3...v1.13.0) (2025-01-07) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 82e917d85b76..fe13b7f4026f 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.13.1-SNAPSHOT + 1.14.0 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.13.1-SNAPSHOT + 1.14.0 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 0b7ad7ce0417..c2f820047841 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.13.1-SNAPSHOT + 1.14.0 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 26f0ba3f7dca..ab388c8908dc 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.13.0:1.13.1-SNAPSHOT +google-cloud-shared-config:1.14.0:1.14.0 From 90ca296d03c79e95773d6de086d0797b739870de Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 28 Jan 2025 10:48:54 -0500 Subject: [PATCH 729/794] chore: remove artifactregistry-maven-wagon (#974) Removing artifactregistry-maven-wagon extension declaration in favor of the extensions.xml file in Google3. --- .../native-image-shared-config/pom.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index c2f820047841..fdbb9c8079ff 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -99,18 +99,6 @@ - - - - com.google.cloud.artifactregistry - artifactregistry-maven-wagon - 2.2.4 - - From df9cffdf99c3853a7f375c276c2204bda83c5211 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 30 Jan 2025 10:59:46 -0500 Subject: [PATCH 730/794] fix: animalsniffer to a profile (#975) --- java-shared-config/java-shared-config/pom.xml | 51 +++++++++++-------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index fe13b7f4026f..0f1cde163268 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -355,26 +355,6 @@ - - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.24 - - - java8 - - check - - - - org.codehaus.mojo.signature - java18 - 1.0 - - - - - @@ -717,5 +697,36 @@ + + animal-sniffer + + + [1.8,) + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.24 + + + java8 + + check + + + + org.codehaus.mojo.signature + java18 + 1.0 + + + + + + + + From b9dd86ecfbb2e015aaa2368897d1543596ec3d1c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 4 Feb 2025 17:18:22 +0100 Subject: [PATCH 731/794] deps: update dependency com.puppycrawl.tools:checkstyle to v10.21.2 (#972) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://redirect.github.com/checkstyle/checkstyle)) | `10.21.1` -> `10.21.2` | [![age](https://developer.mend.io/api/mc/badges/age/maven/com.puppycrawl.tools:checkstyle/10.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/com.puppycrawl.tools:checkstyle/10.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/com.puppycrawl.tools:checkstyle/10.21.1/10.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.puppycrawl.tools:checkstyle/10.21.1/10.21.2?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
checkstyle/checkstyle (com.puppycrawl.tools:checkstyle) ### [`v10.21.2`](https://redirect.github.com/checkstyle/checkstyle/compare/checkstyle-10.21.1...checkstyle-10.21.2)
--- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-shared-config). --- java-shared-config/java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 0f1cde163268..1e8dbc6b92e1 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -496,7 +496,7 @@ com.puppycrawl.tools checkstyle - 10.21.1 + 10.21.2 From 8e2e632702bc65826604a0cc8b2b03548c857dc6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 4 Feb 2025 17:38:21 +0100 Subject: [PATCH 732/794] chore(config): migrate renovate config (#976) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Renovate config in this repository needs migrating. Typically this is because one or more configuration options you are using have been renamed. You don't need to merge this PR right away, because Renovate will continue to migrate these fields internally each time it runs. But later some of these fields may be fully deprecated and the migrations removed. So it's a good idea to merge this migration PR soon. 🔕 **Ignore**: Close this PR and you won't be reminded about config migration again, but one day your current config may no longer be valid. ❓ Got questions? Does something look wrong to you? Please don't hesitate to [request help here](https://redirect.github.com/renovatebot/renovate/discussions). --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/googleapis/java-shared-config). --- java-shared-config/renovate.json | 99 ++++++++++++++++---------------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/java-shared-config/renovate.json b/java-shared-config/renovate.json index 2a13846cd26f..3a2b19e70a75 100644 --- a/java-shared-config/renovate.json +++ b/java-shared-config/renovate.json @@ -7,76 +7,79 @@ ":updateNotScheduled", ":automergeDisabled", ":ignoreModulesAndTests", - ":maintainLockFilesDisabled", - ":autodetectPinVersions" + ":maintainLockFilesDisabled" + ], + "ignorePaths": [ + ".kokoro/requirements.txt" + ], + "ignoreDeps": [ + "org.codehaus.mojo:flatten-maven-plugin" ], - "ignorePaths": [".kokoro/requirements.txt"], - "ignoreDeps": ["org.codehaus.mojo:flatten-maven-plugin"], "packageRules": [ { - "packagePatterns": [ - "^com.google.auto.value:" - ], - "enabled": false + "enabled": false, + "matchPackageNames": [ + "/^com.google.auto.value:/" + ] }, { - "packagePatterns": [ - "*" - ], "semanticCommitType": "deps", - "semanticCommitScope": null + "semanticCommitScope": null, + "matchPackageNames": [ + "*" + ] }, { - "packagePatterns": [ - "^org.apache.maven", - "^org.jacoco:", - "^org.codehaus.mojo:", - "^org.sonatype.plugins:", - "^com.coveo:", - "^com.google.cloud:google-cloud-shared-config" - ], "semanticCommitType": "build", - "semanticCommitScope": "deps" + "semanticCommitScope": "deps", + "matchPackageNames": [ + "/^org.apache.maven/", + "/^org.jacoco:/", + "/^org.codehaus.mojo:/", + "/^org.sonatype.plugins:/", + "/^com.coveo:/", + "/^com.google.cloud:google-cloud-shared-config/" + ] }, { - "packagePatterns": [ - "^com.google.cloud:google-cloud-shared-config", - "^com.google.cloud:libraries-bom", - "^com.google.cloud.samples:shared-configuration" - ], "semanticCommitType": "chore", - "semanticCommitScope": "deps" + "semanticCommitScope": "deps", + "matchPackageNames": [ + "/^com.google.cloud:google-cloud-shared-config/", + "/^com.google.cloud:libraries-bom/", + "/^com.google.cloud.samples:shared-configuration/" + ] }, { - "packagePatterns": [ - "^junit:junit", - "^com.google.truth:truth", - "^org.mockito:mockito-core", - "^org.objenesis:objenesis", - "^com.google.cloud:google-cloud-conformance-tests" - ], "semanticCommitType": "test", - "semanticCommitScope": "deps" + "semanticCommitScope": "deps", + "matchPackageNames": [ + "/^junit:junit/", + "/^com.google.truth:truth/", + "/^org.mockito:mockito-core/", + "/^org.objenesis:objenesis/", + "/^com.google.cloud:google-cloud-conformance-tests/" + ] }, { - "packagePatterns": [ - "^com.google.cloud:google-cloud-" - ], - "ignoreUnstable": false + "ignoreUnstable": false, + "matchPackageNames": [ + "/^com.google.cloud:google-cloud-/" + ] }, { - "packagePatterns": [ - "^com.fasterxml.jackson.core" - ], - "groupName": "jackson dependencies" + "groupName": "jackson dependencies", + "matchPackageNames": [ + "/^com.fasterxml.jackson.core/" + ] }, { - "packagePatterns": [ - "^org.graalvm.buildtools" - ], - "groupName": "GraalVM native-image dependencies" + "groupName": "GraalVM native-image dependencies", + "matchPackageNames": [ + "/^org.graalvm.buildtools/" + ] } ], - "semanticCommits": true, + "semanticCommits": "enabled", "dependencyDashboard": true } From 4957b5d8e0bbc85f80b09c2c27e00bee82715b1a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 4 Feb 2025 18:12:44 +0100 Subject: [PATCH 733/794] deps: update dependency org.graalvm.sdk:nativeimage to v24.1.2 (#969) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index fdbb9c8079ff..bfccaca01112 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -60,7 +60,7 @@ 24.1.1 3.5.2 - 24.1.1 + 24.1.2 0.10.4 5.11.4 1.3.0 From 10065c70b7c53986aecf1c50e73cf6bc74a1bfe8 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 4 Feb 2025 18:12:55 +0100 Subject: [PATCH 734/794] deps: update dependency org.graalvm.sdk:graal-sdk to v24.1.2 (#968) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index bfccaca01112..3ec0d2fe8c32 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -58,7 +58,7 @@ - 24.1.1 + 24.1.2 3.5.2 24.1.2 0.10.4 From 1a448c3a00f31354d9414564416dc918346c76c4 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 18:10:22 +0000 Subject: [PATCH 735/794] chore(main): release 1.14.1-SNAPSHOT (#971) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index e5de3887c178..08bbc7d15527 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 422355d3438b..cbaf502777ac 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index b2941263c8e4..512f30f8a37b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 1e8dbc6b92e1..4e0efde47318 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.14.0 + 1.14.1-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.14.0 + 1.14.1-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 3ec0d2fe8c32..7f0f50206eb1 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.14.0 + 1.14.1-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index ab388c8908dc..53f62acced85 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.14.0:1.14.0 +google-cloud-shared-config:1.14.0:1.14.1-SNAPSHOT From 4b72a51e765e094da9a37aacb62f83908d053551 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 19:26:24 +0000 Subject: [PATCH 736/794] chore(main): release 1.14.1 (#977) :robot: I have created a release *beep* *boop* --- ## [1.14.1](https://togithub.com/googleapis/java-shared-config/compare/v1.14.0...v1.14.1) (2025-02-04) ### Bug Fixes * Animalsniffer to a profile ([#975](https://togithub.com/googleapis/java-shared-config/issues/975)) ([df9cffd](https://togithub.com/googleapis/java-shared-config/commit/df9cffdf99c3853a7f375c276c2204bda83c5211)) ### Dependencies * Update dependency com.puppycrawl.tools:checkstyle to v10.21.2 ([#972](https://togithub.com/googleapis/java-shared-config/issues/972)) ([b9dd86e](https://togithub.com/googleapis/java-shared-config/commit/b9dd86ecfbb2e015aaa2368897d1543596ec3d1c)) * Update dependency org.graalvm.sdk:graal-sdk to v24.1.2 ([#968](https://togithub.com/googleapis/java-shared-config/issues/968)) ([10065c7](https://togithub.com/googleapis/java-shared-config/commit/10065c70b7c53986aecf1c50e73cf6bc74a1bfe8)) * Update dependency org.graalvm.sdk:nativeimage to v24.1.2 ([#969](https://togithub.com/googleapis/java-shared-config/issues/969)) ([4957b5d](https://togithub.com/googleapis/java-shared-config/commit/4957b5d8e0bbc85f80b09c2c27e00bee82715b1a)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- .../.cloudbuild/cloudbuild-test-a.yaml | 2 +- .../.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 14 ++++++++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- .../native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 08bbc7d15527..e097eb8cf2ee 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index cbaf502777ac..ce04526d2375 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 512f30f8a37b..5dcdca70db7f 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 04f8be7720a2..00ec0d15cfde 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [1.14.1](https://github.com/googleapis/java-shared-config/compare/v1.14.0...v1.14.1) (2025-02-04) + + +### Bug Fixes + +* Animalsniffer to a profile ([#975](https://github.com/googleapis/java-shared-config/issues/975)) ([83fe0f3](https://github.com/googleapis/java-shared-config/commit/83fe0f3e61afa0b85193ec36a7a5e7d7cdd2230e)) + + +### Dependencies + +* Update dependency com.puppycrawl.tools:checkstyle to v10.21.2 ([#972](https://github.com/googleapis/java-shared-config/issues/972)) ([8d7c796](https://github.com/googleapis/java-shared-config/commit/8d7c7967660637ec4c4c7823b435bba1b80a0ebb)) +* Update dependency org.graalvm.sdk:graal-sdk to v24.1.2 ([#968](https://github.com/googleapis/java-shared-config/issues/968)) ([d2d5736](https://github.com/googleapis/java-shared-config/commit/d2d57366de4962ca5bde212f36ed5c829412ad79)) +* Update dependency org.graalvm.sdk:nativeimage to v24.1.2 ([#969](https://github.com/googleapis/java-shared-config/issues/969)) ([c8cf518](https://github.com/googleapis/java-shared-config/commit/c8cf518ffe2bc604242964583b3c2fd50c536300)) + ## [1.14.0](https://github.com/googleapis/java-shared-config/compare/v1.13.0...v1.14.0) (2025-01-24) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 4e0efde47318..e90084a68bb0 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.14.1-SNAPSHOT + 1.14.1 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.14.1-SNAPSHOT + 1.14.1 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 7f0f50206eb1..3331a49b4783 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.14.1-SNAPSHOT + 1.14.1 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 53f62acced85..134070ca9953 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.14.0:1.14.1-SNAPSHOT +google-cloud-shared-config:1.14.1:1.14.1 From eea1ce7bd725a74bebe2980a7606524cd5ba13d7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 20:14:23 +0000 Subject: [PATCH 737/794] chore(main): release 1.14.2-SNAPSHOT (#978) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index e097eb8cf2ee..25b5c264c8ea 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index ce04526d2375..b6188bd3ab80 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 5dcdca70db7f..1cd6ad29ef7b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index e90084a68bb0..4220f5f7e356 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.14.1 + 1.14.2-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.14.1 + 1.14.2-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 3331a49b4783..a47d196ae82d 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.14.1 + 1.14.2-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 134070ca9953..51a6f204c0de 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.14.1:1.14.1 +google-cloud-shared-config:1.14.1:1.14.2-SNAPSHOT From 124939c0a0bb636023d462d924741d97d2937fe3 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 5 Feb 2025 16:45:15 -0500 Subject: [PATCH 738/794] fix: declare Maven plugin versions (#980) This addresses the following messages: - 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-deploy-plugin is missing. - 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-javadoc-plugin is missing. - 'build.plugins.plugin.version' for org.apache.maven.plugins:maven-source-plugin is missing. --- .../native-image-shared-config/pom.xml | 5 +++++ java-shared-config/pom.xml | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index a47d196ae82d..9174fd2b1114 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -97,6 +97,11 @@ 15 + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.3 + diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index a4173c5a0377..c2b752e12dff 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -16,13 +16,27 @@ java-shared-config - + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.11.2 + + + org.apache.maven.plugins maven-deploy-plugin 3.1.3 + true From b23d352d0880944e6265023339a64803fdcec2ea Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 5 Feb 2025 16:58:05 -0500 Subject: [PATCH 739/794] ci: Build with Airlock as required check (#981) The "Build with Airlock" check now succeeds. Let's keep the status green. --- java-shared-config/.github/sync-repo-settings.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index bfe5bfbfc7f5..b8c744b4a8df 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -51,6 +51,7 @@ branchProtectionRules: - "cla/google" - "graalvm-presubmit-shared-config-a (java-graalvm-ci-prod)" - "graalvm-presubmit-shared-config-b (java-graalvm-ci-prod)" + - "Build with Airlock" - pattern: java7 # Can admins overwrite branch protection. # Defaults to `true` From 0107afdd8534586b6ab9f9be2ed49063fbff6ff9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 5 Feb 2025 17:19:09 -0500 Subject: [PATCH 740/794] chore(main): release 1.14.2 (#982) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 25b5c264c8ea..cfc204239226 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.2' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index b6188bd3ab80..07b10b7ba388 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.2' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 1cd6ad29ef7b..470250df9816 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.2' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 00ec0d15cfde..87272d069aa9 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.14.2](https://github.com/googleapis/java-shared-config/compare/v1.14.1...v1.14.2) (2025-02-05) + + +### Bug Fixes + +* Declare Maven plugin versions ([#980](https://github.com/googleapis/java-shared-config/issues/980)) ([3975f66](https://github.com/googleapis/java-shared-config/commit/3975f662d6150064af03a5f1b473b9eea849d906)) + ## [1.14.1](https://github.com/googleapis/java-shared-config/compare/v1.14.0...v1.14.1) (2025-02-04) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 4220f5f7e356..13c928893931 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.14.2-SNAPSHOT + 1.14.2 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.14.2-SNAPSHOT + 1.14.2 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 9174fd2b1114..43beee5238d8 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.14.2-SNAPSHOT + 1.14.2 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 51a6f204c0de..e9aa524daef6 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.14.1:1.14.2-SNAPSHOT +google-cloud-shared-config:1.14.2:1.14.2 From a344263cc1e05a0cb6c910f3b6def8aa16eab495 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 6 Feb 2025 12:09:07 -0500 Subject: [PATCH 741/794] fix: introducing "flatten" profile to use the plugin (#984) The plugin is not needed in this project but it's used in the downstream Java repositories. By specifying the profile in "Build with Airlock" check, we can ensure the required dependencies are available in Airlock. --- java-shared-config/java-shared-config/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 13c928893931..50e40d7803e3 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -728,5 +728,18 @@ + + + flatten + + + + org.codehaus.mojo + flatten-maven-plugin + + + + From 25d91680565e571540a80a89b7226b6d29c3b768 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 20:40:25 +0000 Subject: [PATCH 742/794] chore(main): release 1.14.3-SNAPSHOT (#983) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index cfc204239226..d44c7fe6c337 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 07b10b7ba388..dfa6adf9fb45 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 470250df9816..eb83e7defc02 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 50e40d7803e3..7596bbb3a749 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.14.2 + 1.14.3-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.14.2 + 1.14.3-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 43beee5238d8..94756684ce61 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.14.2 + 1.14.3-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index e9aa524daef6..513f4d9d8308 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.14.2:1.14.2 +google-cloud-shared-config:1.14.2:1.14.3-SNAPSHOT From 7858ca990e901b19dc51bc4e3b829d812e75a7db Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 18 Feb 2025 12:25:10 -0500 Subject: [PATCH 743/794] chore(main): release 1.14.3 (#985) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index d44c7fe6c337..cd414fee18bf 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.3' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index dfa6adf9fb45..1893c37a571a 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.3' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index eb83e7defc02..9cefb5ac6359 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.3' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 87272d069aa9..73fa32e5eafe 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.14.3](https://github.com/googleapis/java-shared-config/compare/v1.14.2...v1.14.3) (2025-02-18) + + +### Bug Fixes + +* Introducing "flatten" profile to use the plugin ([#984](https://github.com/googleapis/java-shared-config/issues/984)) ([436aa7c](https://github.com/googleapis/java-shared-config/commit/436aa7c9e9914a830e3172ae0ee93131bb641e07)) + ## [1.14.2](https://github.com/googleapis/java-shared-config/compare/v1.14.1...v1.14.2) (2025-02-05) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 7596bbb3a749..f09166ef0446 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.14.3-SNAPSHOT + 1.14.3 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.14.3-SNAPSHOT + 1.14.3 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 94756684ce61..356e2830a1ad 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.14.3-SNAPSHOT + 1.14.3 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 513f4d9d8308..e2f9e2bd21d7 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.14.2:1.14.3-SNAPSHOT +google-cloud-shared-config:1.14.3:1.14.3 From 2c0085b8b87a4e70d644fb6c1dbb0d5a3951e036 Mon Sep 17 00:00:00 2001 From: Joe Wang <106995533+JoeWang1127@users.noreply.github.com> Date: Mon, 24 Feb 2025 14:09:49 -0500 Subject: [PATCH 744/794] chore: update graalvm-b version (#991) * chore: update graalvm-b version * fix test --- java-shared-config/.cloudbuild/graalvm-b.Dockerfile | 2 +- java-shared-config/.cloudbuild/graalvm-b.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.cloudbuild/graalvm-b.Dockerfile b/java-shared-config/.cloudbuild/graalvm-b.Dockerfile index 9f1dde1b2cc0..62e7a4ad6d55 100644 --- a/java-shared-config/.cloudbuild/graalvm-b.Dockerfile +++ b/java-shared-config/.cloudbuild/graalvm-b.Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ghcr.io/graalvm/graalvm-community:23.0.1-ol9-20241015 +FROM ghcr.io/graalvm/graalvm-community:23.0.2-ol9-20250121 # native-image comes out of the box RUN native-image --version diff --git a/java-shared-config/.cloudbuild/graalvm-b.yaml b/java-shared-config/.cloudbuild/graalvm-b.yaml index abc41e3d0745..01e2eb20bc1f 100644 --- a/java-shared-config/.cloudbuild/graalvm-b.yaml +++ b/java-shared-config/.cloudbuild/graalvm-b.yaml @@ -17,7 +17,7 @@ commandTests: - name: "version" command: ["java", "-version"] # java -version outputs to stderr... - expectedError: ["openjdk version \"23.0.1\"", "GraalVM CE 23.0.1"] + expectedError: ["openjdk version \"23.0.2\"", "GraalVM CE 23.0.2"] - name: "maven" command: ["mvn", "-version"] expectedOutput: ["Apache Maven 3.9.4"] From deffa56cbb9ae471d0b30914510b6a9c1f6975e6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 24 Feb 2025 20:43:04 +0100 Subject: [PATCH 745/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.5 (#979) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 356e2830a1ad..e2db92a0ddc4 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -61,7 +61,7 @@ 24.1.2 3.5.2 24.1.2 - 0.10.4 + 0.10.5 5.11.4 1.3.0 org.graalvm.sdk:nativeimage From f6173a3a2117e48c2a385e8d457ef1368de471d5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 15:27:52 -0500 Subject: [PATCH 746/794] chore(main): release 1.14.4-SNAPSHOT (#986) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index cd414fee18bf..61bb2fc2d7f5 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.3' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 1893c37a571a..7c987cb3a15d 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.3' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 9cefb5ac6359..3753e421bdd3 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.3' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index f09166ef0446..c97d30430387 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.14.3 + 1.14.4-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.14.3 + 1.14.4-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index e2db92a0ddc4..e681e1492d39 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.14.3 + 1.14.4-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index e2f9e2bd21d7..3bf4f85384fb 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.14.3:1.14.3 +google-cloud-shared-config:1.14.3:1.14.4-SNAPSHOT From bfd7b28a74b38c2b239a77d089ad65d1c94b2e9e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 16:03:21 -0500 Subject: [PATCH 747/794] chore(main): release 1.14.4 (#992) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 61bb2fc2d7f5..5b3aff4a47e3 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.4' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 7c987cb3a15d..8f7c97b1e71a 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.4' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 3753e421bdd3..71e2a13cc071 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.4' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 73fa32e5eafe..18fdbf9bd075 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.14.4](https://github.com/googleapis/java-shared-config/compare/v1.14.3...v1.14.4) (2025-02-24) + + +### Dependencies + +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.5 ([#979](https://github.com/googleapis/java-shared-config/issues/979)) ([06c8547](https://github.com/googleapis/java-shared-config/commit/06c854718c39e658cdead0584cfb1cc698143ffd)) + ## [1.14.3](https://github.com/googleapis/java-shared-config/compare/v1.14.2...v1.14.3) (2025-02-18) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index c97d30430387..4fa627b3a596 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.14.4-SNAPSHOT + 1.14.4 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.14.4-SNAPSHOT + 1.14.4 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index e681e1492d39..03d414055a28 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.14.4-SNAPSHOT + 1.14.4 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 3bf4f85384fb..f7c62aa2bd98 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.14.3:1.14.4-SNAPSHOT +google-cloud-shared-config:1.14.4:1.14.4 From 6336b81443a86b09997d93314940b35158ec457e Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 25 Feb 2025 09:42:20 -0500 Subject: [PATCH 748/794] chore(main): release 1.14.5-SNAPSHOT (#993) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 5b3aff4a47e3..81d9ea8191c7 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.4' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 8f7c97b1e71a..981d17954d88 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.4' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 71e2a13cc071..110ca8614151 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.4' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 4fa627b3a596..4b032bcd92c7 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.14.4 + 1.14.5-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.14.4 + 1.14.5-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 03d414055a28..6b812791e905 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.14.4 + 1.14.5-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index f7c62aa2bd98..190188ce6340 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.14.4:1.14.4 +google-cloud-shared-config:1.14.4:1.14.5-SNAPSHOT From 5cfe55fb1e594d5fcbd45ba08ea2acf791596d2c Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 4 Mar 2025 16:03:38 -0500 Subject: [PATCH 749/794] feat: google-java-format version as a property (#997) Once we declare this version as a property, then the hermetic build script can use the property value to determine the version of the google-java-format to download when it builds the container image. ``` $ JAVA_FORMAT_VERSION=$(mvn -pl java-shared-config help:evaluate -Dexpression='google-java-format.version' -q -DforceStdout) $ echo $JAVA_FORMAT_VERSION 1.7 ``` This uses https://maven.apache.org/plugins/maven-help-plugin/evaluate-mojo.html --- java-shared-config/java-shared-config/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 4b032bcd92c7..287be32e40ea 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -28,6 +28,7 @@ true 1.11.0 /java/docs/reference/ + 1.7 @@ -179,7 +180,7 @@ com.google.googlejavaformat google-java-format - 1.7 + ${google-java-format.version} From 2aacde58787c150887b3b174d8472164fc2e8edd Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 11 Mar 2025 14:42:00 -0400 Subject: [PATCH 750/794] chore(main): release 1.15.0 (#999) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 81d9ea8191c7..c700ad599cec 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 981d17954d88..04b3f2c91c44 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 110ca8614151..21876be07647 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 18fdbf9bd075..b2aa1d2f5ac4 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.15.0](https://github.com/googleapis/java-shared-config/compare/v1.14.4...v1.15.0) (2025-03-04) + + +### Features + +* Google-java-format version as a property ([#997](https://github.com/googleapis/java-shared-config/issues/997)) ([6838220](https://github.com/googleapis/java-shared-config/commit/6838220bee2c8041f860274dc985aa99f01be51a)) + ## [1.14.4](https://github.com/googleapis/java-shared-config/compare/v1.14.3...v1.14.4) (2025-02-24) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 287be32e40ea..fa4cd37623ec 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.14.5-SNAPSHOT + 1.15.0 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.14.5-SNAPSHOT + 1.15.0 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 6b812791e905..5d6015e7229c 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.14.5-SNAPSHOT + 1.15.0 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 190188ce6340..dad75b0eff20 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.14.4:1.14.5-SNAPSHOT +google-cloud-shared-config:1.15.0:1.15.0 From 06dec06e6c958896c90b68b791fbda8e88223f59 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Mon, 24 Mar 2025 10:57:21 -0400 Subject: [PATCH 751/794] chore: update google-java-format to the latest (#1003) * chore: update google-java-format to the latest b/395190324 * chore: do downstream lint test using java 17 and 21 * chore: adapt to new showcase folder in sdk-platform-java * chore: remove lint from Java 7 and 11 downstream jobs * deps: update fmt-maven-plugin to 2.13 * use the latest spotify fmt plugin * deps: use proper group ID for latest fmt plugin * add debug command to test fmt version * use spotify fmt plugin in lint job * fix string replacement * correct indentation, explain further removal of sed * chore: adapt sync repo settings to new lint jobs --- .../.github/sync-repo-settings.yaml | 4 ++-- .../workflows/downstream-maven-plugins.yaml | 22 ++++++++++++++++++- .../.kokoro/client-library-check.sh | 4 ++++ .../.kokoro/presubmit/downstream-build.sh | 6 ++--- java-shared-config/java-shared-config/pom.xml | 6 ++--- 5 files changed, 33 insertions(+), 9 deletions(-) diff --git a/java-shared-config/.github/sync-repo-settings.yaml b/java-shared-config/.github/sync-repo-settings.yaml index b8c744b4a8df..68bd68e3d058 100644 --- a/java-shared-config/.github/sync-repo-settings.yaml +++ b/java-shared-config/.github/sync-repo-settings.yaml @@ -40,13 +40,13 @@ branchProtectionRules: - "dependencies (11, java-pubsub)" - "flatten-plugin-check" - "build (8, java-bigquery, test)" - - "build (8, java-bigquery, lint)" - "build (8, java-bigquery, clirr)" - "build (8, java-bigtable, javadoc)" - "build (11, java-bigquery, test)" - - "build (11, java-bigquery, lint)" - "build (11, java-bigquery, clirr)" - "build (11, java-bigtable, javadoc)" + - "lint (17, java-bigquery, lint)" + - "lint (21, java-bigquery, lint)" - "javadoc-with-doclet (java-bigtable)" - "cla/google" - "graalvm-presubmit-shared-config-a (java-graalvm-ci-prod)" diff --git a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml index 850f42efc7f6..8eef928a4559 100644 --- a/java-shared-config/.github/workflows/downstream-maven-plugins.yaml +++ b/java-shared-config/.github/workflows/downstream-maven-plugins.yaml @@ -20,7 +20,6 @@ jobs: - java-bigtable job-type: - test # maven-surefire-plugin - - lint # fmt-maven-plugin and google-java-format - clirr # clirr-maven-plugin - javadoc # maven-javadoc-plugin - javadoc-with-doclet # test javadoc generation with doclet @@ -34,6 +33,27 @@ jobs: - run: sudo apt-get update -y - run: sudo apt-get install libxml2-utils - run: .kokoro/client-library-check.sh ${{matrix.repo}} ${{matrix.job-type}} + lint: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + java: [17, 21] + repo: + - java-bigquery + - java-bigtable + job-type: + - lint # fmt-maven-plugin and google-java-format + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + - uses: actions/setup-java@v4 + with: + distribution: zulu + java-version: ${{matrix.java}} + - run: java -version + - run: sudo apt-get update -y + - run: sudo apt-get install libxml2-utils + - run: .kokoro/client-library-check.sh ${{matrix.repo}} ${{matrix.job-type}} javadoc-with-doclet: runs-on: ubuntu-latest strategy: diff --git a/java-shared-config/.kokoro/client-library-check.sh b/java-shared-config/.kokoro/client-library-check.sh index e68e80430b48..425cdb45b8be 100755 --- a/java-shared-config/.kokoro/client-library-check.sh +++ b/java-shared-config/.kokoro/client-library-check.sh @@ -155,6 +155,10 @@ flatten-plugin) popd ;; *) + # Here we replace the com.coveo fmt plugin with the spotify version. + # This `sed` won't be needed once downstream repositories update + # `.kokoro/build.sh` to use the `com.spotify.fmt` group ID. + sed -i 's/com.coveo:fmt-maven-plugin/com.spotify.fmt:fmt-maven-plugin/' .kokoro/build.sh # This reads the JOB_TYPE environmental variable .kokoro/build.sh RETURN_CODE=$? diff --git a/java-shared-config/.kokoro/presubmit/downstream-build.sh b/java-shared-config/.kokoro/presubmit/downstream-build.sh index 3ca932fc626a..9986c14c90c4 100755 --- a/java-shared-config/.kokoro/presubmit/downstream-build.sh +++ b/java-shared-config/.kokoro/presubmit/downstream-build.sh @@ -42,14 +42,14 @@ cp settings.xml "${HOME}/.m2" git clone "https://github.com/googleapis/sdk-platform-java" --depth=1 # Update the shared-config version in showcase -pushd sdk-platform-java/showcase +pushd sdk-platform-java/java-showcase modify_shared_config popd pushd sdk-platform-java mvn -B -ntp install --projects '!gapic-generator-java' -Dcheckstyle.skip -Dfmt.skip -DskipTests popd -pushd sdk-platform-java/showcase/gapic-showcase +pushd sdk-platform-java/java-showcase/gapic-showcase SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout) popd @@ -62,7 +62,7 @@ tar -xf showcase-* popd # Run showcase tests with `native` profile -pushd sdk-platform-java/showcase +pushd sdk-platform-java/java-showcase mvn test -Pnative,-showcase -Denforcer.skip=true -ntp -B popd diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index fa4cd37623ec..c27be3088e08 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -28,7 +28,7 @@ true 1.11.0 /java/docs/reference/ - 1.7 + 1.25.2 @@ -169,9 +169,9 @@ 2.8 - com.coveo + com.spotify.fmt fmt-maven-plugin - 2.9 + 2.25 true From bd83e29989b310fb213152531c02e0f6ef6f5b9d Mon Sep 17 00:00:00 2001 From: Blake Li Date: Tue, 25 Mar 2025 02:20:16 +0800 Subject: [PATCH 752/794] chore: Update downstream-build.sh with new showcase module name (#1002) --- java-shared-config/.kokoro/presubmit/downstream-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.kokoro/presubmit/downstream-build.sh b/java-shared-config/.kokoro/presubmit/downstream-build.sh index 9986c14c90c4..45a7b5716fdf 100755 --- a/java-shared-config/.kokoro/presubmit/downstream-build.sh +++ b/java-shared-config/.kokoro/presubmit/downstream-build.sh @@ -63,7 +63,7 @@ popd # Run showcase tests with `native` profile pushd sdk-platform-java/java-showcase -mvn test -Pnative,-showcase -Denforcer.skip=true -ntp -B +mvn test -Pnative,showcase -Denforcer.skip=true -ntp -B popd -exit $RETURN_CODE \ No newline at end of file +exit $RETURN_CODE From 8b64ddd6de1de8043bdc53129f2aed3f94273fa9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 25 Mar 2025 20:48:22 +0000 Subject: [PATCH 753/794] chore(main): release 1.15.1-SNAPSHOT (#1001) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index c700ad599cec..73fd3410fb2d 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 04b3f2c91c44..dcc5a949a42b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 21876be07647..e785db7db87d 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index c27be3088e08..8f596f0dddff 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.15.0 + 1.15.1-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.15.0 + 1.15.1-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 5d6015e7229c..d1faf3d82d26 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.15.0 + 1.15.1-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index dad75b0eff20..ba58ab60bb6d 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.15.0:1.15.0 +google-cloud-shared-config:1.15.0:1.15.1-SNAPSHOT From 0c7ff6ee44e925dd4727078ac9bed3c2c07bac07 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 26 Mar 2025 17:26:28 +0000 Subject: [PATCH 754/794] chore(main): release 1.15.1 (#1006) :robot: I have created a release *beep* *boop* --- ## [1.15.1](https://togithub.com/googleapis/java-shared-config/compare/v1.15.0...v1.15.1) (2025-03-26) ### Dependencies * Update google-java-format to the latest ([06dec06](https://togithub.com/googleapis/java-shared-config/commit/06dec06e6c958896c90b68b791fbda8e88223f59)) --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 73fd3410fb2d..4cc8daf1e774 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index dcc5a949a42b..ba5a6bfaea26 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index e785db7db87d..2d59763747d5 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index b2aa1d2f5ac4..bbd3730e98fd 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.15.1](https://github.com/googleapis/java-shared-config/compare/v1.15.0...v1.15.1) (2025-03-26) + + +### Dependencies + +* Update google-java-format to the latest ([aa78b13](https://github.com/googleapis/java-shared-config/commit/aa78b13e765259d70c20e8a50bde92b3ab33a8a1)) + ## [1.15.0](https://github.com/googleapis/java-shared-config/compare/v1.14.4...v1.15.0) (2025-03-04) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 8f596f0dddff..96c8e3183303 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.15.1-SNAPSHOT + 1.15.1 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.15.1-SNAPSHOT + 1.15.1 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index d1faf3d82d26..c671eff38573 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.15.1-SNAPSHOT + 1.15.1 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index ba58ab60bb6d..a14102270e17 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.15.0:1.15.1-SNAPSHOT +google-cloud-shared-config:1.15.1:1.15.1 From f270b8ab41cf7f461ebfacc3c86424cb9e15773c Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 4 Apr 2025 20:37:54 +0200 Subject: [PATCH 755/794] deps: update dependency org.graalvm.sdk:graal-sdk to v24.2.0 (#1005) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index c671eff38573..e618f8ec15c3 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -58,7 +58,7 @@ - 24.1.2 + 24.2.0 3.5.2 24.1.2 0.10.5 From 23e4b04a9bad768073daf0c8c9eba3386a1c8b1b Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Tue, 8 Apr 2025 17:05:04 -0400 Subject: [PATCH 756/794] fix: reintroduce support for GraalVM 17 (#1010) * fix: reintroduce support for GraalVM 17 * correct coment * fix copyright year * non image-dependent steps to not depend on image building step * restore step dependency * checkout fix branch for testing * clone with branch * use main branch of sdk-platform --- .../.cloudbuild/cloudbuild-test-c.yaml | 36 ++++++++++++++ .../.cloudbuild/cloudbuild.yaml | 36 ++++++++++---- .../.cloudbuild/graalvm-c.Dockerfile | 49 +++++++++++++++++++ java-shared-config/.cloudbuild/graalvm-c.yaml | 29 +++++++++++ 4 files changed, 140 insertions(+), 10 deletions(-) create mode 100644 java-shared-config/.cloudbuild/cloudbuild-test-c.yaml create mode 100644 java-shared-config/.cloudbuild/graalvm-c.Dockerfile create mode 100644 java-shared-config/.cloudbuild/graalvm-c.yaml diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml new file mode 100644 index 000000000000..d97e3d6e6b14 --- /dev/null +++ b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml @@ -0,0 +1,36 @@ +# Copyright 2025 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. + +timeout: 7200s # 2 hours +substitutions: + _JAVA_SHARED_CONFIG_VERSION: '1.15.1' # {x-version-update:google-cloud-shared-config:current} + +steps: + # GraalVM C build + - name: gcr.io/cloud-builders/docker + args: ["build", "-t", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_c:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-c.Dockerfile", "."] + dir: .cloudbuild + id: graalvm-c-build + waitFor: ["-"] + - name: gcr.io/gcp-runtimes/structure_test + args: + ["-i", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_c:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-c.yaml", "-v"] + waitFor: ["graalvm-c-build"] + - name: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_c:${_JAVA_SHARED_CONFIG_VERSION} + entrypoint: bash + args: [ './.kokoro/presubmit/downstream-build.sh' ] + waitFor: [ "graalvm-c-build" ] + +options: + logging: CLOUD_LOGGING_ONLY diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 2d59763747d5..30389dc9b88d 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -15,39 +15,55 @@ timeout: 7200s # 2 hours substitutions: _JAVA_SHARED_CONFIG_VERSION: '1.15.1' # {x-version-update:google-cloud-shared-config:current} + _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing + _COMMIT_HASH_TAG: infrastructure-public-image-$SHORT_SHA steps: # GraalVM A build - name: gcr.io/cloud-builders/docker args: ["build", - "-t", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", - "-t", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:infrastructure-public-image-$SHORT_SHA", + "-t", "${_IMAGE_REPOSITORY}/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", + "-t", "${_IMAGE_REPOSITORY}/graalvm_a:${_COMMIT_HASH_TAG}", "--file", "graalvm-a.Dockerfile", "."] dir: .cloudbuild id: graalvm-a-build waitFor: ["-"] - name: gcr.io/gcp-runtimes/structure_test args: - ["-i", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-a.yaml", "-v"] + ["-i", "${_IMAGE_REPOSITORY}/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-a.yaml", "-v"] waitFor: ["graalvm-a-build"] # GraalVM B build - name: gcr.io/cloud-builders/docker - args: [ "build", "-t", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", - "-t", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:infrastructure-public-image-$SHORT_SHA", + args: [ "build", "-t", "${_IMAGE_REPOSITORY}/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", + "-t", "${_IMAGE_REPOSITORY}/graalvm_b:${_COMMIT_HASH_TAG}", "--file", "graalvm-b.Dockerfile", "." ] dir: .cloudbuild id: graalvm-b-build waitFor: [ "-" ] - name: gcr.io/gcp-runtimes/structure_test args: - [ "-i", "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-b.yaml", "-v" ] + [ "-i", "${_IMAGE_REPOSITORY}/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-b.yaml", "-v" ] waitFor: [ "graalvm-b-build" ] + # GraalVM C build + - name: gcr.io/cloud-builders/docker + args: [ "build", "-t", "${_IMAGE_REPOSITORY}/graalvm_c:${_JAVA_SHARED_CONFIG_VERSION}", + "-t", "${_IMAGE_REPOSITORY}/graalvm_c:${_COMMIT_HASH_TAG}", + "--file", "graalvm-c.Dockerfile", "." ] + dir: .cloudbuild + id: graalvm-c-build + waitFor: [ "-" ] + - name: gcr.io/gcp-runtimes/structure_test + args: + [ "-i", "${_IMAGE_REPOSITORY}/graalvm_c:${_JAVA_SHARED_CONFIG_VERSION}", "--config", ".cloudbuild/graalvm-c.yaml", "-v" ] + waitFor: [ "graalvm-c-build" ] options: logging: CLOUD_LOGGING_ONLY images: - - us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION} - - us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION} - - us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:infrastructure-public-image-$SHORT_SHA - - us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:infrastructure-public-image-$SHORT_SHA + - ${_IMAGE_REPOSITORY}/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION} + - ${_IMAGE_REPOSITORY}/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION} + - ${_IMAGE_REPOSITORY}/graalvm_c:${_JAVA_SHARED_CONFIG_VERSION} + - ${_IMAGE_REPOSITORY}/graalvm_a:${_COMMIT_HASH_TAG} + - ${_IMAGE_REPOSITORY}/graalvm_b:${_COMMIT_HASH_TAG} + - ${_IMAGE_REPOSITORY}/graalvm_c:${_COMMIT_HASH_TAG} diff --git a/java-shared-config/.cloudbuild/graalvm-c.Dockerfile b/java-shared-config/.cloudbuild/graalvm-c.Dockerfile new file mode 100644 index 000000000000..11686b3c4948 --- /dev/null +++ b/java-shared-config/.cloudbuild/graalvm-c.Dockerfile @@ -0,0 +1,49 @@ +# Copyright 2025 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. + +FROM ghcr.io/graalvm/graalvm-community:17.0.9-ol9-20231024 + +# use microdnf, see https://github.com/graalvm/container/issues/10 +RUN microdnf update -y oraclelinux-release-el9 && \ + microdnf install -y wget unzip git && \ + # Install maven + wget -q https://archive.apache.org/dist/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.zip -O /tmp/maven.zip && \ + unzip /tmp/maven.zip -d /tmp/maven && \ + mv /tmp/maven/apache-maven-3.9.4 /usr/local/lib/maven && \ + rm /tmp/maven.zip && \ + ln -s $JAVA_HOME/lib $JAVA_HOME/conf + +ENV PATH $PATH:/usr/local/lib/maven/bin + +# Install gcloud SDK +COPY google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo +RUN microdnf install -y google-cloud-sdk + +# Adding the package path to local +ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin + +# Install docker +# See also https://docs.docker.com/engine/install/rhel/#set-up-the-repository +COPY docker-ce.repo /etc/yum.repos.d/docker-ce.repo +RUN microdnf install -y docker-ce docker-ce-cli + +# Install terraform +# See also https://www.hashicorp.com/official-packaging-guide +COPY hashicorp.repo /etc/yum.repos.d/hashicorp.repo +RUN microdnf -y install terraform + +# Install jq +RUN microdnf -y install jq + +WORKDIR /workspace diff --git a/java-shared-config/.cloudbuild/graalvm-c.yaml b/java-shared-config/.cloudbuild/graalvm-c.yaml new file mode 100644 index 000000000000..b2081c0f16e8 --- /dev/null +++ b/java-shared-config/.cloudbuild/graalvm-c.yaml @@ -0,0 +1,29 @@ +# Copyright 2025 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. + +schemaVersion: 1.0.0 +commandTests: + - name: "version" + command: ["java", "-version"] + # java -version outputs to stderr... + expectedError: ["openjdk version \"17.0.9\"", "GraalVM CE 17.0.9"] + - name: "maven" + command: ["mvn", "-version"] + expectedOutput: ["Apache Maven 3.9.4"] + - name: "gcloud" + command: ["gcloud", "version"] + expectedOutput: ["Google Cloud SDK"] + - name: "docker" + command: ["docker", "--version"] + expectedOutput: ["Docker version *"] From dab153aa00ac23cda3c5057ac42d5c065f2e78e4 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 10:59:23 -0400 Subject: [PATCH 757/794] chore(main): release 1.15.2-SNAPSHOT (#1007) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 4cc8daf1e774..373eb4fb04f3 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index ba5a6bfaea26..7dd53b0e79b2 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 30389dc9b88d..ab4fe89ec3c4 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing _COMMIT_HASH_TAG: infrastructure-public-image-$SHORT_SHA steps: diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 96c8e3183303..e7a19a6f0340 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.15.1 + 1.15.2-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.15.1 + 1.15.2-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index e618f8ec15c3..d059f130d5f4 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.15.1 + 1.15.2-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index a14102270e17..a52e7ae4c47a 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.15.1:1.15.1 +google-cloud-shared-config:1.15.1:1.15.2-SNAPSHOT From c0506c568cd3ddea9eac102d910f3acbf02f1932 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 11:27:03 -0400 Subject: [PATCH 758/794] chore(main): release 1.15.2 (#1011) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .../.cloudbuild/cloudbuild-test-a.yaml | 2 +- .../.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 12 ++++++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- .../native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 19 insertions(+), 7 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 373eb4fb04f3..fe2b0f15d40a 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.2' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 7dd53b0e79b2..911d90490cd6 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.2' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index ab4fe89ec3c4..03b89f3e1982 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.2' # {x-version-update:google-cloud-shared-config:current} _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing _COMMIT_HASH_TAG: infrastructure-public-image-$SHORT_SHA steps: diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index bbd3730e98fd..59bb9453bdef 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.15.2](https://github.com/googleapis/java-shared-config/compare/v1.15.1...v1.15.2) (2025-04-15) + + +### Bug Fixes + +* Reintroduce support for GraalVM 17 ([#1010](https://github.com/googleapis/java-shared-config/issues/1010)) ([1906261](https://github.com/googleapis/java-shared-config/commit/19062614fd71a78c9cb88a7ff6f33b196ebba660)) + + +### Dependencies + +* Update dependency org.graalvm.sdk:graal-sdk to v24.2.0 ([#1005](https://github.com/googleapis/java-shared-config/issues/1005)) ([8186e31](https://github.com/googleapis/java-shared-config/commit/8186e31129eaa35257fd07cd23e8af4f1fc7742e)) + ## [1.15.1](https://github.com/googleapis/java-shared-config/compare/v1.15.0...v1.15.1) (2025-03-26) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index e7a19a6f0340..cfb7b6e9f3cf 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.15.2-SNAPSHOT + 1.15.2 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.15.2-SNAPSHOT + 1.15.2 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index d059f130d5f4..d8a9b6425851 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.15.2-SNAPSHOT + 1.15.2 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index a52e7ae4c47a..67a179f9f7ed 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.15.1:1.15.2-SNAPSHOT +google-cloud-shared-config:1.15.2:1.15.2 From be2042a9d621216f18ce83b9d134ac2f90be6494 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 16:18:22 +0000 Subject: [PATCH 759/794] chore(main): release 1.15.3-SNAPSHOT (#1012) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-c.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index fe2b0f15d40a..bf95e3fdc43f 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 911d90490cd6..5fc1c3d3c9c6 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml index d97e3d6e6b14..ef2787a1c94a 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM C build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 03b89f3e1982..86e43bba65a6 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.2' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing _COMMIT_HASH_TAG: infrastructure-public-image-$SHORT_SHA steps: diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index cfb7b6e9f3cf..5c9a0125dd67 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.15.2 + 1.15.3-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.15.2 + 1.15.3-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index d8a9b6425851..a70185d0dfe1 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.15.2 + 1.15.3-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 67a179f9f7ed..becbd3588717 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.15.2:1.15.2 +google-cloud-shared-config:1.15.2:1.15.3-SNAPSHOT From c457accafaf54e0e42c2793856f35c9821731f7d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 12:57:22 -0400 Subject: [PATCH 760/794] chore(main): release 1.15.3 (#1014) * chore(main): release 1.15.3 * chore: include image C * chore: include image "C" ii --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Diego Marquez --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-c.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/.github/release-please.yml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 9 files changed, 16 insertions(+), 9 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index bf95e3fdc43f..844b0c4ba126 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.3' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 5fc1c3d3c9c6..c01e3939e490 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.3' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml index ef2787a1c94a..83571abb74b2 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.3' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM C build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 86e43bba65a6..41b661afa926 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.3-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.3' # {x-version-update:google-cloud-shared-config:current} _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing _COMMIT_HASH_TAG: infrastructure-public-image-$SHORT_SHA steps: diff --git a/java-shared-config/.github/release-please.yml b/java-shared-config/.github/release-please.yml index bebea50cfe92..63c776ff27a6 100644 --- a/java-shared-config/.github/release-please.yml +++ b/java-shared-config/.github/release-please.yml @@ -1,6 +1,6 @@ releaseType: java-yoshi handleGHRelease: true -extraFiles: [".cloudbuild/cloudbuild.yaml", ".cloudbuild/cloudbuild-test-a.yaml", ".cloudbuild/cloudbuild-test-b.yaml" ] +extraFiles: [".cloudbuild/cloudbuild.yaml", ".cloudbuild/cloudbuild-test-a.yaml", ".cloudbuild/cloudbuild-test-b.yaml", ".cloudbuild/cloudbuild-test-c.yaml" ] branches: - bumpMinorPreMajor: true handleGHRelease: true diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 59bb9453bdef..1766558cdd3f 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.15.3](https://github.com/googleapis/java-shared-config/compare/v1.15.2...v1.15.3) (2025-04-15) + + +### Bug Fixes + +* Reintroduce support for GraalVM 17 ([75879e3](https://github.com/googleapis/java-shared-config/commit/75879e39eae3f119a40524d6ac8d22af8b8407d5)) + ## [1.15.2](https://github.com/googleapis/java-shared-config/compare/v1.15.1...v1.15.2) (2025-04-15) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 5c9a0125dd67..b10da129735e 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.15.3-SNAPSHOT + 1.15.3 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.15.3-SNAPSHOT + 1.15.3 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index a70185d0dfe1..81fa681a3d9b 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.15.3-SNAPSHOT + 1.15.3 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index becbd3588717..654400393426 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.15.2:1.15.3-SNAPSHOT +google-cloud-shared-config:1.15.3:1.15.3 From 764f022dfb62f36596468760637d626489f524ee Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 18:26:21 +0000 Subject: [PATCH 761/794] chore(main): release 1.15.4-SNAPSHOT (#1015) :robot: I have created a release *beep* *boop* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://togithub.com/googleapis/release-please). See [documentation](https://togithub.com/googleapis/release-please#release-please). --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-c.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 844b0c4ba126..75a8d32f3497 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.3' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index c01e3939e490..cbc77e44d295 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.3' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml index 83571abb74b2..36951c5d7026 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.3' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM C build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 41b661afa926..04e557d1c97e 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.3' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing _COMMIT_HASH_TAG: infrastructure-public-image-$SHORT_SHA steps: diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index b10da129735e..5d1a4c5b5acf 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.15.3 + 1.15.4-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.15.3 + 1.15.4-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 81fa681a3d9b..2f6891dbea6d 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.15.3 + 1.15.4-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 654400393426..1cd7ce9235b7 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.15.3:1.15.3 +google-cloud-shared-config:1.15.3:1.15.4-SNAPSHOT From 17469bdcbdb6b486a9782f02a30539f4d4bae43f Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Tue, 15 Apr 2025 14:40:57 -0400 Subject: [PATCH 762/794] fix: use recommended variable expansion syntax (#1016) * fix: use recommended variable expansion syntax * chore: test expansion * chore: automap substitutions * confirm no braces produces the problem * chore: restore c job yaml --- java-shared-config/.cloudbuild/cloudbuild-test-c.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml index 36951c5d7026..524f5da2de7e 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml @@ -33,4 +33,4 @@ steps: waitFor: [ "graalvm-c-build" ] options: - logging: CLOUD_LOGGING_ONLY + logging: CLOUD_LOGGING_ONLY \ No newline at end of file diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 04e557d1c97e..a7804bb38e16 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -16,7 +16,7 @@ timeout: 7200s # 2 hours substitutions: _JAVA_SHARED_CONFIG_VERSION: '1.15.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing - _COMMIT_HASH_TAG: infrastructure-public-image-$SHORT_SHA + _COMMIT_HASH_TAG: infrastructure-public-image-${SHORT_SHA} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker From ed9190cd6309246e9ac07ad0d4e10cb5f2251f39 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 15:06:20 -0400 Subject: [PATCH 763/794] chore(main): release 1.15.4 (#1017) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-c.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 8 files changed, 15 insertions(+), 8 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 75a8d32f3497..b33da5f1dd2c 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.4' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index cbc77e44d295..edc881b6f492 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.4' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml index 524f5da2de7e..234bcc4f03ef 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.4' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM C build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index a7804bb38e16..418893405f80 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.4-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.4' # {x-version-update:google-cloud-shared-config:current} _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing _COMMIT_HASH_TAG: infrastructure-public-image-${SHORT_SHA} steps: diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 1766558cdd3f..02a10aab5f61 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.15.4](https://github.com/googleapis/java-shared-config/compare/v1.15.3...v1.15.4) (2025-04-15) + + +### Bug Fixes + +* Use recommended variable expansion syntax ([#1016](https://github.com/googleapis/java-shared-config/issues/1016)) ([6ff6dc4](https://github.com/googleapis/java-shared-config/commit/6ff6dc48b8d92604164da7c68e268476b5a16578)) + ## [1.15.3](https://github.com/googleapis/java-shared-config/compare/v1.15.2...v1.15.3) (2025-04-15) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 5d1a4c5b5acf..fc9e015de9e2 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.15.4-SNAPSHOT + 1.15.4 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.15.4-SNAPSHOT + 1.15.4 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 2f6891dbea6d..1ac205bc6d70 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.15.4-SNAPSHOT + 1.15.4 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 1cd7ce9235b7..31d6cdd78fcd 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.15.3:1.15.4-SNAPSHOT +google-cloud-shared-config:1.15.4:1.15.4 From e323b3b272c8c893fbc8105abb63241016550262 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 16 Apr 2025 12:31:05 -0400 Subject: [PATCH 764/794] chore(main): release 1.15.5-SNAPSHOT (#1018) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-c.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index b33da5f1dd2c..ba61b6874a0a 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.4' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index edc881b6f492..d1c94394338a 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.4' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml index 234bcc4f03ef..34abd4807140 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.4' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM C build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 418893405f80..ddf641792831 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.4' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing _COMMIT_HASH_TAG: infrastructure-public-image-${SHORT_SHA} steps: diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index fc9e015de9e2..aa3e94cd937b 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.15.4 + 1.15.5-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.15.4 + 1.15.5-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 1ac205bc6d70..7235dad3dadf 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.15.4 + 1.15.5-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 31d6cdd78fcd..9b6f7ada2eaf 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.15.4:1.15.4 +google-cloud-shared-config:1.15.4:1.15.5-SNAPSHOT From 4ba80194b94c41d98e11866f21bb25a46891d2ce Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 1 May 2025 04:56:43 +0200 Subject: [PATCH 765/794] deps: update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.6 (#1004) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 7235dad3dadf..b2c7cf4c657c 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -61,7 +61,7 @@ 24.2.0 3.5.2 24.1.2 - 0.10.5 + 0.10.6 5.11.4 1.3.0 org.graalvm.sdk:nativeimage From 1485f5edc92d9b155d2ae46c6129e01dbcc745ec Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Mon, 12 May 2025 22:15:12 +0200 Subject: [PATCH 766/794] build(deps): update dependency org.apache.maven.plugins:maven-deploy-plugin to v3.1.4 (#994) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index b2c7cf4c657c..adc468bf0d17 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -100,7 +100,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.3 + 3.1.4 diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index c2b752e12dff..7850616d9caa 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -35,7 +35,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.3 + 3.1.4 true From cce3b8feb570ea4b7fee35eb0ed0c970096c9313 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 15 May 2025 21:55:24 +0200 Subject: [PATCH 767/794] deps: update dependency org.graalvm.sdk:graal-sdk to v24.2.1 (#1021) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index adc468bf0d17..6c2423fb590c 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -58,7 +58,7 @@ - 24.2.0 + 24.2.1 3.5.2 24.1.2 0.10.6 From 3fb3a25767cacb07c3bff67868a4d72cf95cd628 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Tue, 27 May 2025 12:17:41 -0400 Subject: [PATCH 768/794] feat: update GraalVM image B to GraalVM for JDK 24 (#1024) update GraalVM image B to JDK 24, remove unsupported GraalVM 23. --- java-shared-config/.cloudbuild/graalvm-b.Dockerfile | 2 +- java-shared-config/.cloudbuild/graalvm-b.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.cloudbuild/graalvm-b.Dockerfile b/java-shared-config/.cloudbuild/graalvm-b.Dockerfile index 62e7a4ad6d55..26cebd13626f 100644 --- a/java-shared-config/.cloudbuild/graalvm-b.Dockerfile +++ b/java-shared-config/.cloudbuild/graalvm-b.Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ghcr.io/graalvm/graalvm-community:23.0.2-ol9-20250121 +FROM ghcr.io/graalvm/graalvm-community:24.0.1-ol9-20250415 # native-image comes out of the box RUN native-image --version diff --git a/java-shared-config/.cloudbuild/graalvm-b.yaml b/java-shared-config/.cloudbuild/graalvm-b.yaml index 01e2eb20bc1f..dac42c7cb56e 100644 --- a/java-shared-config/.cloudbuild/graalvm-b.yaml +++ b/java-shared-config/.cloudbuild/graalvm-b.yaml @@ -17,7 +17,7 @@ commandTests: - name: "version" command: ["java", "-version"] # java -version outputs to stderr... - expectedError: ["openjdk version \"23.0.2\"", "GraalVM CE 23.0.2"] + expectedError: ["openjdk version \"24.0.1\"", "GraalVM CE 24.0.1"] - name: "maven" command: ["mvn", "-version"] expectedOutput: ["Apache Maven 3.9.4"] From a1da4dacfce926645d0abaf16d0640275a861753 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 27 May 2025 15:04:58 -0400 Subject: [PATCH 769/794] chore(main): release 1.16.0 (#1019) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .../.cloudbuild/cloudbuild-test-a.yaml | 2 +- .../.cloudbuild/cloudbuild-test-b.yaml | 2 +- .../.cloudbuild/cloudbuild-test-c.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 13 +++++++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- .../native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 8 files changed, 21 insertions(+), 8 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index ba61b6874a0a..6337bca0c3b0 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index d1c94394338a..b010bf95bc1b 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml index 34abd4807140..944b1148394a 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM C build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index ddf641792831..5a85769e7eaf 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.0' # {x-version-update:google-cloud-shared-config:current} _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing _COMMIT_HASH_TAG: infrastructure-public-image-${SHORT_SHA} steps: diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 02a10aab5f61..2d0bd94a3e81 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [1.16.0](https://github.com/googleapis/java-shared-config/compare/v1.15.4...v1.16.0) (2025-05-27) + + +### Features + +* Update GraalVM image B to GraalVM for JDK 24 ([#1024](https://github.com/googleapis/java-shared-config/issues/1024)) ([9ef9d8b](https://github.com/googleapis/java-shared-config/commit/9ef9d8bc0abedc59d9337cb5f3426bcadfaeb4a3)) + + +### Dependencies + +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.6 ([#1004](https://github.com/googleapis/java-shared-config/issues/1004)) ([f123860](https://github.com/googleapis/java-shared-config/commit/f123860c0919c542d34f4b96e54e3378b0b5b433)) +* Update dependency org.graalvm.sdk:graal-sdk to v24.2.1 ([#1021](https://github.com/googleapis/java-shared-config/issues/1021)) ([28a41c7](https://github.com/googleapis/java-shared-config/commit/28a41c787a00514d7515e7f7f9242769cbb450b5)) + ## [1.15.4](https://github.com/googleapis/java-shared-config/compare/v1.15.3...v1.15.4) (2025-04-15) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index aa3e94cd937b..a22f27551a84 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.15.5-SNAPSHOT + 1.16.0 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.15.5-SNAPSHOT + 1.16.0 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 6c2423fb590c..ce04f3bb971b 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.15.5-SNAPSHOT + 1.16.0 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 9b6f7ada2eaf..9a3d1c47624d 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.15.4:1.15.5-SNAPSHOT +google-cloud-shared-config:1.16.0:1.16.0 From 9a8acacee776c217a65123f7a8bc1199caf2c9f8 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 4 Jun 2025 17:15:32 -0400 Subject: [PATCH 770/794] deps: latest maven-deploy-plugin 3.1.4 (#1026) Without explicitly declaring maven-deploy-plugin, it's possible that some release job uses its 2.x version, which doesn't recognize "local::file:${local_staging_dir}" parameter. cl/766852134 --- java-shared-config/java-shared-config/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index a22f27551a84..ff03217c36a5 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -224,6 +224,11 @@ maven-install-plugin 3.1.3 + + org.apache.maven.plugins + maven-deploy-plugin + 3.1.4 + From ace4cac9b457aa38599d557f5159a8527af1c30a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 5 Jun 2025 21:04:54 -0400 Subject: [PATCH 771/794] chore(main): release 1.16.1-SNAPSHOT (#1025) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-c.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 6337bca0c3b0..7bcc3c24b4e1 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index b010bf95bc1b..ef87577f02dd 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml index 944b1148394a..8e9ebc7d18fc 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM C build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 5a85769e7eaf..a6084b5ddfb9 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing _COMMIT_HASH_TAG: infrastructure-public-image-${SHORT_SHA} steps: diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index ff03217c36a5..cd5d5e496c83 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.16.0 + 1.16.1-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.16.0 + 1.16.1-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index ce04f3bb971b..c9b650ffe4ef 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.16.0 + 1.16.1-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 9a3d1c47624d..5d56250443c8 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.16.0:1.16.0 +google-cloud-shared-config:1.16.0:1.16.1-SNAPSHOT From 95d2442615c97b13b153995ad96d4bdd533b273c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 6 Jun 2025 15:03:35 -0400 Subject: [PATCH 772/794] chore(main): release 1.16.1 (#1027) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-c.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 7 +++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 8 files changed, 15 insertions(+), 8 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 7bcc3c24b4e1..2fe979d78ddd 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index ef87577f02dd..2cc252225fc0 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml index 8e9ebc7d18fc..9a0f5a7cfc19 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM C build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index a6084b5ddfb9..1a4059df040a 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.1' # {x-version-update:google-cloud-shared-config:current} _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing _COMMIT_HASH_TAG: infrastructure-public-image-${SHORT_SHA} steps: diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 2d0bd94a3e81..1ff441017c13 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.16.1](https://github.com/googleapis/java-shared-config/compare/v1.16.0...v1.16.1) (2025-06-06) + + +### Dependencies + +* Latest maven-deploy-plugin 3.1.4 ([#1026](https://github.com/googleapis/java-shared-config/issues/1026)) ([6f83f0b](https://github.com/googleapis/java-shared-config/commit/6f83f0bab04c01f577e42d2b8076f4d557675a57)) + ## [1.16.0](https://github.com/googleapis/java-shared-config/compare/v1.15.4...v1.16.0) (2025-05-27) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index cd5d5e496c83..86558e814ae7 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.16.1-SNAPSHOT + 1.16.1 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.16.1-SNAPSHOT + 1.16.1 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index c9b650ffe4ef..3497391957f9 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.16.1-SNAPSHOT + 1.16.1 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 5d56250443c8..a10282b6155d 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.16.0:1.16.1-SNAPSHOT +google-cloud-shared-config:1.16.1:1.16.1 From f3e08fe219a6310bf13542353e02ce5cc1b03465 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 20 Jun 2025 13:39:16 -0400 Subject: [PATCH 773/794] chore(main): release 1.16.2-SNAPSHOT (#1028) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-c.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 2fe979d78ddd..9fb0fa9ce350 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 2cc252225fc0..738bd03d911f 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml index 9a0f5a7cfc19..36ab8019aa64 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM C build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index 1a4059df040a..fcf9f3493344 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.1' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.16.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing _COMMIT_HASH_TAG: infrastructure-public-image-${SHORT_SHA} steps: diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 86558e814ae7..c4d7078ce64b 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.16.1 + 1.16.2-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.16.1 + 1.16.2-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 3497391957f9..d92f663ea93e 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.16.1 + 1.16.2-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index a10282b6155d..5f3ebe2001f9 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.16.1:1.16.1 +google-cloud-shared-config:1.16.1:1.16.2-SNAPSHOT From 66e65a86572bfe4d1a3c0cef3d5f3664ad00adff Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 12 Sep 2025 16:46:09 +0200 Subject: [PATCH 774/794] deps: update dependency org.graalvm.sdk:nativeimage to v24.2.2 (#1029) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index d92f663ea93e..9d04cdfaad62 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -60,7 +60,7 @@ 24.2.1 3.5.2 - 24.1.2 + 24.2.2 0.10.6 5.11.4 1.3.0 From 6f4c91c08219e3b1b48cc7c68ffb20f1c9cfad35 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 10 Oct 2025 21:02:37 +0100 Subject: [PATCH 775/794] deps: update dependency org.graalvm.sdk:graal-sdk to v25 (#1034) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 9d04cdfaad62..c785543f4a7e 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -58,7 +58,7 @@ - 24.2.1 + 25.0.0 3.5.2 24.2.2 0.10.6 From 774db34c479e1ced8392235573c413ffaa8d1ff5 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 10 Oct 2025 21:02:59 +0100 Subject: [PATCH 776/794] deps: update dependency org.graalvm.sdk:nativeimage to v25 (#1035) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index c785543f4a7e..4883b15168c9 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -60,7 +60,7 @@ 25.0.0 3.5.2 - 24.2.2 + 25.0.0 0.10.6 5.11.4 1.3.0 From 3114a5331ac84e03ec21b95c65de94f8dd1bf5b4 Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Fri, 10 Oct 2025 21:01:35 +0000 Subject: [PATCH 777/794] feat: upgrade GraalVM image B to 25 (#1037) * ci: Test with GraalVM 25 * chore: Fix expected output * deps: update dependency org.graalvm.sdk:graal-sdk to v25 (#1034) * deps: update dependency org.graalvm.sdk:nativeimage to v25 (#1035) --------- Co-authored-by: Mend Renovate --- java-shared-config/.cloudbuild/graalvm-b.Dockerfile | 2 +- java-shared-config/.cloudbuild/graalvm-b.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.cloudbuild/graalvm-b.Dockerfile b/java-shared-config/.cloudbuild/graalvm-b.Dockerfile index 26cebd13626f..ba39d3d27c5e 100644 --- a/java-shared-config/.cloudbuild/graalvm-b.Dockerfile +++ b/java-shared-config/.cloudbuild/graalvm-b.Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM ghcr.io/graalvm/graalvm-community:24.0.1-ol9-20250415 +FROM ghcr.io/graalvm/graalvm-community:25.0.0-ol9-20250916 # native-image comes out of the box RUN native-image --version diff --git a/java-shared-config/.cloudbuild/graalvm-b.yaml b/java-shared-config/.cloudbuild/graalvm-b.yaml index dac42c7cb56e..32be9f4d7a0b 100644 --- a/java-shared-config/.cloudbuild/graalvm-b.yaml +++ b/java-shared-config/.cloudbuild/graalvm-b.yaml @@ -17,7 +17,7 @@ commandTests: - name: "version" command: ["java", "-version"] # java -version outputs to stderr... - expectedError: ["openjdk version \"24.0.1\"", "GraalVM CE 24.0.1"] + expectedError: ["openjdk version \"25\"", "GraalVM CE 25"] - name: "maven" command: ["mvn", "-version"] expectedOutput: ["Apache Maven 3.9.4"] From b06b3409bdc898d47b00fb1a802334525cc605e5 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 13:20:35 -0400 Subject: [PATCH 778/794] chore(main): release 1.17.0 (#1030) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .../.cloudbuild/cloudbuild-test-a.yaml | 2 +- .../.cloudbuild/cloudbuild-test-b.yaml | 2 +- .../.cloudbuild/cloudbuild-test-c.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/CHANGELOG.md | 14 ++++++++++++++ java-shared-config/java-shared-config/pom.xml | 4 ++-- .../native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 8 files changed, 22 insertions(+), 8 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index 9fb0fa9ce350..d89dbb98f647 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.17.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 738bd03d911f..34956a2fa4cd 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.17.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml index 36ab8019aa64..1776a7d76a9f 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.17.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM C build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index fcf9f3493344..c1652a72fee7 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.16.2-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.17.0' # {x-version-update:google-cloud-shared-config:current} _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing _COMMIT_HASH_TAG: infrastructure-public-image-${SHORT_SHA} steps: diff --git a/java-shared-config/CHANGELOG.md b/java-shared-config/CHANGELOG.md index 1ff441017c13..a33c6a06cc6c 100644 --- a/java-shared-config/CHANGELOG.md +++ b/java-shared-config/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [1.17.0](https://github.com/googleapis/java-shared-config/compare/v1.16.1...v1.17.0) (2025-10-10) + + +### Features + +* Upgrade GraalVM image B to 25 ([#1037](https://github.com/googleapis/java-shared-config/issues/1037)) ([fde1cf4](https://github.com/googleapis/java-shared-config/commit/fde1cf446b245dafcbeea4ce58e00ec2e0880c58)) + + +### Dependencies + +* Update dependency org.graalvm.sdk:graal-sdk to v25 ([#1034](https://github.com/googleapis/java-shared-config/issues/1034)) ([e260c95](https://github.com/googleapis/java-shared-config/commit/e260c95a122d9667e54376a3342a2ba83996a48c)) +* Update dependency org.graalvm.sdk:nativeimage to v24.2.2 ([#1029](https://github.com/googleapis/java-shared-config/issues/1029)) ([4a2f59c](https://github.com/googleapis/java-shared-config/commit/4a2f59c491f9731d371c23e9cd2a89b7ec4b3e0b)) +* Update dependency org.graalvm.sdk:nativeimage to v25 ([#1035](https://github.com/googleapis/java-shared-config/issues/1035)) ([1182a88](https://github.com/googleapis/java-shared-config/commit/1182a8879158075aa58dc22cfa5da28d1cdf8858)) + ## [1.16.1](https://github.com/googleapis/java-shared-config/compare/v1.16.0...v1.16.1) (2025-06-06) diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index c4d7078ce64b..815dccaed4d0 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.16.2-SNAPSHOT + 1.17.0 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.16.2-SNAPSHOT + 1.17.0 ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 4883b15168c9..f515b327bb75 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.16.2-SNAPSHOT + 1.17.0 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index 5f3ebe2001f9..f8cc6834695d 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.16.1:1.16.2-SNAPSHOT +google-cloud-shared-config:1.17.0:1.17.0 From f16586e59b39da2c8912de04607154d918372fff Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 13:39:00 -0400 Subject: [PATCH 779/794] chore(main): release 1.17.1-SNAPSHOT (#1038) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- java-shared-config/.cloudbuild/cloudbuild-test-a.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-b.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild-test-c.yaml | 2 +- java-shared-config/.cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/java-shared-config/pom.xml | 4 ++-- java-shared-config/native-image-shared-config/pom.xml | 2 +- java-shared-config/versions.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml index d89dbb98f647..990ce17ff20d 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.17.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.17.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml index 34956a2fa4cd..636c254ed5b0 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.17.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.17.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml index 1776a7d76a9f..d4188600e34e 100644 --- a/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild-test-c.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.17.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.17.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM C build diff --git a/java-shared-config/.cloudbuild/cloudbuild.yaml b/java-shared-config/.cloudbuild/cloudbuild.yaml index c1652a72fee7..7f250f654e19 100644 --- a/java-shared-config/.cloudbuild/cloudbuild.yaml +++ b/java-shared-config/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.17.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.17.1-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} _IMAGE_REPOSITORY: us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing _COMMIT_HASH_TAG: infrastructure-public-image-${SHORT_SHA} steps: diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index 815dccaed4d0..f90152a7701a 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.17.0 + 1.17.1-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.17.0 + 1.17.1-SNAPSHOT ../native-image-shared-config diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index f515b327bb75..b670659a6f09 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.17.0 + 1.17.1-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/java-shared-config/versions.txt b/java-shared-config/versions.txt index f8cc6834695d..b880575986f5 100644 --- a/java-shared-config/versions.txt +++ b/java-shared-config/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.17.0:1.17.0 +google-cloud-shared-config:1.17.0:1.17.1-SNAPSHOT From 30edb5a40d1e0bbb9dc1392145610e73a931a2f8 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Tue, 25 Nov 2025 13:53:40 -0500 Subject: [PATCH 780/794] test: set up test release candidate branches (#1040) * test: set up test releaase candidate branches This repo has a small blast radius for release testing. We aim to test the rc`n` versioning schema soon to be provided by https://github.com/googleapis/release-please/pull/2622. Additionally, we test with `prerelease` to understand its behavior. * chore: use prerelease mode only Removed prerelease settings and adjusted branch for release. * chore: use base flags --- java-shared-config/.github/release-please.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/java-shared-config/.github/release-please.yml b/java-shared-config/.github/release-please.yml index 63c776ff27a6..470ae2f12c06 100644 --- a/java-shared-config/.github/release-please.yml +++ b/java-shared-config/.github/release-please.yml @@ -6,3 +6,7 @@ branches: handleGHRelease: true releaseType: java-yoshi branch: java7 +- bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-yoshi + branch: test-protobuf-4.x-rc From 9630e2524fad9306d31934187f0d3b9ec2a58618 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Tue, 2 Dec 2025 15:44:33 -0500 Subject: [PATCH 781/794] chore: update protobuf 4.x branch name in release configuration (#1048) --- java-shared-config/.github/release-please.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/.github/release-please.yml b/java-shared-config/.github/release-please.yml index 470ae2f12c06..cf9f7d24349d 100644 --- a/java-shared-config/.github/release-please.yml +++ b/java-shared-config/.github/release-please.yml @@ -9,4 +9,4 @@ branches: - bumpMinorPreMajor: true handleGHRelease: true releaseType: java-yoshi - branch: test-protobuf-4.x-rc + branch: protobuf-4.x-rc From f3be7b6df742a4336b0db6b2c73cf86343807291 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Wed, 3 Dec 2025 10:37:08 -0500 Subject: [PATCH 782/794] chore: add manifest option to release-please configuration (#1053) --- java-shared-config/.github/release-please.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/java-shared-config/.github/release-please.yml b/java-shared-config/.github/release-please.yml index cf9f7d24349d..45b8c6cf606b 100644 --- a/java-shared-config/.github/release-please.yml +++ b/java-shared-config/.github/release-please.yml @@ -10,3 +10,4 @@ branches: handleGHRelease: true releaseType: java-yoshi branch: protobuf-4.x-rc + manifest: true From 19e6ef5c27ce8b581d3d9d77156b0d3d690ef95f Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 5 Jan 2026 17:23:13 -0500 Subject: [PATCH 783/794] feat: remove the graal-sdk.version property (#1065) This property is no longer used upstream. We should only rely on the nativeimage.version property going forward. --- java-shared-config/native-image-shared-config/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index b670659a6f09..8646df6d5999 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -58,7 +58,6 @@ - 25.0.0 3.5.2 25.0.0 0.10.6 From 059a4627bde478f3695fbb0999a2a751e2c182b6 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 5 Jan 2026 17:35:10 -0500 Subject: [PATCH 784/794] feat: use only nativeimage.version property in depManagement (#1067) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 8646df6d5999..7b3c210a8db1 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -71,7 +71,7 @@ org.graalvm.sdk graal-sdk - ${graal-sdk.version} + ${graal-sdk-nativeimage.version} org.graalvm.sdk From d92a9f68be032a8c49abc839c3788b361111963f Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Tue, 13 Jan 2026 16:01:47 -0500 Subject: [PATCH 785/794] chore: cleanup release-please config (#1059) * chore: cleanup release-please config - Remove redundant options already declared at the top level.\n- Remove bumpMinorPreMajor for repositories after the first major release. * chore: format release-please.yml --- java-shared-config/.github/release-please.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/java-shared-config/.github/release-please.yml b/java-shared-config/.github/release-please.yml index 45b8c6cf606b..6d36df137ee2 100644 --- a/java-shared-config/.github/release-please.yml +++ b/java-shared-config/.github/release-please.yml @@ -1,13 +1,9 @@ releaseType: java-yoshi handleGHRelease: true -extraFiles: [".cloudbuild/cloudbuild.yaml", ".cloudbuild/cloudbuild-test-a.yaml", ".cloudbuild/cloudbuild-test-b.yaml", ".cloudbuild/cloudbuild-test-c.yaml" ] +extraFiles: [".cloudbuild/cloudbuild.yaml", ".cloudbuild/cloudbuild-test-a.yaml", ".cloudbuild/cloudbuild-test-b.yaml", ".cloudbuild/cloudbuild-test-c.yaml"] branches: -- bumpMinorPreMajor: true - handleGHRelease: true - releaseType: java-yoshi - branch: java7 -- bumpMinorPreMajor: true - handleGHRelease: true - releaseType: java-yoshi - branch: protobuf-4.x-rc - manifest: true + - branch: java7 + bumpMinorPreMajor: true + - branch: protobuf-4.x-rc + bumpMinorPreMajor: true + manifest: true From 6cbd50d33f3a10e080a3d0d18d18936e4b237e93 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 30 Jan 2026 14:16:53 -0500 Subject: [PATCH 786/794] chore: replace old java team with cloud-sdk-java-team (#1068) Replace old teams with new ones. b/479542582 --- java-shared-config/.github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-shared-config/.github/CODEOWNERS b/java-shared-config/.github/CODEOWNERS index db2d8ad1747b..f90453e92026 100644 --- a/java-shared-config/.github/CODEOWNERS +++ b/java-shared-config/.github/CODEOWNERS @@ -4,10 +4,10 @@ # For syntax help see: # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax -* @googleapis/yoshi-java +* @googleapis/cloud-sdk-java-team # The java-samples-reviewers team is the default owner for samples changes samples/**/*.java @googleapis/java-samples-reviewers # Generated snippets should not be owned by samples reviewers -samples/snippets/generated/ @googleapis/yoshi-java +samples/snippets/generated/ @googleapis/cloud-sdk-java-team From feebff078611e82df43851b43c4d560f35460389 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 22 Apr 2026 11:08:32 -0400 Subject: [PATCH 787/794] ci: sdk-platform-java-config in google-cloud-java in downstream checks (#1070) * ci: sdk-platform-java-config in google-cloud-java in downstream checks The sdk-platform-java repository has moved to the sdk-platform-java folder in the google-cloud-java repository. The downstream checks that use sdk-platform-java-config needs to adjust the location. * client-library-check-doclet --- .../.kokoro/client-library-check-doclet.sh | 29 +++++++++++-------- .../.kokoro/client-library-check.sh | 21 +++++++++----- java-shared-config/settings.xml | 9 ------ 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/java-shared-config/.kokoro/client-library-check-doclet.sh b/java-shared-config/.kokoro/client-library-check-doclet.sh index dc50a56d6562..82a6226f030d 100755 --- a/java-shared-config/.kokoro/client-library-check-doclet.sh +++ b/java-shared-config/.kokoro/client-library-check-doclet.sh @@ -76,13 +76,14 @@ scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) cd ${scriptDir}/.. # Make artifacts available for 'mvn validate' at the bottom -mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q +mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q --no-transfer-progress # Get version of doclet used to generate Cloud RAD for javadoc testing with the doclet below +rm -rf java-docfx-doclet git clone https://github.com/googleapis/java-docfx-doclet.git pushd java-docfx-doclet/third_party/docfx-doclet-143274 git checkout 1.9.0 -mvn package -Dmaven.test.skip=true +mvn package -Dmaven.test.skip=true -B -V --no-transfer-progress # work from the root directory popd @@ -101,27 +102,31 @@ fi echo "Version: ${JAVA_SHARED_CONFIG_VERSION}" # Update java-shared-config in sdk-platform-java-config -git clone "https://github.com/googleapis/sdk-platform-java.git" --depth=1 -pushd sdk-platform-java -SDK_PLATFORM_JAVA_CONFIG_VERSION=$(get_current_version_from_versions_txt versions.txt "google-cloud-shared-dependencies") -RELEASED_SHARED_DEPENDENCIES_VERSION=$(get_released_version_from_versions_txt versions.txt "google-cloud-shared-dependencies") -echo "This is the SDK_PLATFORM_JAVA_CONFIG_VERSION: ${SDK_PLATFORM_JAVA_CONFIG_VERSION}" -echo "This is the RELEASED_SHARED_DEPENDENCIES_VERSION: ${RELEASED_SHARED_DEPENDENCIES_VERSION}" -pushd sdk-platform-java-config +rm -rf google-cloud-java +# Find the latest tag matching v* and use it +LATEST_TAG=$(git ls-remote --tags https://github.com/googleapis/google-cloud-java.git | grep 'refs/tags/v' | sort -k2,2 -V | tail -n 1 | awk '{print $2}' | sed 's|refs/tags/||') +echo "Cloning google-cloud-java at tag: ${LATEST_TAG}" +git clone "https://github.com/googleapis/google-cloud-java.git" -b "${LATEST_TAG}" --depth=1 +pushd google-cloud-java/sdk-platform-java +SDK_PLATFORM_JAVA_CONFIG_VERSION=$(sed -e 's/xmlns=".*"//' sdk-platform-java-config/pom.xml | xmllint --xpath '/project/version/text()' -) +pushd sdk-platform-java-config # Use released version of google-cloud-shared-dependencies to avoid verifying SNAPSHOT changes. replace_java_shared_config_version "${JAVA_SHARED_CONFIG_VERSION}" -replace_java_shared_dependencies_version "${RELEASED_SHARED_DEPENDENCIES_VERSION}" -mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q +echo "The diff in sdk-platform-java-config:" +git --no-pager diff +echo "--------" +mvn install "-DskipTests=true" "-Dmaven.javadoc.skip=true" "-Dgcloud.download.skip=true" "-Dcheckstyle.skip=true" -B -V -q --no-transfer-progress popd # Check javadoc generation with the doclet +rm -rf "${REPO}" git clone "https://github.com/googleapis/${REPO}.git" --depth=1 pushd ${REPO} replace_sdk_platform_java_config_version "${SDK_PLATFORM_JAVA_CONFIG_VERSION}" -mvn clean -B -ntp \ +mvn clean -B --no-transfer-progress \ -P docFX \ -DdocletPath="${docletPath}" \ -Dclirr.skip=true \ diff --git a/java-shared-config/.kokoro/client-library-check.sh b/java-shared-config/.kokoro/client-library-check.sh index 425cdb45b8be..1e1da8e15f2a 100755 --- a/java-shared-config/.kokoro/client-library-check.sh +++ b/java-shared-config/.kokoro/client-library-check.sh @@ -100,21 +100,28 @@ fi echo "Version: ${JAVA_SHARED_CONFIG_VERSION}" # Update java-shared-config in sdk-platform-java-config -git clone "https://github.com/googleapis/sdk-platform-java.git" --depth=1 -pushd sdk-platform-java -SDK_PLATFORM_JAVA_CONFIG_VERSION=$(get_current_version_from_versions_txt versions.txt "google-cloud-shared-dependencies") -RELEASED_SHARED_DEPENDENCIES_VERSION=$(get_released_version_from_versions_txt versions.txt "google-cloud-shared-dependencies") -pushd sdk-platform-java-config +rm -rf google-cloud-java +# Find the latest tag matching v* and use it +LATEST_TAG=$(git ls-remote --tags https://github.com/googleapis/google-cloud-java.git | grep 'refs/tags/v' | sort -k2,2 -V | tail -n 1 | awk '{print $2}' | sed 's|refs/tags/||') +echo "Cloning google-cloud-java at tag: ${LATEST_TAG}" +git clone "https://github.com/googleapis/google-cloud-java.git" -b "${LATEST_TAG}" --depth=1 +pushd google-cloud-java/sdk-platform-java +SDK_PLATFORM_JAVA_CONFIG_VERSION=$(sed -e 's/xmlns=".*"//' sdk-platform-java-config/pom.xml | xmllint --xpath '/project/version/text()' -) +pushd sdk-platform-java-config # Use released version of google-cloud-shared-dependencies to avoid verifying SNAPSHOT changes. replace_java_shared_config_version "${JAVA_SHARED_CONFIG_VERSION}" -replace_java_shared_dependencies_version "${RELEASED_SHARED_DEPENDENCIES_VERSION}" -mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q +echo "The diff in sdk-platform-java-config:" +git --no-pager diff +echo "--------" +mvn install "-DskipTests=true" "-Dmaven.javadoc.skip=true" "-Dgcloud.download.skip=true" "-Dcheckstyle.skip=true" -B -V -q popd + popd # Check this BOM against a few java client libraries # java-bigquery +rm -rf "${REPO}" if [ -z "${REPO_TAG}" ]; then git clone "https://github.com/googleapis/${REPO}.git" --depth=1 else diff --git a/java-shared-config/settings.xml b/java-shared-config/settings.xml index 9b4a8c79d5d5..5df3ab0b2a1a 100644 --- a/java-shared-config/settings.xml +++ b/java-shared-config/settings.xml @@ -19,14 +19,5 @@ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd"> - - - google-maven-central - GCS Maven Central mirror - https://maven-central.storage-download.googleapis.com/maven2/ - central - \ No newline at end of file From 29edba6cb7526ed8185def08ef746859fab6a9df Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 22 Apr 2026 11:33:27 -0400 Subject: [PATCH 788/794] fix: Update renovate config check to use npx (#1069) * fix: Update renovate config check to use npx * fix: Update renovate config check to use valid version 43.136.0 --- .../.github/workflows/renovate_config_check.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/java-shared-config/.github/workflows/renovate_config_check.yaml b/java-shared-config/.github/workflows/renovate_config_check.yaml index 36da117bc7b0..d3467e9d27e0 100644 --- a/java-shared-config/.github/workflows/renovate_config_check.yaml +++ b/java-shared-config/.github/workflows/renovate_config_check.yaml @@ -4,6 +4,7 @@ on: pull_request: paths: - 'renovate.json' + - '.github/workflows/renovate_config_check.yaml' jobs: renovate_bot_config_validation: @@ -18,8 +19,6 @@ jobs: with: node-version: '20' - - name: Install Renovate and Config Validator + - name: Run Renovate Config Validator run: | - npm install -g npm@latest - npm install --global renovate - renovate-config-validator + npx --package renovate@43.136.0 renovate-config-validator From 6f06dbc10e4fed38a54d0725f0a04f1bc451ceb0 Mon Sep 17 00:00:00 2001 From: Blake Li Date: Mon, 1 Jun 2026 16:48:56 -0400 Subject: [PATCH 789/794] build(deps): Upgrade junit to 5.14.3 (#1071) --- java-shared-config/native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 7b3c210a8db1..206347c083b2 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -61,7 +61,7 @@ 3.5.2 25.0.0 0.10.6 - 5.11.4 + 5.14.3 1.3.0 org.graalvm.sdk:nativeimage From 931d2110609e40d6773c493aee6f8c54b2a4d0d8 Mon Sep 17 00:00:00 2001 From: Jin Seop Kim Date: Mon, 15 Jun 2026 13:59:15 -0400 Subject: [PATCH 790/794] chore: address review feedback from gemini code assist --- .github/CODEOWNERS | 2 +- generation/apply_versions.sh | 2 +- java-shared-config/java-shared-config/pom.xml | 12 ++++-------- .../native-image-shared-config/pom.xml | 3 +-- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index da273a0fa6a0..e379fc535ffc 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -20,4 +20,4 @@ /java-bigtable/ @googleapis/bigtable-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team /java-firestore/ @googleapis/firestore-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team /librarian.yaml @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team -/java-shared-config/ @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-java-team +/java-shared-config/ @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team diff --git a/generation/apply_versions.sh b/generation/apply_versions.sh index 85309eded5db..6747b4191c11 100755 --- a/generation/apply_versions.sh +++ b/generation/apply_versions.sh @@ -31,7 +31,7 @@ elif [[ "$column_name" != "current" ]]; then fi -SED_SCRIPT_FILE=$(mktemp) +SED_SCRIPT_FILE=$(mktemp) || exit 1 trap 'rm -f "$SED_SCRIPT_FILE"' EXIT # The second column is diff --git a/java-shared-config/java-shared-config/pom.xml b/java-shared-config/java-shared-config/pom.xml index f90152a7701a..1bd8a59eb1df 100644 --- a/java-shared-config/java-shared-config/pom.xml +++ b/java-shared-config/java-shared-config/pom.xml @@ -144,17 +144,13 @@ 3.8.1 - javax.annotation:javax.annotation-api - + javax.annotation:javax.annotation-api - io.grpc:* - - com.google.protobuf:* - - com.google.api.grpc:* - + io.grpc:* + com.google.protobuf:* + com.google.api.grpc:* diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 206347c083b2..09d7f5441546 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -28,8 +28,7 @@ scm:git:git@github.com:googleapis/java-shared-config.git - scm:git:git@github.com:googleapis/java-shared-config.git - + scm:git:git@github.com:googleapis/java-shared-config.git https://github.com/googleapis/java-shared-config HEAD From 938f2ca898c953ba9a6cae3e36bd3969bad00bdb Mon Sep 17 00:00:00 2001 From: Jin Seop Kim Date: Mon, 15 Jun 2026 14:08:56 -0400 Subject: [PATCH 791/794] chore: add missing client library check scripts for downstream CI --- .kokoro/client-library-check-doclet.sh | 145 +++++++++++++++ .kokoro/client-library-check.sh | 176 ++++++++++++++++++ ...v2.9.3-expected-flattened-dependencies.txt | 34 ++++ 3 files changed, 355 insertions(+) create mode 100755 .kokoro/client-library-check-doclet.sh create mode 100755 .kokoro/client-library-check.sh create mode 100644 .kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt diff --git a/.kokoro/client-library-check-doclet.sh b/.kokoro/client-library-check-doclet.sh new file mode 100755 index 000000000000..82a6226f030d --- /dev/null +++ b/.kokoro/client-library-check-doclet.sh @@ -0,0 +1,145 @@ +#!/bin/bash +# Copyright 2024 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. + +# Presubmit to ensure the dependencies of the Google Libraries BOM, with the modification of change +# in the PR, pick up the highest versions among transitive dependencies. +# https://maven.apache.org/enforcer/enforcer-rules/requireUpperBoundDeps.html + +set -eo pipefail +# Display commands being run. +set -x + +function get_current_version_from_versions_txt() { + versions=$1 + key=$2 + version=$(grep "$key:" "${versions}" | cut -d: -f3) # 3rd field is current + echo "${version}" +} + +function get_released_version_from_versions_txt() { + versions=$1 + key=$2 + version=$(grep "$key:" "${versions}" | cut -d: -f2) # 2nd field is release + echo "${version}" +} + +function replace_java_shared_config_version() { + version=$1 + # replace version + xmllint --shell <(cat pom.xml) << EOF + setns x=http://maven.apache.org/POM/4.0.0 + cd .//x:artifactId[text()="google-cloud-shared-config"] + cd ../x:version + set ${version} + save pom.xml +EOF +} + +function replace_java_shared_dependencies_version() { + version=$1 + # replace version + xmllint --shell <(cat pom.xml) << EOF + setns x=http://maven.apache.org/POM/4.0.0 + cd .//x:properties/x:google-cloud-shared-dependencies.version + set ${version} + save pom.xml +EOF +} + +function replace_sdk_platform_java_config_version() { + version=$1 + # replace version + xmllint --shell <(cat pom.xml) << EOF + setns x=http://maven.apache.org/POM/4.0.0 + cd .//x:artifactId[text()="sdk-platform-java-config"] + cd ../x:version + set ${version} + save pom.xml +EOF +} +REPO=$1 +# Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +# Make artifacts available for 'mvn validate' at the bottom +mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q --no-transfer-progress + +# Get version of doclet used to generate Cloud RAD for javadoc testing with the doclet below +rm -rf java-docfx-doclet +git clone https://github.com/googleapis/java-docfx-doclet.git +pushd java-docfx-doclet/third_party/docfx-doclet-143274 +git checkout 1.9.0 +mvn package -Dmaven.test.skip=true -B -V --no-transfer-progress + +# work from the root directory +popd +docletPath=$(realpath "java-docfx-doclet/third_party/docfx-doclet-143274/target/docfx-doclet-1.0-SNAPSHOT-jar-with-dependencies.jar") +echo "This is the doclet path: ${docletPath}" + +# Read the current version of this BOM in the POM. Example version: '0.116.1-alpha-SNAPSHOT' +VERSION_POM=java-shared-config/pom.xml +# Namespace (xmlns) prevents xmllint from specifying tag names in XPath +JAVA_SHARED_CONFIG_VERSION=`sed -e 's/xmlns=".*"//' ${VERSION_POM} | xmllint --xpath '/project/version/text()' -` + +if [ -z "${JAVA_SHARED_CONFIG_VERSION}" ]; then + echo "Version is not found in ${VERSION_POM}" + exit 1 +fi +echo "Version: ${JAVA_SHARED_CONFIG_VERSION}" + +# Update java-shared-config in sdk-platform-java-config +rm -rf google-cloud-java +# Find the latest tag matching v* and use it +LATEST_TAG=$(git ls-remote --tags https://github.com/googleapis/google-cloud-java.git | grep 'refs/tags/v' | sort -k2,2 -V | tail -n 1 | awk '{print $2}' | sed 's|refs/tags/||') +echo "Cloning google-cloud-java at tag: ${LATEST_TAG}" +git clone "https://github.com/googleapis/google-cloud-java.git" -b "${LATEST_TAG}" --depth=1 +pushd google-cloud-java/sdk-platform-java +SDK_PLATFORM_JAVA_CONFIG_VERSION=$(sed -e 's/xmlns=".*"//' sdk-platform-java-config/pom.xml | xmllint --xpath '/project/version/text()' -) + +pushd sdk-platform-java-config +# Use released version of google-cloud-shared-dependencies to avoid verifying SNAPSHOT changes. +replace_java_shared_config_version "${JAVA_SHARED_CONFIG_VERSION}" +echo "The diff in sdk-platform-java-config:" +git --no-pager diff +echo "--------" +mvn install "-DskipTests=true" "-Dmaven.javadoc.skip=true" "-Dgcloud.download.skip=true" "-Dcheckstyle.skip=true" -B -V -q --no-transfer-progress +popd + +# Check javadoc generation with the doclet +rm -rf "${REPO}" +git clone "https://github.com/googleapis/${REPO}.git" --depth=1 + +pushd ${REPO} +replace_sdk_platform_java_config_version "${SDK_PLATFORM_JAVA_CONFIG_VERSION}" + +mvn clean -B --no-transfer-progress \ + -P docFX \ + -DdocletPath="${docletPath}" \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \ + -Dcheckstyle.skip=true \ + -Dflatten.skip=true \ + -Danimal.sniffer.skip=true \ + javadoc:aggregate + +RETURN_CODE=$? +if [ "${RETURN_CODE}" == 0 ]; then + echo "Javadocs generated successfully with doclet" +else + echo "Javadoc generation FAILED with doclet" +fi diff --git a/.kokoro/client-library-check.sh b/.kokoro/client-library-check.sh new file mode 100755 index 000000000000..1e1da8e15f2a --- /dev/null +++ b/.kokoro/client-library-check.sh @@ -0,0 +1,176 @@ +#!/bin/bash +# 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. +# 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. + +# Presubmit to ensure the dependencies of the Google Libraries BOM, with the modification of change +# in the PR, pick up the highest versions among transitive dependencies. +# https://maven.apache.org/enforcer/enforcer-rules/requireUpperBoundDeps.html + +set -eo pipefail +# Display commands being run. +set -x + +function get_current_version_from_versions_txt() { + versions=$1 + key=$2 + version=$(grep "$key:" "${versions}" | cut -d: -f3) # 3rd field is current + echo "${version}" +} + +function get_released_version_from_versions_txt() { + versions=$1 + key=$2 + version=$(grep "$key:" "${versions}" | cut -d: -f2) # 2nd field is release + echo "${version}" +} + +function replace_java_shared_config_version() { + version=$1 + # replace version + xmllint --shell <(cat pom.xml) << EOF + setns x=http://maven.apache.org/POM/4.0.0 + cd .//x:artifactId[text()="google-cloud-shared-config"] + cd ../x:version + set ${version} + save pom.xml +EOF +} + +function replace_java_shared_dependencies_version() { + version=$1 + # replace version + xmllint --shell <(cat pom.xml) << EOF + setns x=http://maven.apache.org/POM/4.0.0 + cd .//x:properties/x:google-cloud-shared-dependencies.version + set ${version} + save pom.xml +EOF +} + +function replace_sdk_platform_java_config_version() { + version=$1 + # replace version + xmllint --shell <(cat pom.xml) << EOF + setns x=http://maven.apache.org/POM/4.0.0 + cd .//x:artifactId[text()="sdk-platform-java-config"] + cd ../x:version + set ${version} + save pom.xml +EOF +} + +if [[ $# -ne 2 ]]; +then + echo "Usage: $0 " + echo "where repo-name is java-XXX and check-type is dependencies, lint, or clirr" + exit 1 +fi +REPO=$1 +# build.sh uses this environment variable +export JOB_TYPE=$2 + +## Get the directory of the build script +scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) +## cd to the parent directory, i.e. the root of the git repo +cd ${scriptDir}/.. + +# Make artifacts available for 'mvn validate' at the bottom +mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q + +# Read the current version of this BOM in the POM. Example version: '0.116.1-alpha-SNAPSHOT' +VERSION_POM=java-shared-config/pom.xml +# Namespace (xmlns) prevents xmllint from specifying tag names in XPath +JAVA_SHARED_CONFIG_VERSION=`sed -e 's/xmlns=".*"//' ${VERSION_POM} | xmllint --xpath '/project/version/text()' -` + +if [ -z "${JAVA_SHARED_CONFIG_VERSION}" ]; then + echo "Version is not found in ${VERSION_POM}" + exit 1 +fi +echo "Version: ${JAVA_SHARED_CONFIG_VERSION}" + +# Update java-shared-config in sdk-platform-java-config +rm -rf google-cloud-java +# Find the latest tag matching v* and use it +LATEST_TAG=$(git ls-remote --tags https://github.com/googleapis/google-cloud-java.git | grep 'refs/tags/v' | sort -k2,2 -V | tail -n 1 | awk '{print $2}' | sed 's|refs/tags/||') +echo "Cloning google-cloud-java at tag: ${LATEST_TAG}" +git clone "https://github.com/googleapis/google-cloud-java.git" -b "${LATEST_TAG}" --depth=1 +pushd google-cloud-java/sdk-platform-java +SDK_PLATFORM_JAVA_CONFIG_VERSION=$(sed -e 's/xmlns=".*"//' sdk-platform-java-config/pom.xml | xmllint --xpath '/project/version/text()' -) + +pushd sdk-platform-java-config +# Use released version of google-cloud-shared-dependencies to avoid verifying SNAPSHOT changes. +replace_java_shared_config_version "${JAVA_SHARED_CONFIG_VERSION}" +echo "The diff in sdk-platform-java-config:" +git --no-pager diff +echo "--------" +mvn install "-DskipTests=true" "-Dmaven.javadoc.skip=true" "-Dgcloud.download.skip=true" "-Dcheckstyle.skip=true" -B -V -q +popd + +popd + +# Check this BOM against a few java client libraries +# java-bigquery +rm -rf "${REPO}" +if [ -z "${REPO_TAG}" ]; then + git clone "https://github.com/googleapis/${REPO}.git" --depth=1 +else + git clone "https://github.com/googleapis/${REPO}.git" --depth=1 --branch "${REPO_TAG}" +fi + +pushd ${REPO} + +# If using an older version of java-storage, continue replacing java-shared-config version otherwise replace +# the version of sdk-platform-java-config. +if [ "${REPO_TAG}" == "v2.9.3" ] && [ "${REPO}" == "java-storage" ]; then + replace_java_shared_config_version "${JAVA_SHARED_CONFIG_VERSION}" +else + replace_sdk_platform_java_config_version "${SDK_PLATFORM_JAVA_CONFIG_VERSION}" +fi + +case ${JOB_TYPE} in +dependencies) + .kokoro/dependencies.sh + RETURN_CODE=$? + ;; +flatten-plugin) + # This creates .flattened-pom.xml + echo "Before running .kokoro/build.sh" + .kokoro/build.sh + echo "After running .kokoro/build.sh" + pushd google-cloud-* + mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true \ + | grep '\[INFO] .*:.*:.*:.*:.*' |awk '{print $2}' > .actual-flattened-dependencies-list.txt + echo "Diff from the expected file (${EXPECTED_DEPENDENCIES_LIST}):" + diff "${scriptDir}/${EXPECTED_DEPENDENCIES_LIST}" .actual-flattened-dependencies-list.txt + RETURN_CODE=$? + if [ "${RETURN_CODE}" == 0 ]; then + echo "No diff." + else + echo "There was a diff." + fi + popd + ;; +*) + # Here we replace the com.coveo fmt plugin with the spotify version. + # This `sed` won't be needed once downstream repositories update + # `.kokoro/build.sh` to use the `com.spotify.fmt` group ID. + sed -i 's/com.coveo:fmt-maven-plugin/com.spotify.fmt:fmt-maven-plugin/' .kokoro/build.sh + # This reads the JOB_TYPE environmental variable + .kokoro/build.sh + RETURN_CODE=$? + ;; +esac + +echo "exiting with ${RETURN_CODE}" +exit ${RETURN_CODE} diff --git a/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt b/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt new file mode 100644 index 000000000000..c3eaa9f9a629 --- /dev/null +++ b/.kokoro/java-storage-v2.9.3-expected-flattened-dependencies.txt @@ -0,0 +1,34 @@ +com.fasterxml.jackson.core:jackson-core:jar:2.13.3:compile +com.google.api-client:google-api-client:jar:1.35.1:compile +com.google.api.grpc:proto-google-common-protos:jar:2.9.0:compile +com.google.api.grpc:proto-google-iam-v1:jar:1.4.1:compile +com.google.api:api-common:jar:2.2.1:compile +com.google.api:gax-httpjson:jar:0.103.2:compile +com.google.api:gax:jar:2.18.2:compile +com.google.apis:google-api-services-storage:jar:v1-rev20220705-1.32.1:compile +com.google.auth:google-auth-library-credentials:jar:1.7.0:compile +com.google.auth:google-auth-library-oauth2-http:jar:1.7.0:compile +com.google.auto.value:auto-value-annotations:jar:1.11.0:compile +com.google.cloud:google-cloud-core-http:jar:2.8.0:compile +com.google.cloud:google-cloud-core:jar:2.8.0:compile +com.google.code.findbugs:jsr305:jar:3.0.2:compile +com.google.code.gson:gson:jar:2.9.0:compile +com.google.errorprone:error_prone_annotations:jar:2.14.0:compile +com.google.guava:failureaccess:jar:1.0.1:compile +com.google.guava:guava:jar:31.1-jre:compile +com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava:compile +com.google.http-client:google-http-client-apache-v2:jar:1.42.0:compile +com.google.http-client:google-http-client-appengine:jar:1.42.0:compile +com.google.http-client:google-http-client-gson:jar:1.42.0:compile +com.google.http-client:google-http-client-jackson2:jar:1.42.0:compile +com.google.http-client:google-http-client:jar:1.42.0:compile +com.google.j2objc:j2objc-annotations:jar:1.3:compile +com.google.oauth-client:google-oauth-client:jar:1.34.1:compile +com.google.protobuf:protobuf-java-util:jar:3.21.1:compile +com.google.protobuf:protobuf-java:jar:3.21.1:compile +io.grpc:grpc-context:jar:1.47.0:compile +io.opencensus:opencensus-api:jar:0.31.1:compile +io.opencensus:opencensus-contrib-http-util:jar:0.31.1:compile +javax.annotation:javax.annotation-api:jar:1.3.2:compile +org.checkerframework:checker-qual:jar:3.22.2:compile +org.threeten:threetenbp:jar:1.6.0:compile From dc557b384bee40f956152a02e1dcc7e24605af5c Mon Sep 17 00:00:00 2001 From: Jin Seop Kim Date: Mon, 15 Jun 2026 14:53:28 -0400 Subject: [PATCH 792/794] chore: skip enforcer on java-shared-config aggregator and parent POMs --- .../native-image-shared-config/pom.xml | 16 ++++++++++++++++ java-shared-config/pom.xml | 13 +++++++++++++ 2 files changed, 29 insertions(+) diff --git a/java-shared-config/native-image-shared-config/pom.xml b/java-shared-config/native-image-shared-config/pom.xml index 09d7f5441546..0999bb31c29a 100644 --- a/java-shared-config/native-image-shared-config/pom.xml +++ b/java-shared-config/native-image-shared-config/pom.xml @@ -102,6 +102,22 @@ + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.6.3 + false + + + enforce + + true + + + + + diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 16c08af10c3a..067a535007dc 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -41,6 +41,19 @@ true + + org.apache.maven.plugins + maven-enforcer-plugin + 3.6.3 + + + enforce + + true + + + + From c0d16c7becc61bce1653c7b3b46a909a16d08dfe Mon Sep 17 00:00:00 2001 From: Jin Seop Kim Date: Mon, 15 Jun 2026 15:44:49 -0400 Subject: [PATCH 793/794] chore: compile only java-shared-config during downstream CI checks --- .kokoro/client-library-check-doclet.sh | 2 ++ .kokoro/client-library-check.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.kokoro/client-library-check-doclet.sh b/.kokoro/client-library-check-doclet.sh index 82a6226f030d..f566905df2b5 100755 --- a/.kokoro/client-library-check-doclet.sh +++ b/.kokoro/client-library-check-doclet.sh @@ -76,7 +76,9 @@ scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) cd ${scriptDir}/.. # Make artifacts available for 'mvn validate' at the bottom +pushd java-shared-config mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q --no-transfer-progress +popd # Get version of doclet used to generate Cloud RAD for javadoc testing with the doclet below rm -rf java-docfx-doclet diff --git a/.kokoro/client-library-check.sh b/.kokoro/client-library-check.sh index 1e1da8e15f2a..7f86ab656d7f 100755 --- a/.kokoro/client-library-check.sh +++ b/.kokoro/client-library-check.sh @@ -86,7 +86,9 @@ scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) cd ${scriptDir}/.. # Make artifacts available for 'mvn validate' at the bottom +pushd java-shared-config mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q +popd # Read the current version of this BOM in the POM. Example version: '0.116.1-alpha-SNAPSHOT' VERSION_POM=java-shared-config/pom.xml From 4d475b693489852a9217e441c765650fc13eccb6 Mon Sep 17 00:00:00 2001 From: Jin Seop Kim Date: Mon, 15 Jun 2026 15:50:25 -0400 Subject: [PATCH 794/794] chore: read version from correct POM in downstream check scripts --- .kokoro/client-library-check-doclet.sh | 2 +- .kokoro/client-library-check.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.kokoro/client-library-check-doclet.sh b/.kokoro/client-library-check-doclet.sh index f566905df2b5..c4455c47c8bc 100755 --- a/.kokoro/client-library-check-doclet.sh +++ b/.kokoro/client-library-check-doclet.sh @@ -93,7 +93,7 @@ docletPath=$(realpath "java-docfx-doclet/third_party/docfx-doclet-143274/target/ echo "This is the doclet path: ${docletPath}" # Read the current version of this BOM in the POM. Example version: '0.116.1-alpha-SNAPSHOT' -VERSION_POM=java-shared-config/pom.xml +VERSION_POM=java-shared-config/java-shared-config/pom.xml # Namespace (xmlns) prevents xmllint from specifying tag names in XPath JAVA_SHARED_CONFIG_VERSION=`sed -e 's/xmlns=".*"//' ${VERSION_POM} | xmllint --xpath '/project/version/text()' -` diff --git a/.kokoro/client-library-check.sh b/.kokoro/client-library-check.sh index 7f86ab656d7f..228e97ab8851 100755 --- a/.kokoro/client-library-check.sh +++ b/.kokoro/client-library-check.sh @@ -91,7 +91,7 @@ mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=tr popd # Read the current version of this BOM in the POM. Example version: '0.116.1-alpha-SNAPSHOT' -VERSION_POM=java-shared-config/pom.xml +VERSION_POM=java-shared-config/java-shared-config/pom.xml # Namespace (xmlns) prevents xmllint from specifying tag names in XPath JAVA_SHARED_CONFIG_VERSION=`sed -e 's/xmlns=".*"//' ${VERSION_POM} | xmllint --xpath '/project/version/text()' -`