You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@solr.apache.org by "janhoy (via GitHub)" <gi...@apache.org> on 2026/10/10 21:34:00 UTC

[PR] Backport Jetty 12.1.14 to branch_10x [solr]

janhoy opened a new pull request, #5102:
URL: https://github.com/apache/solr/pull/5102

   🤖 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, so `TestGracefulJettyShutdown` is un-ignored and marked `@Nightly`.
   
   ## Commits
   
   Cherry-picked in order (`-x`), skipping #4845 (12.1.12) as redundant:
   
   - bb8c68b — SOLR-18297 Upgrade Jetty to 12.1.10 (#4574)
   - b4d85ed — SOLR-18297: documentation: don't say "embedded" Jetty (#4664)
   - eaf9c86 — SOLR-18297: Upgrade Jetty to 12.1.14 (#5059)
   
   Plus one 10x-only commit removing the now-superseded `update-eclipse-jetty-12.0.34.yml` changelog entry, so the 10.x changelog lists a single Jetty dependency update.
   
   ## Conflict resolutions
   
   - `libs.versions.toml` — kept 10x's `eclipse-ecj`, took the Jetty version.
   - `HttpJettySolrClient.java` — kept 10x; the `BlockingArrayQueue` hunk is obsolete after #4668.
   - `HttpSolrProxyTest.java` — kept 10x; it already arrived via #4760.
   - `server/contexts/solr-jetty-context.xml` — deleted; the webapp is now deployed directly from `server/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.
   - All lockfiles regenerated with `resolveAndLockAll --write-locks` + `updateLicenses` after each cherry-pick; every Jetty coordinate and license sha1 is at 12.1.14 with no stale entries.
   
   ## Testing
   
   `gradlew tidy` clean, `gradlew check -x test` green. `HttpSolrProxyTest` and `HttpJettySolrClientCompatibilityTest` pass. `TestGracefulJettyShutdown` is 10/10 green on seed `2F3BD4ED8E71AEA6`, the seed that failed 5-8 of 15 runs on 12.1.10.
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org

Re: [PR] Backport Jetty 12.1.14 to branch_10x [solr]

Posted by "janhoy (via GitHub)" <gi...@apache.org>.
janhoy commented on PR #5102:
URL: https://github.com/apache/solr/pull/5102#issuecomment-6102452065

   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 


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org

Re: [PR] Backport Jetty 12.1.14 to branch_10x [solr]

Posted by "janhoy (via GitHub)" <gi...@apache.org>.
janhoy commented on PR #5102:
URL: https://github.com/apache/solr/pull/5102#issuecomment-6102889778

   Merged to `branch_10x` outside of this PR. Did not merge [561e76e](https://github.com/apache/solr/pull/5102/commits/561e76e5e139358383cc49fd34a554fb40424f3b) - leave it to separate cleanup


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org

Re: [PR] Backport Jetty 12.1.14 to branch_10x [solr]

Posted by "janhoy (via GitHub)" <gi...@apache.org>.
janhoy commented on PR #5102:
URL: https://github.com/apache/solr/pull/5102#issuecomment-6102425664

   @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..


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org

Re: [PR] Backport Jetty 12.1.14 to branch_10x [solr]

Posted by "janhoy (via GitHub)" <gi...@apache.org>.
janhoy closed pull request #5102: Backport Jetty 12.1.14 to branch_10x
URL: https://github.com/apache/solr/pull/5102


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org