From 1dda7711e55fff882f3a2bd4743c605b88f8eb18 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 01/14] 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). --- pom.xml | 2 +- versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f39d39ad..d33bdf0d 100644 --- a/pom.xml +++ b/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/versions.txt b/versions.txt index 2c3840fd..92695745 100644 --- a/versions.txt +++ b/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 e51718ca365208c7502709f7c46a52a2a859d042 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 23 Aug 2021 18:50:23 +0200 Subject: [PATCH 02/14] build(deps): update dependency com.coveo:fmt-maven-plugin to v2.12 (#300) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d33bdf0d..d7efebf3 100644 --- a/pom.xml +++ b/pom.xml @@ -216,7 +216,7 @@ com.coveo fmt-maven-plugin - 2.9 + 2.12 true From 965508d531297174756b71cd7028d509603e4369 Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Wed, 25 Aug 2021 16:20:20 -0400 Subject: [PATCH 03/14] Revert "build(deps): update dependency com.coveo:fmt-maven-plugin to v2.12 (#300)" (#302) This reverts commit e51718ca365208c7502709f7c46a52a2a859d042. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d7efebf3..d33bdf0d 100644 --- a/pom.xml +++ b/pom.xml @@ -216,7 +216,7 @@ com.coveo fmt-maven-plugin - 2.12 + 2.9 true From 94648655063597210d58bc64f641daafc75cbe2f Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 31 Aug 2021 08:01:30 -0700 Subject: [PATCH 04/14] 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 --- .github/release-trigger.yml | 1 + synth.metadata | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 .github/release-trigger.yml diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml new file mode 100644 index 00000000..d4ca9418 --- /dev/null +++ b/.github/release-trigger.yml @@ -0,0 +1 @@ +enabled: true diff --git a/synth.metadata b/synth.metadata index 9cc4d39f..c74b4db7 100644 --- a/synth.metadata +++ b/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 94096733425d4a7634752302ad74e69e249b9370 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 7 Sep 2021 14:42:34 -0700 Subject: [PATCH 05/14] chore: use maven 3.8.1 (#307) --- .github/workflows/downstream.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml index d049858d..d0963125 100644 --- a/.github/workflows/downstream.yaml +++ b/.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 087d8a480123ff428972bd090823536ed066fe08 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 7 Sep 2021 14:48:12 -0700 Subject: [PATCH 06/14] chore: use release-please to tag releases (#306) Towards https://github.com/googleapis/releasetool/issues/361 --- .github/release-please.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 5b1fe57a..7190cc4c 100644 --- a/.github/release-please.yml +++ b/.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 6504eada4851f554d25a8fa3479904e8b44e738d Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 9 Sep 2021 16:08:49 -0700 Subject: [PATCH 07/14] 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 --- .github/workflows/ci.yaml | 13 ------------- renovate.json | 3 ++- synth.metadata | 4 ++-- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 65ae6ecd..d510359d 100644 --- a/.github/workflows/ci.yaml +++ b/.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/renovate.json b/renovate.json index 59333bfb..c46915be 100644 --- a/renovate.json +++ b/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/synth.metadata b/synth.metadata index c74b4db7..855ef8ad 100644 --- a/synth.metadata +++ b/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 71faea38d4132407598550e2bb4c77f9d4a4d83d Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 13 Sep 2021 21:32:05 +0200 Subject: [PATCH 08/14] deps: update dependency com.puppycrawl.tools:checkstyle to v9 (#303) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d33bdf0d..2781342a 100644 --- a/pom.xml +++ b/pom.xml @@ -631,7 +631,7 @@ com.puppycrawl.tools checkstyle - 8.45.1 + 9.0 From dd7f6e0c1a7cc73831b74b4475457611a8c097d3 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Mon, 13 Sep 2021 15:54:54 -0700 Subject: [PATCH 09/14] 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 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2781342a..72e3670e 100644 --- a/pom.xml +++ b/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 a11dd3848374d06849bb708615fdb57d241cab82 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 14 Sep 2021 00:55:34 +0200 Subject: [PATCH 10/14] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.1 (#305) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 72e3670e..3dd1988e 100644 --- a/pom.xml +++ b/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 971946c1f4dcecda73ff13a0adeb64baf99dc908 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 13 Sep 2021 15:56:03 -0700 Subject: [PATCH 11/14] chore: remove linkage monitor required check (#309) --- .github/sync-repo-settings.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 5eac3ab6..5ea1b2d5 100644 --- a/.github/sync-repo-settings.yaml +++ b/.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 f0621c51fb915c7e83f84d058ca49050a97bc27e Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 13 Sep 2021 15:56:27 -0700 Subject: [PATCH 12/14] 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 --- .github/readme/synth.py | 19 ---------- .github/trusted-contribution.yml | 3 +- .github/workflows/ci.yaml | 15 ++++++++ .kokoro/continuous/readme.cfg | 55 ---------------------------- .kokoro/release/common.sh | 2 +- .kokoro/release/drop.sh | 2 +- .kokoro/release/promote.sh | 2 +- .kokoro/release/publish_javadoc.sh | 2 +- .kokoro/release/publish_javadoc11.sh | 2 +- .kokoro/release/stage.sh | 2 +- .kokoro/trampoline.sh | 2 +- synth.metadata | 6 +-- 12 files changed, 26 insertions(+), 86 deletions(-) delete mode 100644 .github/readme/synth.py delete mode 100644 .kokoro/continuous/readme.cfg diff --git a/.github/readme/synth.py b/.github/readme/synth.py deleted file mode 100644 index 7b48cc28..00000000 --- a/.github/readme/synth.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -"""This script is used to synthesize generated the README for this library.""" - -from synthtool.languages import java - -java.custom_templates(["java_library/README.md"]) diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml index f247d5c7..a0ba1f7d 100644 --- a/.github/trusted-contribution.yml +++ b/.github/trusted-contribution.yml @@ -1,2 +1,3 @@ trustedContributors: -- renovate-bot \ No newline at end of file +- renovate-bot +- gcf-owl-bot[bot] diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d510359d..3becb5c0 100644 --- a/.github/workflows/ci.yaml +++ b/.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/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg deleted file mode 100644 index c41a0ae8..00000000 --- a/.kokoro/continuous/readme.cfg +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Format: //devtools/kokoro/config/proto/build.proto - -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/python-multi" -} - -env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/java-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/.kokoro/release/common.sh b/.kokoro/release/common.sh index 6e3f6599..7f78ee41 100755 --- a/.kokoro/release/common.sh +++ b/.kokoro/release/common.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh index 5c4551ef..742ec1a8 100755 --- a/.kokoro/release/drop.sh +++ b/.kokoro/release/drop.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh index 1fa95fa5..3cac3d8a 100755 --- a/.kokoro/release/promote.sh +++ b/.kokoro/release/promote.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index c9b3f549..a05ceb71 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2019 Google Inc. +# Copyright 2019 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 0a329f70..e12f72f5 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2021 Google Inc. +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 8a103384..77dc4e8f 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh index 9da0f839..8b69b793 100644 --- a/.kokoro/trampoline.sh +++ b/.kokoro/trampoline.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2018 Google Inc. +# Copyright 2018 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/synth.metadata b/synth.metadata index 855ef8ad..8c24a9be 100644 --- a/synth.metadata +++ b/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 378bf431383306c1cdd0a4f922956c87edf321b5 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 13 Sep 2021 15:57:12 -0700 Subject: [PATCH 13/14] fix: specify animal-sniffer-maven-plugin version (#308) --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 3dd1988e..dfa91fb1 100644 --- a/pom.xml +++ b/pom.xml @@ -413,6 +413,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin + 1.20 java8 From 925a82f9d4c2f74c0d967b2fb3001c67adbf49a5 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 14/14] chore: release 1.0.2 (#311) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 13 +++++++++++++ README.md | 2 +- pom.xml | 2 +- versions.txt | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74016613..8f1d5797 100644 --- a/CHANGELOG.md +++ b/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/README.md b/README.md index 03abec17..5866b881 100644 --- a/README.md +++ b/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/pom.xml b/pom.xml index dfa91fb1..50517c44 100644 --- a/pom.xml +++ b/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/versions.txt b/versions.txt index 92695745..350e5a4d 100644 --- a/versions.txt +++ b/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