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

websocket JPMS fixes to not export websocket-core #4669

Merged
merged 3 commits into from
Mar 17, 2020

Conversation

lachlan-roberts
Copy link
Contributor

websocket-jetty-server and websocket-jetty-client were transitively exporting websocket-jetty-common which transitively exports websocket-core and websocket-util.
The same issue was with the javax side.

These changes make it so that the jetty & javax client and server modules do not export their common modules and therefore do not transitively export websocket-core and websocket-util.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
@@ -23,11 +23,11 @@
module org.eclipse.jetty.websocket.javax.client
{
exports org.eclipse.jetty.websocket.javax.client;
exports org.eclipse.jetty.websocket.javax.client.internal to org.eclipse.jetty.websocket.javax.server;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sbordet This is a weird case, I needed this because websocket-javax-server needs to extend on websocket-javax-client but we still don't want to transitively export our classes which have websocket-core in the signature.

This gives an error

Warning:(26, 99) java: module not found: org.eclipse.jetty.websocket.javax.server

I'm guessing this is because this module is complied before the websocket-javax-server module or something like that.

Copy link
Contributor

@sbordet sbordet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good changes!

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
@lachlan-roberts lachlan-roberts merged commit def7993 into jetty-10.0.x Mar 17, 2020
@lachlan-roberts lachlan-roberts deleted the jetty-10.0.x-WebSocket-JPMS branch March 17, 2020 03:26
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