Started by timer00374547337454738128628128621.00001291b2ee562b79ddcee89ecf52f08c457f596c369791b2ee562b79ddcee89ecf52f08c457f596c3697refs/remotes/origin/branch_10_191b2ee562b79ddcee89ecf52f08c457f596c369791b2ee562b79ddcee89ecf52f08c457f596c3697refs/remotes/origin/branch_10_191b2ee562b79ddcee89ecf52f08c457f596c369791b2ee562b79ddcee89ecf52f08c457f596c3697refs/remotes/origin/branch_10_1https://gitbox.apache.org/repos/asf/solr.gitfalse#12812862827766Solr » Solr-Lint-10.1 #1212falsefalse1238046130SUCCESS1791596546113https://ci-builds.apache.org/job/Solr/job/Solr-Lint-10.1/12/lucene-solr-3- dev-tools/scripts/releaseWizard.yamldev-tools/scripts/logchange.py0945e79c0246646dfd4c88c57de8c648d0c228e51791561933000https://ci-builds.apache.org/user/dsmileyDavid Smileydsmiley@apache.orgreleaseWizard: fix changelog forward-port for 9.x -> 10.x situation (#5021)
releaseWizard: fix changelog forward-port for a release on an older major branch
logchange.py forward-port failed releasing 9.11.0: it tried to cherry-pick 9.x feature commits onto branch_10x and main.
* Only cherry-pick commits touching changelog/v{version}/. Selecting everything under changelog/ picked up every feature commit with a changelog entry since the release branch diverged from the target.
* Drop --cherry-pick from commit selection. Git computed patch-ids for the whole symmetric difference before path limiting, taking minutes per target across majors. Re-runs stay idempotent: an already-applied commit cherry-picks to an empty change, which is skipped.
* Require a clean working tree, since the command switches branches and discards generated files.
* Fast-forward the release branch and each target branch from the remote before committing, so the final push isn't rejected.
* Resolve modify/delete conflicts confined to changelog/unreleased/ by removing the entry, but only when it has a counterpart in changelog/v{version}/; -X ours doesn't settle those. Other conflicts are left for the release manager.
* Discard other versions' regenerated version-summary.md files (tracked or untracked), which otherwise block the next checkout.
* Read git path listings NUL-separated, so changelog entries with non-ASCII names aren't quoted.
* Note that git 2.23+ is required (git restore), and reword the releaseWizard step accordingly.
Co-authored-by: Jan Høydahl <janhoy@apache.org>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 4b58db1a42b5b0ebc4b2fcebfd1f2aef68ce69dc)
(cherry picked from commit fe3d7cf9f4075263dce14b393a1c0e84cf78189f)
2026-10-09 12:05:33 -04000945e79c0246646dfd4c88c57de8c648d0c228e5releaseWizard: fix changelog forward-port for 9.x -> 10.x situation (#5021)editdev-tools/scripts/logchange.pyeditdev-tools/scripts/releaseWizard.yaml
- dev-tools/scripts/dependencyChanges.pydev-tools/scripts/releaseWizard.yamldev-docs/changelog.adocdev-tools/scripts/addDepsToChanges.py91b2ee562b79ddcee89ecf52f08c457f596c36971791562772000https://ci-builds.apache.org/user/dsmileyDavid Smileydsmiley@apache.orgreleaseWizard: summarize dependency changes from solr/licenses (#4966)
Replaces addDepsToChanges.py, which bulk-converted solrbot commits into changelog entries (duplicating the entries solrbot PRs already create), with dev-tools/scripts/dependencyChanges.py.
The new script diffs the jar checksum files in solr/licenses/ between the previous release tag and HEAD (git only; no build needed):
Backport deltas: validate-changelog.yml unchanged (branch_10x lacks the solrbot skip / renovate-changelog workflows, and the comment-only change there does not apply); changelog.adoc section numbered 6.5 to follow 6.4 on this branch.
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
(cherry picked from commit 28aeacffa57e143b273ba091f21628950e244f01)
(cherry picked from commit e11d59f5b0731a36f0cc5356a023672ac995a1cb)
2026-10-09 12:19:32 -040091b2ee562b79ddcee89ecf52f08c457f596c3697releaseWizard: summarize dependency changes from solr/licenses (#4966)editdev-tools/scripts/releaseWizard.yamldeletedev-tools/scripts/addDepsToChanges.pyadddev-tools/scripts/dependencyChanges.pyeditdev-docs/changelog.adoc
githttps://ci-builds.apache.org/user/dsmileyDavid Smiley