From fde50bb4abd6664bb0b57c72655c5b46d734f3ca Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Thu, 29 Jul 2021 14:02:10 -0400 Subject: [PATCH 1/7] build: configure java7 as a release branch (#288) --- .github/release-please.yml | 5 +++++ .github/sync-repo-settings.yaml | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index 82744682..5b1fe57a 100644 --- a/.github/release-please.yml +++ b/.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/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index fca7c299..5eac3ab6 100644 --- a/.github/sync-repo-settings.yaml +++ b/.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 a721f40ada9a6198b9b0da1cfcf1b5b367132ec4 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Tue, 10 Aug 2021 21:40:52 -0400 Subject: [PATCH 2/7] Revert "chore: remove bigquery from downstream check (#285)" (#294) This reverts commit 5d352e226d2c4d61edbdb3a4d4b4e93d542d7d71. --- .github/workflows/downstream.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml index f28021e4..d049858d 100644 --- a/.github/workflows/downstream.yaml +++ b/.github/workflows/downstream.yaml @@ -12,6 +12,7 @@ jobs: matrix: java: [8, 11] repo: + - java-bigquery - java-bigqueryconnection - java-spanner - java-storage From 35f08ee5b6c01901c71549c1c3aea3b783278ecf Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Wed, 18 Aug 2021 13:57:32 -0700 Subject: [PATCH 3/7] chore: update doclet version (#296) * chore: update doclet version * chore: bug fix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2800a63a..e0361e21 100644 --- a/pom.xml +++ b/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 135e364339a0bb762dcb64f0b746714cce534f48 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Wed, 18 Aug 2021 14:11:00 -0700 Subject: [PATCH 4/7] 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 --- .kokoro/build.sh | 2 +- .kokoro/nightly/integration.cfg | 2 +- .kokoro/nightly/samples.cfg | 2 +- synth.metadata | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 01e03c23..63c21c03 100755 --- a/.kokoro/build.sh +++ b/.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/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index 0048c8ec..e51c7b4c 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -22,7 +22,7 @@ env_vars: { } env_vars: { - key: "ENABLE_BUILD_COP" + key: "ENABLE_FLAKYBOT" value: "true" } diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg index f2542931..9761fd86 100644 --- a/.kokoro/nightly/samples.cfg +++ b/.kokoro/nightly/samples.cfg @@ -33,6 +33,6 @@ env_vars: { } env_vars: { - key: "ENABLE_BUILD_COP" + key: "ENABLE_FLAKYBOT" value: "true" } diff --git a/synth.metadata b/synth.metadata index 3511987b..9cc4d39f 100644 --- a/synth.metadata +++ b/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 41e1e21fa107c936f7416ca525358a3c1a051480 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 5/7] 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). --- pom.xml | 2 +- versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e0361e21..334afb09 100644 --- a/pom.xml +++ b/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/versions.txt b/versions.txt index d2ec6181..726d8087 100644 --- a/versions.txt +++ b/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 66bf6e6fb95997b9eb4b34268b8d20c2fbe9ed5a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 19 Aug 2021 00:23:23 +0200 Subject: [PATCH 6/7] deps: update dependency com.puppycrawl.tools:checkstyle to v8.45.1 (#292) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 334afb09..3626bbf9 100644 --- a/pom.xml +++ b/pom.xml @@ -631,7 +631,7 @@ com.puppycrawl.tools checkstyle - 8.44 + 8.45.1 From 3c7baf43135ec11cac3eabdf8ac10d26162ca8ea 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 7/7] chore: release 1.0.1 (#298) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ README.md | 2 +- pom.xml | 2 +- versions.txt | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b116a35..74016613 100644 --- a/CHANGELOG.md +++ b/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/README.md b/README.md index c5483137..03abec17 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.0 + 1.0.1 ``` diff --git a/pom.xml b/pom.xml index 3626bbf9..f39d39ad 100644 --- a/pom.xml +++ b/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/versions.txt b/versions.txt index 726d8087..2c3840fd 100644 --- a/versions.txt +++ b/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