Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FELIX-6750 Try out Jetty 12.1.0 in Felix HTTP #376

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from

Conversation

paulrutter
Copy link
Contributor

@paulrutter paulrutter commented Jan 20, 2025

  • 1.1.0-SNAPSHOT
  • Use jetty 12.1.0-alpha1
  • Add org.eclipse.jetty.compression.* to exports
  • Add dependency on jetty-compression-gzip (not sure if this is required, maybe only for the client) and jetty-compression-common

This branch is based on EE11 (servlet API 6.1).

- 1.1.0-SNAPSHOT
- Use jetty 12.1.0-alpha1
- Add `org.eclipse.jetty.compression.*` to exports
- Add dependency on jetty-compression-gzip (not sure if this is required, maybe only for the client) and jetty-compression-common
- Move to EE11
- Skip baselining to prevent errors in the baseline phase because of changed API's in 6.1.0
- Pass local maven repo to be able to get to the snapshot version of the servlet-api bundle
- Build servlet-api, as it's used in the Jetty bundles
@paulrutter
Copy link
Contributor Author

@cziegeler i did a first attempt on getting the http.jetty12 bundle to using Jetty 12.1.0 (servlet API 6.1).

Once it's GA we can revisit and check the open ends (like the servlet-api bundle failing on the baseline phase, we might need to remove version 5.0 and 6.0 from this bundle to get this resolved, as the servlet API actually changed in 6.1).

- Update wrappers to implement new methods for servlet-api 6.1. This will break backwards compatbility though
@cziegeler
Copy link
Contributor

Thanks, thats great.
Your changes to the servlet-api bundle look good - we always include the latest version (6.1 in this case) and export it as all earlier versions (5 and 6 in this case). While this is not 100% correct, it is usually good enough as the versions are compatible and code is not compiled against this bundle - it is just used at runtime.
There is of course the exception of servlet 6 which is not fully compatible to servlet 5 - due to removed methods -but we have that problem already today.

# Conflicts:
#	http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
#	http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/FelixJettyWebSocketServlet.java
#	http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServletAlternative.java
# Conflicts:
#	http/itest/pom.xml
#	http/jetty/pom.xml
#	http/jetty12/pom.xml
#	http/samples/whiteboard/pom.xml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants