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.

Sign up for GitHub

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

Jump to bottom

Separate out websocket client and server components from websocket-core #4881

Merged
merged 4 commits into from
May 25, 2020
Merged

Separate out websocket client and server components from websocket-core #4881

merged 4 commits into from
May 25, 2020

Conversation

lachlan-roberts
Copy link
Contributor

@lachlan-roberts lachlan-roberts commented May 15, 2020 •
edited
Loading

Closes #2173 - Move server classes and dependencies out from websocket-core
Closes #2174 - Move client classes and dependencies out from websocket-core

WebSocket core now has 4 separate modules, the same as what has been done for both the jetty and javax websocket modules.
websocket-core-server
websocket-core-client
websocket-core-common
websocket-core-tests

Previously websocket-core had server dependencies even when only the client was needed.

Output from mvn dependency:tree in current jetty-10.0.x for the websocket-jetty-client:
(there are server dependencies for jetty-server and jetty-servlet-api)

[INFO] --- maven-dependency-plugin:3.1.1:tree (default-cli) @ websocket-jetty-client ---
[INFO] org.eclipse.jetty.websocket:websocket-jetty-client:jar:10.0.0-SNAPSHOT
[INFO] +- org.eclipse.jetty.websocket:websocket-jetty-api:jar:10.0.0-SNAPSHOT:compile
[INFO] +- org.eclipse.jetty.websocket:websocket-jetty-common:jar:10.0.0-SNAPSHOT:compile
[INFO] |  +- org.eclipse.jetty.websocket:websocket-core:jar:10.0.0-SNAPSHOT:compile
[INFO] |  |  \- org.eclipse.jetty:jetty-server:jar:10.0.0-SNAPSHOT:compile
[INFO] |  |     \- org.eclipse.jetty.toolchain:jetty-servlet-api:jar:4.0.3:compile
[INFO] |  +- org.eclipse.jetty.websocket:websocket-util:jar:10.0.0-SNAPSHOT:compile
[INFO] |  +- org.eclipse.jetty:jetty-util:jar:10.0.0-SNAPSHOT:compile
[INFO] |  \- org.eclipse.jetty:jetty-io:jar:10.0.0-SNAPSHOT:compile
[INFO] +- org.eclipse.jetty:jetty-client:jar:10.0.0-SNAPSHOT:compile
[INFO] |  +- org.eclipse.jetty:jetty-http:jar:10.0.0-SNAPSHOT:compile
[INFO] |  \- org.eclipse.jetty:jetty-alpn-client:jar:10.0.0-SNAPSHOT:compile
[INFO] +- org.slf4j:slf4j-api:jar:2.0.0-alpha1:compile
[INFO] +- org.eclipse.jetty:jetty-slf4j-impl:jar:10.0.0-SNAPSHOT:test
[INFO] +- org.eclipse.jetty.toolchain:jetty-test-helper:jar:5.4:test
[INFO] |  \- org.hamcrest:hamcrest:jar:2.1:test
[INFO] \- org.junit.jupiter:junit-jupiter:jar:5.6.2:test
[INFO]    +- org.junit.jupiter:junit-jupiter-api:jar:5.6.2:test
[INFO]    |  +- org.apiguardian:apiguardian-api:jar:1.1.0:test
[INFO]    |  +- org.opentest4j:opentest4j:jar:1.2.0:test
[INFO]    |  \- org.junit.platform:junit-platform-commons:jar:1.6.2:test
[INFO]    +- org.junit.jupiter:junit-jupiter-params:jar:5.6.2:test
[INFO]    \- org.junit.jupiter:junit-jupiter-engine:jar:5.6.2:test
[INFO]       \- org.junit.platform:junit-platform-engine:jar:1.6.2:test

Output from mvn dependency:tree in this branch after splitting up websocket-core:

[INFO] --- maven-dependency-plugin:3.1.1:tree (default-cli) @ websocket-jetty-client ---
[INFO] org.eclipse.jetty.websocket:websocket-jetty-client:jar:10.0.0-SNAPSHOT
[INFO] +- org.eclipse.jetty.websocket:websocket-jetty-api:jar:10.0.0-SNAPSHOT:compile
[INFO] +- org.eclipse.jetty.websocket:websocket-jetty-common:jar:10.0.0-SNAPSHOT:compile
[INFO] |  \- org.eclipse.jetty.websocket:websocket-util:jar:10.0.0-SNAPSHOT:compile
[INFO] +- org.eclipse.jetty.websocket:websocket-core-client:jar:10.0.0-SNAPSHOT:compile
[INFO] |  \- org.eclipse.jetty.websocket:websocket-core-common:jar:10.0.0-SNAPSHOT:compile
[INFO] +- org.eclipse.jetty:jetty-client:jar:10.0.0-SNAPSHOT:compile
[INFO] |  +- org.eclipse.jetty:jetty-http:jar:10.0.0-SNAPSHOT:compile
[INFO] |  |  \- org.eclipse.jetty:jetty-util:jar:10.0.0-SNAPSHOT:compile
[INFO] |  +- org.eclipse.jetty:jetty-io:jar:10.0.0-SNAPSHOT:compile
[INFO] |  \- org.eclipse.jetty:jetty-alpn-client:jar:10.0.0-SNAPSHOT:compile
[INFO] +- org.slf4j:slf4j-api:jar:2.0.0-alpha1:compile
[INFO] +- org.eclipse.jetty:jetty-slf4j-impl:jar:10.0.0-SNAPSHOT:test
[INFO] +- org.eclipse.jetty.toolchain:jetty-test-helper:jar:5.4:test
[INFO] |  \- org.hamcrest:hamcrest:jar:2.1:test
[INFO] \- org.junit.jupiter:junit-jupiter:jar:5.6.2:test
[INFO]    +- org.junit.jupiter:junit-jupiter-api:jar:5.6.2:test
[INFO]    |  +- org.apiguardian:apiguardian-api:jar:1.1.0:test
[INFO]    |  +- org.opentest4j:opentest4j:jar:1.2.0:test
[INFO]    |  \- org.junit.platform:junit-platform-commons:jar:1.6.2:test
[INFO]    +- org.junit.jupiter:junit-jupiter-params:jar:5.6.2:test
[INFO]    \- org.junit.jupiter:junit-jupiter-engine:jar:5.6.2:test
[INFO]       \- org.junit.platform:junit-platform-engine:jar:1.6.2:test

@lachlan-roberts
Issue #2173 & #2174 - Split websocket-core into client/server/common …
11d14a6 
…modules

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
@lachlan-roberts
Fix osgi issues in websocket-core-common
8b48980 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
@lachlan-roberts
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-…
f1815b6 
…WebSocketCoreRefactor
@lachlan-roberts
fix websocket-core-test pom.xml file
dacd5e7 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
@lachlan-roberts lachlan-roberts added this to the 10.0.x milestone May 25, 2020
@lachlan-roberts lachlan-roberts merged commit 94c8edc into jetty-10.0.x May 25, 2020
@lachlan-roberts lachlan-roberts deleted the jetty-10.0.x-WebSocketCoreRefactor branch May 25, 2020 23:47
@joakime joakime changed the title Issue #2173 & #2174 - separate out client and server parts of websocket-core Separate out websocket client and server components from websocket-core Dec 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gregw gregw gregw approved these changes

@joakime joakime Awaiting requested review from joakime

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
10.0.x
2 participants
@lachlan-roberts @gregw