Are there any differences in branch_9_11 so far? If so we should probably just delete it right? Then we can recreate it when you want to start the release again.
Right now we can't build the ref guide because two branches have the 9.11 version (branch_9x and branch_9_11), so we need to either delete branch_9_11 or run the releaseWizard steps to setup branch_9x to point to 9.12.0 - Houston On Sat, Jun 6, 2026 at 11:38 AM David Smiley <[email protected]> wrote: > When I want to restore the feature freeze, I expect I can simply merge > branch_9x into branch_9_11 at that time to sync it. The intent is to save > myself and others time from backporting all the way to branch_9_11 when we > can stop after cherry-picking to branch_9x, knowing the merge will > eventually handle the rest. > > On Wed, May 27, 2026 at 5:24 PM David Smiley <[email protected]> wrote: > > > I'm suspending the feature-freeze declaration on 9.11. > > The 9.11 release is delayed to ensure some security matters get > > addressed. I'll update this thread when it's back-on. > > > > On Sun, May 17, 2026 at 12:16 AM David Smiley <[email protected]> > wrote: > > > >> Sure > >> > >> On Fri, May 15, 2026 at 2:54 PM Eric Pugh <[email protected]> wrote: > >> > >>> David, any chance the fix for > >>> https://issues.apache.org/jira/browse/SOLR-18239 could make it in? > >>> I've backported to branch_9x. > >>> > >>> The PR is https://github.com/apache/solr/pull/4427 and the commit hash > >>> is b7aeda98b8477ea12a61f979344054e20fd0b342 > >>> > >>> Eric > >>> > >>> On 2026/05/02 05:38:22 David Smiley wrote: > >>> > The smoketester very likely fails because I have yet to do the > >>> changelog > >>> > part of the release process. I'll disable the build until I'm ready > >>> for > >>> > that. > >>> > > >>> > I'm not sure how we'll get a new/straggler unreleased changelog > entries > >>> > onto an already-generated release changelog unless maybe we leave the > >>> > "unreleased" entries there until the release has truly happened. But > >>> this > >>> > portion of the release wizard wants to do seemingly all changelog > >>> related > >>> > things instead of merely generating the new changelog. > >>> > > >>> > On Thu, Apr 30, 2026 at 12:51 PM David Smiley <[email protected]> > >>> wrote: > >>> > > >>> > > My release process notes from using the release wizard: > >>> > > > >>> > > My macOS system python3 didn't have some dependencies/modules, so I > >>> had to > >>> > > install the requirements.txt. I'm very unfamiliar with python dev > >>> > > practices in this regard... I wound up creating a venv and thus I > ran > >>> > > python via > >>> > > > /Users/dsmiley/DevSearch/solr_9x/dev-tools/scripts/.venv/bin/python3. > >>> > > However, some release wizard commands like invoking > >>> `addDepsToChanges.py` > >>> > > didn't work OOTB because it didn't know about my venv. I'm not > sure > >>> how > >>> > > the script or my approach should be updated. > >>> > > > >>> > > Question: > >>> > > https://ci-builds.apache.org/job/Solr/job/Solr-Docker-Nightly-9.x/ > >>> > > description says Moved to github workflows: > >>> > > > https://github.com/apache/solr/actions/workflows/docker-nightly.yml > >>> but > >>> > > that is only true for main, not 9x nor even 10x. The GH screen > >>> shows this, > >>> > > not to mention the workflow yml file isn't on branch_9x (I didn't > >>> check > >>> > > 10x). > >>> > > > >>> > > Note: I updated > >>> > > > >>> > https://cwiki.apache.org/confluence/display/SOLR/JenkinsReleaseBuilds+-+Solr > >>> > > replacing the reference of solr-reference-guide-official to > >>> > > Solr-reference-guide-9.x > >>> > > > >>> > > The CI builds I created are working except for the smoketester: > >>> > > > >>> > https://ci-builds.apache.org/job/Solr/job/Solr-Smoketest-9.11/3/console > >>> > > > >>> > >> RuntimeError: did not see "Release 9.11.0" in > >>> > file:///home/jenkins/jenkins-agent/workspace/Solr/Solr-Smoketest-9.11/solr/distribution/build/release/changes/Changes.html > >>> > >> > >>> > >> > >>> > > > >>> > > On Mon, Apr 27, 2026 at 12:27 PM David Smiley <[email protected]> > >>> wrote: > >>> > > > >>> > >> NOTICE: > >>> > >> > >>> > >> Branch branch_9_11 has been cut and versions updated to 9.12 on > the > >>> > >> stable branch. > >>> > >> > >>> > >> Please observe the normal rules: > >>> > >> > >>> > >> * No new features may be committed to the branch. > >>> > >> * Documentation patches, build patches and serious bug fixes may > be > >>> > >> committed to the branch. However, you should submit all patches > >>> you > >>> > >> want to commit to Jira first to give others the chance to review > >>> > >> and possibly vote against the patch. Keep in mind that it is our > >>> > >> main intention to keep the branch as stable as possible. > >>> > >> * All patches that are intended for the branch should first be > >>> committed > >>> > >> to the unstable branch, merged into the stable branch, and then > >>> into > >>> > >> the current release branch. > >>> > >> * Normal unstable and stable branch development may continue as > >>> usual. > >>> > >> However, if you plan to commit a big change to the unstable > branch > >>> > >> while the branch feature freeze is in effect, think twice: can't > >>> the > >>> > >> addition wait a couple more days? Merges of bug fixes into the > >>> branch > >>> > >> may become more difficult. > >>> > >> * Only Jira issues with Fix version 9.11 and priority "Blocker" > >>> will delay > >>> > >> a release candidate build. > >>> > >> > >>> > >> > >>> > > >>> > >>> --------------------------------------------------------------------- > >>> To unsubscribe, e-mail: [email protected] > >>> For additional commands, e-mail: [email protected] > >>> > >>> >
