This is an automated email from the ASF dual-hosted git repository. steveloughran pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/hadoop-cloudstore.git
commit e54ccf5cd5b45da25fc51b757b4d1c9b185f5b5d Author: Steve Loughran <[email protected]> AuthorDate: Wed Jun 3 11:22:14 2026 +0100 HADOOP-19880. Roll back dependabot alerts fix up version bump code so it doesn't get rejected on the $ver string in BUILDING.md --- .asf.yaml | 10 +++++----- BUILDING.md | 2 +- dev-support/bump-version.sh | 26 +++++++++++++++----------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index d1d7182..946a26e 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -26,14 +26,14 @@ github: rebase: true # default commit message when merging with a squash commit # can either be: DEFAULT | PR_TITLE | PR_TITLE_AND_COMMIT_DETAILS | PR_TITLE_AND_DESC - squash_commit_message: PR_TITLE_AND_COMMIT_DETAILS + squash_commit_message: PR_TITLE autolink_jira: - HADOOP # Projects can enable and disable Dependabot alerts and automatic security update pull requests: # this is on experimentally, we don't want to update hadoop because we want # to pin versions down - dependabot_alerts: true - dependabot_updates: true + dependabot_alerts: false + dependabot_updates: false copilot_code_review: enabled: true review_drafts: false @@ -60,7 +60,7 @@ github: required_linear_history: true # gh merge signs; manual commits need committers to set up git commit signing. - required_signatures: true + required_signatures: false # requires all conversations to be resolved before merging is possible required_conversation_resolution: false @@ -73,7 +73,7 @@ notifications: features: wiki: false - issues: false + issues: true projects: false diff --git a/BUILDING.md b/BUILDING.md index b6c85f3..d4e12d8 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -141,7 +141,7 @@ Commit all changes before starting a release build. Commands (for fish) ```bash -set -gx ver 1.5 # bumped by dev-support/bump-version.sh (always release form, no -SNAPSHOT) +set -gx ver 1.4 # last released version; moved only on a release bump by dev-support/bump-version.sh mvn clean install -Prelease,sign -DskipTests set -gx now (date '+%Y-%m-%d-%H.%M'); echo [$now] git commit -S --allow-empty -m "release $now"; git push diff --git a/dev-support/bump-version.sh b/dev-support/bump-version.sh index 3be82fd..73643d9 100755 --- a/dev-support/bump-version.sh +++ b/dev-support/bump-version.sh @@ -20,9 +20,11 @@ # form, e.g. "1.4-SNAPSHOT" or "1.4". Does NOT rewrite site documentation — # release-time doc updates are handled by dev-support/update-site-docs.sh. # -# Also updates BUILDING.md's fish `set -gx ver <v>` line so the release -# command block always points at the bare release artifact name (a trailing -# -SNAPSHOT is stripped before substituting). +# On a *release* bump, also updates BUILDING.md's fish `set -gx ver <v>` line +# so the release command block points at the artifact being cut. SNAPSHOT dev +# bumps leave that line alone: it must stay at the last released version to +# match ${cloudstore.docs.version}, which the verify gate +# (dev-support/check-doc-versions.sh) enforces. # # Usage: dev-support/bump-version.sh <new-version> # Example: dev-support/bump-version.sh 1.4-SNAPSHOT @@ -66,17 +68,19 @@ echo "bumping $OLD -> $NEW" mvn -q versions:set -DnewVersion="$NEW" -DgenerateBackupPoms=false # BUILDING.md's release block declares `set -gx ver <v>` in fish (`version` -# is a reserved variable name in fish). That line is consumed by the -# release command sequence, which names artifacts via `cloudstore-$ver.jar`, -# so it must always reflect the bare release version — strip any trailing -# -SNAPSHOT. -RELEASE_VER="${NEW%-SNAPSHOT}" -if [[ -f BUILDING.md ]] && grep -qE "^set -gx ver [0-9]+\.[0-9]+( |$| )" BUILDING.md; then +# is a reserved variable name in fish). That line names the artifacts the +# release sequence uploads (`cloudstore-$ver.jar`) and is gated by +# check-doc-versions.sh to equal ${cloudstore.docs.version} — the last +# *released* version. So only move it on a release bump; a SNAPSHOT dev bump +# must leave it pointing at the last release, or the verify gate fails. +if [[ "$NEW" != *-SNAPSHOT ]] \ + && [[ -f BUILDING.md ]] \ + && grep -qE "^set -gx ver [0-9]+\.[0-9]+( |$| )" BUILDING.md; then # Note: no \b word-boundary here — BSD/macOS sed does not support it and # would silently match nothing. Anchor on the literal prefix instead. - sed -i.bak -E "s|^(set -gx ver )[0-9]+\.[0-9]+|\1${RELEASE_VER}|" BUILDING.md + sed -i.bak -E "s|^(set -gx ver )[0-9]+\.[0-9]+|\1${NEW}|" BUILDING.md rm -f BUILDING.md.bak - echo " rewrote BUILDING.md (set -gx ver ${RELEASE_VER})" + echo " rewrote BUILDING.md (set -gx ver ${NEW})" fi echo "done. Review with: git diff" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
