Repository navigation
Conversation
Migrate server/etc/jetty.xml to deploy Solr’s single webapp directly (remove server/contexts/solr-jetty-context.xml). Adapt code/tests for Jetty 12.1 API/behavior changes (HTTP client transport API changes; proxy request/response framing; RuntimeIOException removal). (cherry picked from commit bb8c68b)
Not wrong but confusing IMO (cherry picked from commit b4d85ed)
(cherry picked from commit eaf9c86)
The 12.0.34 bump is superseded by the 12.1.14 upgrade in this branch, so only one dependency_update entry should reach the 10.x changelog.
github-actions
Bot
added
documentation
janhoy
marked this pull request as draft
October 10, 2026 21:34
Contributor
Author
|
@dsmiley Setting as draft since we don't want to squash this backport but preserve the individual commits. Created PR to benefit from full test suites.. |
Contributor
Author
|
Note - upgrade note still under Solr 10.1 section. If this does not make it to an 10.1 RC2 respin, we have to move the entry on main and 10x. @sigram |
Contributor
Author
|
Merged to |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🤖 AI assisted backport 🤖
Backport of the Jetty 12.1 upgrade to
branch_10x, which had stayed on 12.0.34 because Jetty 12.1.10 regressed HTTP/2 client behaviour during graceful shutdown (jetty/jetty.project#15368). That is fixed in 12.1.14, soTestGracefulJettyShutdownis un-ignored and marked@Nightly.Commits
Cherry-picked in order (
-x), skipping #4845 (12.1.12) as redundant:Plus one 10x-only commit removing the now-superseded
update-eclipse-jetty-12.0.34.ymlchangelog entry, so the 10.x changelog lists a single Jetty dependency update.Conflict resolutions
libs.versions.toml— kept 10x'seclipse-ecj, took the Jetty version.HttpJettySolrClient.java— kept 10x; theBlockingArrayQueuehunk is obsolete after HttpJettySolrClient: use fewer threads #4668.HttpSolrProxyTest.java— kept 10x; it already arrived via SOLR-18382: remove DocCollection.getReplicas(), migrate 60 call sites #4760.server/contexts/solr-jetty-context.xml— deleted; the webapp is now deployed directly fromserver/etc/jetty.xml.major-changes-in-solr-10.adoc— Jetty section inserted ahead of "Testing Framework". The note says "Solr 10.1" for now and can be re-targeted before release.resolveAndLockAll --write-locks+updateLicensesafter each cherry-pick; every Jetty coordinate and license sha1 is at 12.1.14 with no stale entries.Testing
gradlew tidyclean,gradlew check -x testgreen.HttpSolrProxyTestandHttpJettySolrClientCompatibilityTestpass.TestGracefulJettyShutdownis 10/10 green on seed2F3BD4ED8E71AEA6, the seed that failed 5-8 of 15 runs on 12.1.10.