SOLR-17069: Don't include jetty-jakarta-servlet-api JAR (EE9)#3838
Merged
dsmiley merged 7 commits intoapache:mainfrom Nov 7, 2025
Merged
SOLR-17069: Don't include jetty-jakarta-servlet-api JAR (EE9)#3838dsmiley merged 7 commits intoapache:mainfrom
dsmiley merged 7 commits intoapache:mainfrom
Conversation
Our Jetty 12 migration should not have incorporated org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api. This commit removes that completely.
github-actions
bot
added
documentation
Contributor
Author
|
I checked and see the "toolchain" JAR I'm removing was present in Solr 9.x... so looking at this PR as part of the Jetty 12 upgrade is not entirely accurate. Sunjay understandably merely bumped the version. But the Jetty upgrade enabled this to be possible, whereas it wasn't possible in 9.x. Perhaps the best JIRA here is SOLR-17503, the umbrella issue for Jakarta namespace. Shrug; whatever; I'll ensure the commit message reflects both. |
… response interfaces.
Contributor
|
I was just curious what's the javax stuff inside the toolchain jar. All of them are schema files no code classes, I believe to support old web xml files. |
Contributor
|
I don't see much difference between |
Contributor
Author
|
(embarassed); I should have looked closer at precisely what the javax stuff was in that JAR; thanks Sanjay. Still... it seems wrong and likely problematic to include this JAR from EE 9 when we already have Servlet v6 JAR in the build, which is aligned with EE 10. |
Contributor
|
Yes toolchain is not even active anymore and no support for EE10 actually. So +1 to the change. And with this everything Jakarta related is EE10 now. |
iamsanjay
approved these changes
Nov 7, 2025
Contributor
|
May be we should change the title of this PR. |
iamsanjay
requested changes
Nov 7, 2025
| === Upgrade to Jetty 12.x and Jakarta namespace | ||
|
|
||
| Solr upgraded to Jetty 12.x from 10.x as Jetty 10 and 11 have reached end-of-life support. Jetty 12.x requires Java 17 or newer and is fully compatible with Solr's new minimum requirement of Java 21. This upgrade brings support for modern HTTP protocols and adopts the Jakarta EE 10 namespace. For more details, see https://webtide.com/jetty-12-has-arrived/. | ||
| This migration marks the point at which Solr no longer includes _any_ JAR with "javax" in it -- the Jakarta migration is complete. |
Contributor
There was a problem hiding this comment.
This may not be valid anymore.
Contributor
Author
There was a problem hiding this comment.
The one-liner command in the PR description validates this. And the adjacent PR #3839 improves the smoketester to validate it.
dsmiley
changed the title
dsmiley
added a commit
that referenced
this pull request
Nov 9, 2025
…E9) (#3838) We should not have this JAR org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api as it is for Jakarta EE 9, and it contains javax XSD definitions. It also contains servlet classes for v5 that compete with jakarta servlet-api v6 that we already depend on in some places. * Use mocking instead of implementing the entire HttpServletRequest and response interfaces. * toml: remove unused jetty lib references * NOTICE: the servlet references were obsolete. The servlet JAR has it's own license file, and isn't CDDL either. (cherry picked from commit 50808cd)
dsmiley
added a commit
that referenced
this pull request
Nov 9, 2025
…E9) (#3838) We should not have this JAR org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api as it is for Jakarta EE 9, and it contains javax XSD definitions. It also contains servlet classes for v5 that compete with jakarta servlet-api v6 that we already depend on in some places. * Use mocking instead of implementing the entire HttpServletRequest and response interfaces. * toml: remove unused jetty lib references * NOTICE: the servlet references were obsolete. The servlet JAR has it's own license file, and isn't CDDL either. (cherry picked from commit 50808cd)
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.
https://issues.apache.org/jira/browse/SOLR-17069
Our Jetty 12 migration should not have incorporated
org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api. This commit removes that completely. The removal of this marks a milestone -- there is no JAR that Solr ships that includes "javax" stuff.find . -type f -name "*.jar" -ls -exec sh -c 'unzip -l "$1" 2>/dev/null | grep -q "javax/" && echo "$1"' _ {} \;