From 11d14a65b44877c69eaefb86bd1fac7bebe86d1b Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 12 May 2020 15:10:44 +1000
Subject: [PATCH 1/3] Issue #2173 & #2174 - Split websocket-core into
 client/server/common modules

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 jetty-bom/pom.xml                             |  12 ++-
 .../eclipse/jetty/osgi/test/TestOSGiUtil.java |  18 +---
 jetty-websocket/pom.xml                       |  11 ++-
 jetty-websocket/websocket-core-client/pom.xml |  82 ++++++++++++++++++
 .../src/main/config/modules/websocket.mod     |   0
 .../src/main/java/module-info.java            |  29 +++++++
 .../core/client/ClientUpgradeRequest.java     |   4 +-
 .../core/client/HttpClientProvider.java       |   0
 .../core/client/HttpUpgraderOverHTTP.java     |   0
 .../core/client/HttpUpgraderOverHTTP2.java    |   0
 .../core/client/UpgradeListener.java          |   0
 .../core/client/WebSocketCoreClient.java      |   2 +-
 .../core/client/XmlHttpClientProvider.java    |   0
 jetty-websocket/websocket-core-common/pom.xml |  80 +++++++++++++++++
 .../src/main/config/modules/websocket.mod     |  11 +++
 .../src/main/java/module-info.java            |  14 +--
 .../websocket/core/AbstractExtension.java     |   0
 .../jetty/websocket/core/Behavior.java        |   0
 .../jetty/websocket/core/CloseStatus.java     |  11 +--
 .../jetty/websocket/core/Configuration.java   |   0
 .../jetty/websocket/core/CoreSession.java     |   0
 .../jetty/websocket/core/Extension.java       |   0
 .../jetty/websocket/core/ExtensionConfig.java |   4 +-
 .../eclipse/jetty/websocket/core/Frame.java   |   6 +-
 .../jetty/websocket/core/FrameHandler.java    |  10 +--
 .../jetty/websocket/core/IncomingFrames.java  |   0
 .../jetty/websocket/core/MessageHandler.java  |   0
 .../eclipse/jetty/websocket/core/OpCode.java  |   0
 .../jetty/websocket/core/OutgoingFrames.java  |   0
 .../websocket/core/WebSocketComponents.java   |  29 ++-----
 .../websocket/core/WebSocketConstants.java    |   0
 .../core/WebSocketExtensionRegistry.java      |   2 +-
 .../core/exception/BadPayloadException.java   |   0
 .../core/exception/CloseException.java        |   2 +-
 .../exception/MessageTooLargeException.java   |   0
 .../core/exception/ProtocolException.java     |   0
 .../core/exception/UpgradeException.java      |   0
 .../core/exception/WebSocketException.java    |   0
 .../exception/WebSocketTimeoutException.java  |   0
 .../WebSocketWriteTimeoutException.java       |   0
 .../core/internal/ExtensionStack.java         |   2 +-
 .../core/internal/FragmentExtension.java      |   0
 .../core/internal/FragmentingFlusher.java     |   0
 .../core/internal/FrameCaptureExtension.java  |   4 +-
 .../websocket/core/internal/FrameEntry.java   |   0
 .../websocket/core/internal/FrameFlusher.java |   2 +-
 .../core/internal/FrameSequence.java          |   0
 .../websocket/core/internal/Generator.java    |   0
 .../core/internal/IdentityExtension.java      |   0
 .../websocket/core/internal/Negotiated.java   |   0
 .../core/internal/NullAppendable.java         |   0
 .../jetty/websocket/core/internal/Parser.java |   0
 .../internal/PerMessageDeflateExtension.java  |   0
 .../core/internal/TransformingFlusher.java    |   0
 .../core/internal/ValidationExtension.java    |   0
 .../core/internal/WebSocketConnection.java    |   4 +-
 .../core/internal/WebSocketCore.java          |   0
 .../core/internal/WebSocketCoreSession.java   |  24 ++---
 .../core/internal/WebSocketSessionState.java  |   0
 ...org.eclipse.jetty.websocket.core.Extension |   0
 jetty-websocket/websocket-core-server/pom.xml |  76 ++++++++++++++++
 .../src/main/config/modules/websocket.mod     |  11 +++
 .../src/main/java/module-info.java            |  26 ++++++
 .../websocket/core/server/Handshaker.java     |   0
 .../websocket/core/server/Negotiation.java    |   0
 .../core/server/WebSocketNegotiator.java      |   0
 .../server/WebSocketServerComponents.java     |  51 +++++++++++
 .../core/server/WebSocketUpgradeHandler.java  |   0
 .../server/internal/AbstractHandshaker.java   |  18 +++-
 .../server/internal/HandshakerSelector.java   |   0
 .../server/internal/RFC6455Handshaker.java    |   0
 .../server/internal/RFC6455Negotiation.java   |   0
 .../server/internal/RFC8441Handshaker.java    |   0
 .../server/internal/RFC8441Negotiation.java   |   0
 .../fuzzingclient.json                        |   0
 .../fuzzingserver.json                        |   0
 .../pom.xml                                   |  44 ++--------
 .../jetty/websocket/core/AcceptHashTest.java  |   0
 .../websocket/core/AutoFragmentTest.java      |   0
 .../websocket/core/CapturedHexPayloads.java   |   2 +-
 .../jetty/websocket/core/CloseStatusTest.java |   0
 .../websocket/core/EchoFrameHandler.java      |   0
 .../jetty/websocket/core/FlushTest.java       |   4 +-
 .../jetty/websocket/core/FrameBufferTest.java |   4 +-
 .../core/GeneratorFrameFlagsTest.java         |   2 +-
 .../core/GeneratorParserRoundTripTest.java    |   2 +-
 .../jetty/websocket/core/GeneratorTest.java   |   6 +-
 .../websocket/core/IncomingFramesCapture.java |   0
 .../websocket/core/MessageHandlerTest.java    |   2 +-
 .../jetty/websocket/core/OpCodeTest.java      |   0
 .../websocket/core/OutgoingFramesCapture.java |   0
 .../core/OutgoingNetworkBytesCapture.java     |   2 +-
 .../core/ParsePayloadLengthTest.java          |   0
 .../core/ParserBadCloseStatusCodesTest.java   |   2 +-
 .../websocket/core/ParserBadOpCodesTest.java  |   2 +-
 .../jetty/websocket/core/ParserCapture.java   |   0
 .../core/ParserGoodCloseStatusCodesTest.java  |   0
 .../websocket/core/ParserReservedBitTest.java |   0
 .../jetty/websocket/core/ParserTest.java      |   0
 .../jetty/websocket/core/RawFrameBuilder.java |   0
 .../core/SynchronousFrameHandler.java         |   0
 .../websocket/core/TestAsyncFrameHandler.java |   0
 .../websocket/core/TestFrameHandler.java      |   0
 .../websocket/core/TestMessageHandler.java    |   0
 .../websocket/core/TestUpgradeHandler.java    |   0
 .../core/TestWebSocketNegotiator.java         |   0
 .../core/TestWebSocketUpgradeHandler.java     |   0
 .../jetty/websocket/core/Timeouts.java        |   0
 .../websocket/core/WebSocketCloseTest.java    |   2 +-
 .../websocket/core/WebSocketFrameTest.java    |   2 +-
 .../core/WebSocketNegotiationTest.java        |   2 +-
 .../websocket/core/WebSocketOpenTest.java     |   4 +-
 .../jetty/websocket/core/WebSocketServer.java |   0
 .../jetty/websocket/core/WebSocketTester.java |   2 +-
 .../core/autobahn/AutobahnFrameHandler.java   |   0
 .../core/autobahn/CoreAutobahnClient.java     |   6 +-
 .../core/autobahn/CoreAutobahnServer.java     |   0
 .../core/chat/ChatWebSocketClient.java        |   8 +-
 .../core/chat/ChatWebSocketServer.java        |   2 +-
 .../client/WebSocketClientServerTest.java     |   2 +-
 .../extensions/AbstractExtensionTest.java     |   0
 .../core/extensions/ExtensionConfigTest.java  |   0
 .../core/extensions/ExtensionStackTest.java   |   0
 .../core/extensions/ExtensionTool.java        |   8 +-
 .../extensions/FragmentExtensionTest.java     |   0
 .../extensions/IdentityExtensionTest.java     |   0
 .../PerMessageDeflateExtensionTest.java       |   0
 .../PerMessageDeflaterBufferSizeTest.java     |   4 +-
 .../extensions/ValidationExtensionTest.java   |   0
 .../core/internal/FrameFlusherTest.java       |   2 +-
 .../websocket/core/internal/MockEndpoint.java |   0
 .../websocket/core/proxy/WebSocketProxy.java  |   4 +-
 .../core/proxy/WebSocketProxyTest.java        |   0
 .../core/server/WebSocketServerTest.java      |   2 +-
 .../test/resources/jetty-logging.properties   |   0
 .../src/test/resources/keystore.p12           | Bin
 .../websocket-javax-client/pom.xml            |  20 ++---
 .../src/main/java/module-info.java            |   5 +-
 .../websocket-javax-common/pom.xml            |  15 ++--
 .../src/main/java/module-info.java            |   6 +-
 .../websocket-javax-server/pom.xml            |   5 --
 .../main/config/modules/websocket-javax.mod   |   4 +-
 .../src/main/java/module-info.java            |   4 +-
 ...xWebSocketServletContainerInitializer.java |  13 +--
 .../JavaxWebSocketServerContainer.java        |   3 +-
 jetty-websocket/websocket-jetty-api/pom.xml   |   8 --
 .../websocket-jetty-client/pom.xml            |  10 +--
 .../src/main/java/module-info.java            |   6 +-
 .../websocket-jetty-common/pom.xml            |  29 -------
 .../src/main/java/module-info.java            |   5 +-
 .../websocket-jetty-server/pom.xml            |  40 ++++-----
 .../main/config/modules/websocket-jetty.mod   |   4 +-
 .../server/JettyWebSocketServerContainer.java |   3 +-
 .../server/JettyWebSocketServlet.java         |   5 +-
 ...yWebSocketServletContainerInitializer.java |   3 +-
 jetty-websocket/websocket-util-server/pom.xml |   2 +-
 .../src/main/java/module-info.java            |   2 +-
 .../util/server/WebSocketUpgradeFilter.java   |   4 +-
 .../server/internal/WebSocketMapping.java     |   5 +-
 jetty-websocket/websocket-util/pom.xml        |   7 +-
 .../src/main/java/module-info.java            |   4 +-
 161 files changed, 566 insertions(+), 313 deletions(-)
 create mode 100644 jetty-websocket/websocket-core-client/pom.xml
 rename jetty-websocket/{websocket-core => websocket-core-client}/src/main/config/modules/websocket.mod (100%)
 create mode 100644 jetty-websocket/websocket-core-client/src/main/java/module-info.java
 rename jetty-websocket/{websocket-core => websocket-core-client}/src/main/java/org/eclipse/jetty/websocket/core/client/ClientUpgradeRequest.java (98%)
 rename jetty-websocket/{websocket-core => websocket-core-client}/src/main/java/org/eclipse/jetty/websocket/core/client/HttpClientProvider.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-client}/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-client}/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP2.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-client}/src/main/java/org/eclipse/jetty/websocket/core/client/UpgradeListener.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-client}/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java (98%)
 rename jetty-websocket/{websocket-core => websocket-core-client}/src/main/java/org/eclipse/jetty/websocket/core/client/XmlHttpClientProvider.java (100%)
 create mode 100644 jetty-websocket/websocket-core-common/pom.xml
 create mode 100644 jetty-websocket/websocket-core-common/src/main/config/modules/websocket.mod
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/module-info.java (78%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/Behavior.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java (96%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/Configuration.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/CoreSession.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/Extension.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java (98%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/Frame.java (99%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java (93%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/IncomingFrames.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/OpCode.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/OutgoingFrames.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java (71%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConstants.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java (96%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/BadPayloadException.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java (97%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/MessageTooLargeException.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/ProtocolException.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/UpgradeException.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketException.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketTimeoutException.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketWriteTimeoutException.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java (99%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java (97%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameEntry.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java (99%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameSequence.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/Generator.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/IdentityExtension.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/NullAppendable.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java (99%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCore.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java (97%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-common}/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension (100%)
 create mode 100644 jetty-websocket/websocket-core-server/pom.xml
 create mode 100644 jetty-websocket/websocket-core-server/src/main/config/modules/websocket.mod
 create mode 100644 jetty-websocket/websocket-core-server/src/main/java/module-info.java
 rename jetty-websocket/{websocket-core => websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/Negotiation.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java (100%)
 create mode 100644 jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketServerComponents.java
 rename jetty-websocket/{websocket-core => websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java (93%)
 rename jetty-websocket/{websocket-core => websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-server}/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/fuzzingclient.json (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/fuzzingserver.json (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/pom.xml (77%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/AcceptHashTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java (95%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/CloseStatusTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java (97%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java (96%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java (97%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java (97%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java (99%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/IncomingFramesCapture.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java (99%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/OpCodeTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/OutgoingFramesCapture.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java (98%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/ParsePayloadLengthTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java (98%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java (98%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/ParserCapture.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/ParserGoodCloseStatusCodesTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/ParserReservedBitTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/RawFrameBuilder.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/SynchronousFrameHandler.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/TestUpgradeHandler.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketUpgradeHandler.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/Timeouts.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java (99%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java (98%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java (99%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java (98%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java (98%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnFrameHandler.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java (98%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java (95%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java (98%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java (98%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/AbstractExtensionTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionConfigTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java (97%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflateExtensionTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java (98%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java (99%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java (99%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java (99%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/resources/jetty-logging.properties (100%)
 rename jetty-websocket/{websocket-core => websocket-core-tests}/src/test/resources/keystore.p12 (100%)

diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml
index 0a9c50a7b594..29eb56448e45 100644
--- a/jetty-bom/pom.xml
+++ b/jetty-bom/pom.xml
@@ -381,7 +381,17 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>websocket-core</artifactId>
+        <artifactId>websocket-core-common</artifactId>
+        <version>10.0.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.websocket</groupId>
+        <artifactId>websocket-core-client</artifactId>
+        <version>10.0.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.websocket</groupId>
+        <artifactId>websocket-core-server</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
diff --git a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
index 15aaaa512e58..961ff63ec53b 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
+++ b/jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
@@ -19,21 +19,11 @@
 package org.eclipse.jetty.osgi.test;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.ContentResponse;
-import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
-import org.eclipse.jetty.http.HttpStatus;
-import org.eclipse.jetty.io.ClientConnector;
 import org.eclipse.jetty.osgi.boot.OSGiServerConstants;
 import org.eclipse.jetty.toolchain.test.FS;
 import org.eclipse.jetty.util.StringUtil;
@@ -43,16 +33,12 @@
 import org.ops4j.pax.exam.options.WrappedUrlProvisionOption.OverwriteMode;
 import org.ops4j.pax.tinybundles.core.TinyBundle;
 import org.ops4j.pax.tinybundles.core.TinyBundles;
-import org.ops4j.pax.url.mvn.internal.AetherBasedResolver;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
-import org.osgi.service.http.HttpService;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
@@ -195,7 +181,9 @@ public static List<Option> coreJettyDependencies()
         res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-jndi").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-plus").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-annotations").versionAsInProject().start());
-        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-server").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-client").versionAsInProject().start());
+        res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-core-common").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-util").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-util-server").versionAsInProject().start());
         res.add(mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("websocket-jetty-api").versionAsInProject().start());
diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml
index 3d74b9c9e916..b30945be5939 100644
--- a/jetty-websocket/pom.xml
+++ b/jetty-websocket/pom.xml
@@ -14,9 +14,11 @@
   <url>http://www.eclipse.org/jetty</url>
 
   <modules>
-    <module>websocket-core</module>
-    <module>websocket-util</module>
-    <module>websocket-util-server</module>
+    <!-- WebSocket Core Implementation -->
+    <module>websocket-core-common</module>
+    <module>websocket-core-client</module>
+    <module>websocket-core-server</module>
+    <module>websocket-core-tests</module>
     <!-- Jetty WebSocket Implementation -->
     <module>websocket-jetty-api</module>
     <module>websocket-jetty-common</module>
@@ -28,6 +30,9 @@
     <module>websocket-javax-client</module>
     <module>websocket-javax-server</module>
     <module>websocket-javax-tests</module>
+    <!-- Common WebSocket Implementation -->
+    <module>websocket-util</module>
+    <module>websocket-util-server</module>
   </modules>
 
   <build>
diff --git a/jetty-websocket/websocket-core-client/pom.xml b/jetty-websocket/websocket-core-client/pom.xml
new file mode 100644
index 000000000000..5924b6615274
--- /dev/null
+++ b/jetty-websocket/websocket-core-client/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty.websocket</groupId>
+    <artifactId>websocket-parent</artifactId>
+    <version>10.0.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>websocket-core-client</artifactId>
+  <name>Jetty :: Websocket :: Core :: Client</name>
+
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.core.client</bundle-symbolic-name>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-core-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>ban-ws-apis</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <includes>
+                    <include>org.eclipse.jetty.websocket:websocket-jetty-api</include>
+                    <include>javax.websocket</include>
+                  </includes>
+                </bannedDependencies>
+              </rules>
+            </configuration>
+          </execution>
+          <execution>
+            <id>ban-java-servlet-api</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <includes>
+                    <include>javax.servlet</include>
+                    <include>servletapi</include>
+                    <include>org.eclipse.jetty.orbit:javax.servlet</include>
+                    <include>org.mortbay.jetty:servlet-api</include>
+                    <include>jetty:servlet-api</include>
+                    <include>jetty-servlet-api</include>
+                  </includes>
+                </bannedDependencies>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/jetty-websocket/websocket-core/src/main/config/modules/websocket.mod b/jetty-websocket/websocket-core-client/src/main/config/modules/websocket.mod
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/config/modules/websocket.mod
rename to jetty-websocket/websocket-core-client/src/main/config/modules/websocket.mod
diff --git a/jetty-websocket/websocket-core-client/src/main/java/module-info.java b/jetty-websocket/websocket-core-client/src/main/java/module-info.java
new file mode 100644
index 000000000000..0e8dbf891116
--- /dev/null
+++ b/jetty-websocket/websocket-core-client/src/main/java/module-info.java
@@ -0,0 +1,29 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under
+// the terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0
+//
+// This Source Code may also be made available under the following
+// Secondary Licenses when the conditions for such availability set
+// forth in the Eclipse Public License, v. 2.0 are satisfied:
+// the Apache License v2.0 which is available at
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+module org.eclipse.jetty.websocket.core.client
+{
+    exports org.eclipse.jetty.websocket.core.client;
+
+    requires org.slf4j;
+    requires transitive org.eclipse.jetty.client;
+    requires transitive org.eclipse.jetty.websocket.core.common;
+
+    // Only required if using XmlHttpClientProvider.
+    requires static org.eclipse.jetty.xml;
+}
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/ClientUpgradeRequest.java b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/ClientUpgradeRequest.java
similarity index 98%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/ClientUpgradeRequest.java
rename to jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/ClientUpgradeRequest.java
index fec8515b2f70..ab74b874ec19 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/ClientUpgradeRequest.java
+++ b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/ClientUpgradeRequest.java
@@ -80,8 +80,8 @@ public FrameHandler getFrameHandler()
     protected final CompletableFuture<CoreSession> futureCoreSession;
     private final WebSocketCoreClient wsClient;
     private FrameHandler frameHandler;
-    private Configuration.ConfigurationCustomizer customizer = new Configuration.ConfigurationCustomizer();
-    private List<UpgradeListener> upgradeListeners = new ArrayList<>();
+    private final Configuration.ConfigurationCustomizer customizer = new Configuration.ConfigurationCustomizer();
+    private final List<UpgradeListener> upgradeListeners = new ArrayList<>();
     private List<ExtensionConfig> requestedExtensions = new ArrayList<>();
 
     public ClientUpgradeRequest(WebSocketCoreClient webSocketClient, URI requestURI)
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/HttpClientProvider.java b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpClientProvider.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/HttpClientProvider.java
rename to jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpClientProvider.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP.java b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP.java
rename to jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP2.java b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP2.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP2.java
rename to jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP2.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/UpgradeListener.java b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/UpgradeListener.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/UpgradeListener.java
rename to jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/UpgradeListener.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
similarity index 98%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
rename to jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
index e4aa450d1813..7795e5460c21 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
+++ b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
@@ -40,7 +40,7 @@ public class WebSocketCoreClient extends ContainerLifeCycle
 
     private static final Logger LOG = LoggerFactory.getLogger(WebSocketCoreClient.class);
     private final HttpClient httpClient;
-    private WebSocketComponents components;
+    private final WebSocketComponents components;
 
     // TODO: Things to consider for inclusion in this class (or removal if they can be set elsewhere, like HttpClient)
     // - AsyncWrite Idle Timeout
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/XmlHttpClientProvider.java b/jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/XmlHttpClientProvider.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/XmlHttpClientProvider.java
rename to jetty-websocket/websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/XmlHttpClientProvider.java
diff --git a/jetty-websocket/websocket-core-common/pom.xml b/jetty-websocket/websocket-core-common/pom.xml
new file mode 100644
index 000000000000..4290b2ffb5db
--- /dev/null
+++ b/jetty-websocket/websocket-core-common/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty.websocket</groupId>
+    <artifactId>websocket-parent</artifactId>
+    <version>10.0.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>websocket-core-common</artifactId>
+  <name>Jetty :: Websocket :: Core :: Common</name>
+
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.core.common</bundle-symbolic-name>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-io</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>ban-ws-apis</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <includes>
+                    <include>org.eclipse.jetty.websocket:websocket-jetty-api</include>
+                    <include>javax.websocket</include>
+                  </includes>
+                </bannedDependencies>
+              </rules>
+            </configuration>
+          </execution>
+          <execution>
+            <id>ban-java-servlet-api</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <includes>
+                    <include>javax.servlet</include>
+                    <include>servletapi</include>
+                    <include>org.eclipse.jetty.orbit:javax.servlet</include>
+                    <include>org.mortbay.jetty:servlet-api</include>
+                    <include>jetty:servlet-api</include>
+                    <include>jetty-servlet-api</include>
+                  </includes>
+                </bannedDependencies>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/jetty-websocket/websocket-core-common/src/main/config/modules/websocket.mod b/jetty-websocket/websocket-core-common/src/main/config/modules/websocket.mod
new file mode 100644
index 000000000000..da53af6d2e2a
--- /dev/null
+++ b/jetty-websocket/websocket-core-common/src/main/config/modules/websocket.mod
@@ -0,0 +1,11 @@
+DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[description]
+Enable both jetty and javax websocket modules for deployed web applications.
+
+[tags]
+websocket
+
+[depend]
+websocket-jetty
+websocket-javax
diff --git a/jetty-websocket/websocket-core/src/main/java/module-info.java b/jetty-websocket/websocket-core-common/src/main/java/module-info.java
similarity index 78%
rename from jetty-websocket/websocket-core/src/main/java/module-info.java
rename to jetty-websocket/websocket-core-common/src/main/java/module-info.java
index c2fa64dda77b..c2fb2c5276c9 100644
--- a/jetty-websocket/websocket-core/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/module-info.java
@@ -22,22 +22,16 @@
 import org.eclipse.jetty.websocket.core.internal.PerMessageDeflateExtension;
 import org.eclipse.jetty.websocket.core.internal.ValidationExtension;
 
-module org.eclipse.jetty.websocket.core
+module org.eclipse.jetty.websocket.core.common
 {
     exports org.eclipse.jetty.websocket.core;
-    exports org.eclipse.jetty.websocket.core.client;
-    exports org.eclipse.jetty.websocket.core.server;
     exports org.eclipse.jetty.websocket.core.exception;
-    exports org.eclipse.jetty.websocket.core.internal to org.eclipse.jetty.util;
+    exports org.eclipse.jetty.websocket.core.internal to org.eclipse.jetty.websocket.core.client, org.eclipse.jetty.websocket.core.server, org.eclipse.jetty.util;
 
-    requires jetty.servlet.api;
-    requires transitive org.eclipse.jetty.client;
-    requires transitive org.eclipse.jetty.server;
+    requires org.eclipse.jetty.http;
+    requires org.eclipse.jetty.io;
     requires org.slf4j;
 
-    // Only required if using XmlHttpClientProvider.
-    requires static org.eclipse.jetty.xml;
-
     uses Extension;
 
     provides Extension with
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/Behavior.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Behavior.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/Behavior.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Behavior.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java
similarity index 96%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java
index cdbed64f7a61..e324d2c866ec 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CloseStatus.java
@@ -306,15 +306,12 @@ public static boolean isTransmittableStatusCode(int statusCode)
         }
 
         // Reserved / not yet allocated
-        if ((statusCode == 1004) || // Reserved in RFC6455 (might be defined in the future)
-            ((statusCode >= 1016) && (statusCode <= 2999)) || // Reserved in RFC6455 (for future revisions, and extensions)
-            (statusCode >= 5000)) // RFC6455 Not allowed to be used for any purpose
-        {
-            return false;
-        }
+        // RFC6455 Not allowed to be used for any purpose
+        return (statusCode != 1004) && // Reserved in RFC6455 (might be defined in the future)
+            ((statusCode < 1016) || (statusCode > 2999)) && // Reserved in RFC6455 (for future revisions, and extensions)
+            (statusCode < 5000);
 
         // All others are allowed
-        return true;
     }
 
     public Frame toFrame()
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/Configuration.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Configuration.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/Configuration.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Configuration.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/CoreSession.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CoreSession.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/CoreSession.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/CoreSession.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/Extension.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Extension.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/Extension.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Extension.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java
similarity index 98%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java
index 28be0a3e4f6e..10a6fbb0eb66 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/ExtensionConfig.java
@@ -38,7 +38,7 @@
  */
 public class ExtensionConfig
 {
-    private static Trie<ExtensionConfig> CACHE = new ArrayTrie<>(512);
+    private static final Trie<ExtensionConfig> CACHE = new ArrayTrie<>(512);
 
     static
     {
@@ -315,7 +315,7 @@ private static class ParamParser extends QuotedCSV
     {
         private final String parameterizedName;
         private String name;
-        private Map<String, String> params = new HashMap<>();
+        private final Map<String, String> params = new HashMap<>();
 
         public ParamParser(String parameterizedName)
         {
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/Frame.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Frame.java
similarity index 99%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/Frame.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Frame.java
index 5c44d9c4e77a..9f7c1a74435d 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/Frame.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/Frame.java
@@ -193,11 +193,7 @@ else if (!payload.equals(other.payload))
         {
             return false;
         }
-        if (!Arrays.equals(mask, other.mask))
-        {
-            return false;
-        }
-        return true;
+        return Arrays.equals(mask, other.mask);
     }
 
     public byte[] getMask()
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java
similarity index 93%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java
index 2e16bee68a2c..265103b13240 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/FrameHandler.java
@@ -19,8 +19,6 @@
 package org.eclipse.jetty.websocket.core;
 
 import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.websocket.core.client.ClientUpgradeRequest;
-import org.eclipse.jetty.websocket.core.server.Negotiation;
 
 /**
  * Interface for local WebSocket Endpoint Frame handling.
@@ -31,11 +29,11 @@
  * is instantiated by the application, either:
  * </p>
  * <ul>
- * <li>On the server, the application layer must provide a {@link org.eclipse.jetty.websocket.core.server.WebSocketNegotiator} instance
+ * <li>On the server, the application layer must provide a {@code org.eclipse.jetty.websocket.core.server.WebSocketNegotiator} instance
  * to negotiate and accept websocket connections, which will return the FrameHandler instance to use from
- * {@link org.eclipse.jetty.websocket.core.server.WebSocketNegotiator#negotiate(Negotiation)}.</li>
- * <li>On the client, the application returns the FrameHandler instance to user from the {@link ClientUpgradeRequest}
- * instance that it passes to the {@link org.eclipse.jetty.websocket.core.client.WebSocketCoreClient#connect(ClientUpgradeRequest)} method/</li>
+ * {@code org.eclipse.jetty.websocket.core.server.WebSocketNegotiator#negotiate(Negotiation)}.</li>
+ * <li>On the client, the application returns the FrameHandler instance to user from the {@code ClientUpgradeRequest}
+ * instance that it passes to the {@code org.eclipse.jetty.websocket.core.client.WebSocketCoreClient#connect(ClientUpgradeRequest)} method/</li>
  * </ul>
  * <p>
  * Once instantiated the FrameHandler follows is used as follows:
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/IncomingFrames.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/IncomingFrames.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/IncomingFrames.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/IncomingFrames.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/MessageHandler.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/OpCode.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OpCode.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/OpCode.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OpCode.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/OutgoingFrames.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OutgoingFrames.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/OutgoingFrames.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/OutgoingFrames.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java
similarity index 71%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java
index 1f5d593f7fd1..325132b097bd 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketComponents.java
@@ -19,7 +19,6 @@
 package org.eclipse.jetty.websocket.core;
 
 import java.util.zip.Deflater;
-import javax.servlet.ServletContext;
 
 import org.eclipse.jetty.io.ByteBufferPool;
 import org.eclipse.jetty.io.MappedByteBufferPool;
@@ -31,26 +30,14 @@
 /**
  * A collection of components which are the resources needed for websockets such as
  * {@link ByteBufferPool}, {@link WebSocketExtensionRegistry}, and {@link DecoratedObjectFactory}.
- *
- * These components should be accessed through {@link WebSocketComponents#ensureWebSocketComponents} so that
- * the instance can be shared by being stored as a bean on the ContextHandler.
  */
 public class WebSocketComponents
 {
-    public static final String WEBSOCKET_COMPONENTS_ATTRIBUTE = WebSocketComponents.class.getName();
-
-    public static WebSocketComponents ensureWebSocketComponents(ServletContext servletContext)
-    {
-        // Ensure a mapping exists
-        WebSocketComponents components = (WebSocketComponents)servletContext.getAttribute(WEBSOCKET_COMPONENTS_ATTRIBUTE);
-        if (components == null)
-        {
-            components = new WebSocketComponents();
-            servletContext.setAttribute(WEBSOCKET_COMPONENTS_ATTRIBUTE, components);
-        }
-
-        return components;
-    }
+    private final DecoratedObjectFactory objectFactory;
+    private final WebSocketExtensionRegistry extensionRegistry;
+    private final ByteBufferPool bufferPool;
+    private final InflaterPool inflaterPool;
+    private final DeflaterPool deflaterPool;
 
     public WebSocketComponents()
     {
@@ -69,12 +56,6 @@ public WebSocketComponents(WebSocketExtensionRegistry extensionRegistry, Decorat
         this.inflaterPool = inflaterPool;
     }
 
-    private DecoratedObjectFactory objectFactory;
-    private WebSocketExtensionRegistry extensionRegistry;
-    private ByteBufferPool bufferPool;
-    private InflaterPool inflaterPool;
-    private DeflaterPool deflaterPool;
-
     public ByteBufferPool getBufferPool()
     {
         return bufferPool;
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConstants.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConstants.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConstants.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketConstants.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java
similarity index 96%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java
index a6b55884f682..09b6d51754ad 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java
@@ -30,7 +30,7 @@
 
 public class WebSocketExtensionRegistry implements Iterable<Class<? extends Extension>>
 {
-    private Map<String, Class<? extends Extension>> availableExtensions = new HashMap<>();
+    private final Map<String, Class<? extends Extension>> availableExtensions = new HashMap<>();
 
     public WebSocketExtensionRegistry()
     {
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/BadPayloadException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/BadPayloadException.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/BadPayloadException.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/BadPayloadException.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java
similarity index 97%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java
index 6243d216de89..150700ec616b 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/CloseException.java
@@ -21,7 +21,7 @@
 @SuppressWarnings("serial")
 public class CloseException extends WebSocketException
 {
-    private int statusCode;
+    private final int statusCode;
 
     public CloseException(int closeCode, String message)
     {
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/MessageTooLargeException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/MessageTooLargeException.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/MessageTooLargeException.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/MessageTooLargeException.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/ProtocolException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/ProtocolException.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/ProtocolException.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/ProtocolException.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/UpgradeException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/UpgradeException.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/UpgradeException.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/UpgradeException.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketException.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketException.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketException.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketTimeoutException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketTimeoutException.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketTimeoutException.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketTimeoutException.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketWriteTimeoutException.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketWriteTimeoutException.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketWriteTimeoutException.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/exception/WebSocketWriteTimeoutException.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java
similarity index 99%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java
index 28f3232c8167..ccde09f3361c 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java
@@ -54,7 +54,7 @@ public class ExtensionStack implements IncomingFrames, OutgoingFrames, Dumpable
     private List<Extension> extensions;
     private IncomingFrames incoming;
     private OutgoingFrames outgoing;
-    private Extension[] rsvClaims = new Extension[3];
+    private final Extension[] rsvClaims = new Extension[3];
 
     public ExtensionStack(WebSocketComponents components, Behavior behavior)
     {
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentExtension.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FragmentingFlusher.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java
similarity index 97%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java
index a4b7ccb73f4c..9612f744651d 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameCaptureExtension.java
@@ -51,8 +51,8 @@ public class FrameCaptureExtension extends AbstractExtension
     private Path incomingFramesPath;
     private Path outgoingFramesPath;
 
-    private AtomicInteger incomingCount = new AtomicInteger(0);
-    private AtomicInteger outgoingCount = new AtomicInteger(0);
+    private final AtomicInteger incomingCount = new AtomicInteger(0);
+    private final AtomicInteger outgoingCount = new AtomicInteger(0);
 
     private SeekableByteChannel incomingChannel;
     private SeekableByteChannel outgoingChannel;
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameEntry.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameEntry.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameEntry.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameEntry.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java
similarity index 99%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java
index c7633d291e54..e4483f6e7194 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java
@@ -511,7 +511,7 @@ public String toString()
     private class Entry extends FrameEntry
     {
         private ByteBuffer headerBuffer;
-        private long timeOfCreation = System.currentTimeMillis();
+        private final long timeOfCreation = System.currentTimeMillis();
 
         private Entry(Frame frame, Callback callback, boolean batch)
         {
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameSequence.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameSequence.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameSequence.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameSequence.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/Generator.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Generator.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/Generator.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Generator.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/IdentityExtension.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/IdentityExtension.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/IdentityExtension.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/IdentityExtension.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Negotiated.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/NullAppendable.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/NullAppendable.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/NullAppendable.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/NullAppendable.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/Parser.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/PerMessageDeflateExtension.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/TransformingFlusher.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/ValidationExtension.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java
similarity index 99%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java
index e83759e72851..0d61d6036596 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java
@@ -63,8 +63,8 @@ public class WebSocketConnection extends AbstractConnection implements Connectio
 
     private long demand;
     private boolean fillingAndParsing;
-    private LongAdder messagesIn = new LongAdder();
-    private LongAdder bytesIn = new LongAdder();
+    private final LongAdder messagesIn = new LongAdder();
+    private final LongAdder bytesIn = new LongAdder();
 
     // Read / Parse variables
     private RetainableByteBuffer networkBuffer;
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCore.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCore.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCore.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCore.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java
similarity index 97%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java
index 53de09e21919..148d2fcf0ede 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java
+++ b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketCoreSession.java
@@ -29,7 +29,6 @@
 import java.util.concurrent.TimeoutException;
 
 import org.eclipse.jetty.io.ByteBufferPool;
-import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.Utf8Appendable;
 import org.eclipse.jetty.util.component.Dumpable;
@@ -81,7 +80,6 @@ public class WebSocketCoreSession implements IncomingFrames, CoreSession, Dumpab
     private long maxTextMessageSize = WebSocketConstants.DEFAULT_MAX_TEXT_MESSAGE_SIZE;
     private Duration idleTimeout = WebSocketConstants.DEFAULT_IDLE_TIMEOUT;
     private Duration writeTimeout = WebSocketConstants.DEFAULT_WRITE_TIMEOUT;
-    private final ContextHandler contextHandler;
 
     public WebSocketCoreSession(FrameHandler handler, Behavior behavior, Negotiated negotiated, WebSocketComponents components)
     {
@@ -90,26 +88,16 @@ public WebSocketCoreSession(FrameHandler handler, Behavior behavior, Negotiated
         this.behavior = behavior;
         this.negotiated = negotiated;
         this.demanding = handler.isDemanding();
-
-        if (behavior == Behavior.SERVER)
-        {
-            ContextHandler.Context context = ContextHandler.getCurrentContext();
-            this.contextHandler = (context != null) ? context.getContextHandler() : null;
-        }
-        else
-        {
-            this.contextHandler = null;
-        }
-
         negotiated.getExtensions().initialize(new IncomingAdaptor(), new OutgoingAdaptor(), this);
     }
 
-    private void handle(Runnable runnable)
+    /**
+     * Can be overridden to scope into the correct classloader before calling application code.
+     * @param runnable the runnable to execute.
+     */
+    protected void handle(Runnable runnable)
     {
-        if (contextHandler != null)
-            contextHandler.handle(runnable);
-        else
-            runnable.run();
+        runnable.run();
     }
 
     /**
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java b/jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java
rename to jetty-websocket/websocket-core-common/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketSessionState.java
diff --git a/jetty-websocket/websocket-core/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension b/jetty-websocket/websocket-core-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension
rename to jetty-websocket/websocket-core-common/src/main/resources/META-INF/services/org.eclipse.jetty.websocket.core.Extension
diff --git a/jetty-websocket/websocket-core-server/pom.xml b/jetty-websocket/websocket-core-server/pom.xml
new file mode 100644
index 000000000000..ab55a54ecb0a
--- /dev/null
+++ b/jetty-websocket/websocket-core-server/pom.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.eclipse.jetty.websocket</groupId>
+    <artifactId>websocket-parent</artifactId>
+    <version>10.0.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>websocket-core-server</artifactId>
+  <name>Jetty :: Websocket :: Core :: Server</name>
+
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.core.server</bundle-symbolic-name>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-core-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>ban-ws-apis</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <includes>
+                    <include>org.eclipse.jetty.websocket:websocket-jetty-api</include>
+                    <include>javax.websocket</include>
+                  </includes>
+                </bannedDependencies>
+              </rules>
+            </configuration>
+          </execution>
+          <execution>
+            <id>ban-java-servlet-api</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <includes>
+                    <include>javax.servlet</include>
+                    <include>servletapi</include>
+                    <include>org.eclipse.jetty.orbit:javax.servlet</include>
+                    <include>org.mortbay.jetty:servlet-api</include>
+                    <include>jetty:servlet-api</include>
+                    <include>jetty-servlet-api</include>
+                  </includes>
+                </bannedDependencies>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/jetty-websocket/websocket-core-server/src/main/config/modules/websocket.mod b/jetty-websocket/websocket-core-server/src/main/config/modules/websocket.mod
new file mode 100644
index 000000000000..da53af6d2e2a
--- /dev/null
+++ b/jetty-websocket/websocket-core-server/src/main/config/modules/websocket.mod
@@ -0,0 +1,11 @@
+DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
+
+[description]
+Enable both jetty and javax websocket modules for deployed web applications.
+
+[tags]
+websocket
+
+[depend]
+websocket-jetty
+websocket-javax
diff --git a/jetty-websocket/websocket-core-server/src/main/java/module-info.java b/jetty-websocket/websocket-core-server/src/main/java/module-info.java
new file mode 100644
index 000000000000..fa7c47d2610f
--- /dev/null
+++ b/jetty-websocket/websocket-core-server/src/main/java/module-info.java
@@ -0,0 +1,26 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under
+// the terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0
+//
+// This Source Code may also be made available under the following
+// Secondary Licenses when the conditions for such availability set
+// forth in the Eclipse Public License, v. 2.0 are satisfied:
+// the Apache License v2.0 which is available at
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+module org.eclipse.jetty.websocket.core.server
+{
+    exports org.eclipse.jetty.websocket.core.server;
+
+    requires org.slf4j;
+    requires transitive org.eclipse.jetty.server;
+    requires transitive org.eclipse.jetty.websocket.core.common;
+}
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Handshaker.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/Negotiation.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Negotiation.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/Negotiation.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/Negotiation.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketNegotiator.java
diff --git a/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketServerComponents.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketServerComponents.java
new file mode 100644
index 000000000000..2fefc439d092
--- /dev/null
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketServerComponents.java
@@ -0,0 +1,51 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2020 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under
+// the terms of the Eclipse Public License 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0
+//
+// This Source Code may also be made available under the following
+// Secondary Licenses when the conditions for such availability set
+// forth in the Eclipse Public License, v. 2.0 are satisfied:
+// the Apache License v2.0 which is available at
+// https://www.apache.org/licenses/LICENSE-2.0
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+package org.eclipse.jetty.websocket.core.server;
+
+import javax.servlet.ServletContext;
+
+import org.eclipse.jetty.io.ByteBufferPool;
+import org.eclipse.jetty.util.DecoratedObjectFactory;
+import org.eclipse.jetty.websocket.core.WebSocketComponents;
+import org.eclipse.jetty.websocket.core.WebSocketExtensionRegistry;
+
+/**
+ * A collection of components which are the resources needed for websockets such as
+ * {@link ByteBufferPool}, {@link WebSocketExtensionRegistry}, and {@link DecoratedObjectFactory}.
+ *
+ * These components should be accessed through {@link WebSocketServerComponents#ensureWebSocketComponents} so that
+ * the instance can be shared by being stored as a bean on the ContextHandler.
+ */
+public class WebSocketServerComponents extends WebSocketComponents
+{
+    public static final String WEBSOCKET_COMPONENTS_ATTRIBUTE = WebSocketComponents.class.getName();
+
+    public static WebSocketComponents ensureWebSocketComponents(ServletContext servletContext)
+    {
+        // Ensure a mapping exists
+        WebSocketComponents components = (WebSocketComponents)servletContext.getAttribute(WEBSOCKET_COMPONENTS_ATTRIBUTE);
+        if (components == null)
+        {
+            components = new WebSocketServerComponents();
+            servletContext.setAttribute(WEBSOCKET_COMPONENTS_ATTRIBUTE, components);
+        }
+
+        return components;
+    }
+}
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/WebSocketUpgradeHandler.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
similarity index 93%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
index 1a0d84c1c5be..77259143103b 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
+++ b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/AbstractHandshaker.java
@@ -34,6 +34,7 @@
 import org.eclipse.jetty.server.HttpTransport;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.util.thread.Scheduler;
 import org.eclipse.jetty.websocket.core.Behavior;
 import org.eclipse.jetty.websocket.core.Configuration;
@@ -132,7 +133,7 @@ public boolean upgradeRequest(WebSocketNegotiator negotiator, HttpServletRequest
         Negotiated negotiated = new Negotiated(baseRequest.getHttpURI().toURI(), protocol, baseRequest.isSecure(), extensionStack, WebSocketConstants.SPEC_VERSION_STRING);
 
         // Create the Session
-        WebSocketCoreSession coreSession = newWebSocketCoreSession(handler, negotiated, components);
+        WebSocketCoreSession coreSession = newWebSocketCoreSession(request, handler, negotiated, components);
         if (defaultCustomizer != null)
             defaultCustomizer.customize(coreSession);
         negotiator.customize(coreSession);
@@ -195,9 +196,20 @@ protected boolean validateNegotiation(Negotiation negotiation)
         return true;
     }
 
-    protected WebSocketCoreSession newWebSocketCoreSession(FrameHandler handler, Negotiated negotiated, WebSocketComponents components)
+    protected WebSocketCoreSession newWebSocketCoreSession(HttpServletRequest request, FrameHandler handler, Negotiated negotiated, WebSocketComponents components)
     {
-        return new WebSocketCoreSession(handler, Behavior.SERVER, negotiated, components);
+        final ContextHandler contextHandler = ContextHandler.getContextHandler(request.getServletContext());
+        return new WebSocketCoreSession(handler, Behavior.SERVER, negotiated, components)
+        {
+            @Override
+            protected void handle(Runnable runnable)
+            {
+                if (contextHandler != null)
+                    contextHandler.handle(runnable);
+                else
+                    runnable.run();
+            }
+        };
     }
 
     protected abstract WebSocketConnection createWebSocketConnection(Request baseRequest, WebSocketCoreSession coreSession);
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/HandshakerSelector.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Handshaker.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC6455Negotiation.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Handshaker.java
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java b/jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java
rename to jetty-websocket/websocket-core-server/src/main/java/org/eclipse/jetty/websocket/core/server/internal/RFC8441Negotiation.java
diff --git a/jetty-websocket/websocket-core/fuzzingclient.json b/jetty-websocket/websocket-core-tests/fuzzingclient.json
similarity index 100%
rename from jetty-websocket/websocket-core/fuzzingclient.json
rename to jetty-websocket/websocket-core-tests/fuzzingclient.json
diff --git a/jetty-websocket/websocket-core/fuzzingserver.json b/jetty-websocket/websocket-core-tests/fuzzingserver.json
similarity index 100%
rename from jetty-websocket/websocket-core/fuzzingserver.json
rename to jetty-websocket/websocket-core-tests/fuzzingserver.json
diff --git a/jetty-websocket/websocket-core/pom.xml b/jetty-websocket/websocket-core-tests/pom.xml
similarity index 77%
rename from jetty-websocket/websocket-core/pom.xml
rename to jetty-websocket/websocket-core-tests/pom.xml
index 2e976948002f..bc20aa11c92e 100644
--- a/jetty-websocket/websocket-core/pom.xml
+++ b/jetty-websocket/websocket-core-tests/pom.xml
@@ -7,60 +7,34 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>websocket-core</artifactId>
-  <name>Jetty :: Websocket :: Core</name>
+  <artifactId>websocket-core-tests</artifactId>
+  <name>Jetty :: Websocket :: Core :: Tests</name>
 
   <properties>
-    <bundle-symbolic-name>${project.groupId}.core</bundle-symbolic-name>
+    <bundle-symbolic-name>${project.groupId}.core.tests</bundle-symbolic-name>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-core-client</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-io</artifactId>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-core-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-http</artifactId>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-core-common</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-xml</artifactId>
-      <version>${project.version}</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-client</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-test-helper</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/AcceptHashTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AcceptHashTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/AcceptHashTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AcceptHashTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java
similarity index 95%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java
index 14a641f1cd76..da005f5ad697 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CapturedHexPayloads.java
@@ -26,7 +26,7 @@
 
 public class CapturedHexPayloads implements OutgoingFrames
 {
-    private List<String> captured = new ArrayList<>();
+    private final List<String> captured = new ArrayList<>();
 
     @Override
     public void sendFrame(Frame frame, Callback callback, boolean batch)
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/CloseStatusTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CloseStatusTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/CloseStatusTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/CloseStatusTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/EchoFrameHandler.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java
similarity index 97%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java
index f787ae8fd894..e17524caaf92 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FlushTest.java
@@ -41,9 +41,9 @@
 public class FlushTest
 {
     private WebSocketServer server;
-    private TestFrameHandler serverHandler = new TestFrameHandler();
+    private final TestFrameHandler serverHandler = new TestFrameHandler();
     private WebSocketCoreClient client;
-    private WebSocketComponents components = new WebSocketComponents();
+    private final WebSocketComponents components = new WebSocketComponents();
 
     @BeforeEach
     public void startup() throws Exception
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java
similarity index 96%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java
index a891d6d932f6..9acce6884bd2 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/FrameBufferTest.java
@@ -40,9 +40,9 @@
 public class FrameBufferTest extends WebSocketTester
 {
     private WebSocketServer server;
-    private TestFrameHandler serverHandler = new TestFrameHandler();
+    private final TestFrameHandler serverHandler = new TestFrameHandler();
     private WebSocketCoreClient client;
-    private WebSocketComponents components = new WebSocketComponents();
+    private final WebSocketComponents components = new WebSocketComponents();
 
     @BeforeEach
     public void startup() throws Exception
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java
similarity index 97%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java
index af413ce7ea76..5d18c8027c9e 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorFrameFlagsTest.java
@@ -39,7 +39,7 @@
  */
 public class GeneratorFrameFlagsTest
 {
-    private static WebSocketComponents components = new WebSocketComponents();
+    private static final WebSocketComponents components = new WebSocketComponents();
     private WebSocketCoreSession coreSession;
 
     public static Stream<Arguments> data()
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java
similarity index 97%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java
index 449afdd7fd6b..3e8b523c881d 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorParserRoundTripTest.java
@@ -33,7 +33,7 @@
 
 public class GeneratorParserRoundTripTest
 {
-    private ByteBufferPool bufferPool = new MappedByteBufferPool();
+    private final ByteBufferPool bufferPool = new MappedByteBufferPool();
 
     @Test
     public void testParserAndGenerator() throws Exception
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java
similarity index 99%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java
index 5456640b22ee..d03da52f3e46 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/GeneratorTest.java
@@ -47,9 +47,9 @@ public class GeneratorTest
 {
     private static final Logger LOG = LoggerFactory.getLogger(Helper.class);
 
-    private static Generator generator = new Generator();
-    private static WebSocketCoreSession coreSession = newWebSocketCoreSession(Behavior.SERVER);
-    private static WebSocketComponents components = new WebSocketComponents();
+    private static final Generator generator = new Generator();
+    private static final WebSocketCoreSession coreSession = newWebSocketCoreSession(Behavior.SERVER);
+    private static final WebSocketComponents components = new WebSocketComponents();
 
     private static WebSocketCoreSession newWebSocketCoreSession(Behavior behavior)
     {
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/IncomingFramesCapture.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/IncomingFramesCapture.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/IncomingFramesCapture.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/IncomingFramesCapture.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java
similarity index 99%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java
index e48d38d58a7c..fc14e360b83a 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/MessageHandlerTest.java
@@ -65,7 +65,7 @@ public void beforeEach() throws Exception
 
         coreSession = new CoreSession.Empty()
         {
-            private ByteBufferPool byteBufferPool = new MappedByteBufferPool();
+            private final ByteBufferPool byteBufferPool = new MappedByteBufferPool();
 
             @Override
             public void sendFrame(Frame frame, Callback callback, boolean batch)
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/OpCodeTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OpCodeTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/OpCodeTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OpCodeTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/OutgoingFramesCapture.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingFramesCapture.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/OutgoingFramesCapture.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingFramesCapture.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java
similarity index 98%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java
index 1c067d2a157a..33561dda1f1c 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/OutgoingNetworkBytesCapture.java
@@ -38,7 +38,7 @@
 public class OutgoingNetworkBytesCapture implements OutgoingFrames
 {
     private final Generator generator;
-    private List<ByteBuffer> captured;
+    private final List<ByteBuffer> captured;
 
     public OutgoingNetworkBytesCapture(Generator generator)
     {
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParsePayloadLengthTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParsePayloadLengthTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParsePayloadLengthTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParsePayloadLengthTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java
similarity index 98%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java
index 6fe3e60b6c55..4dfc798e772e 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadCloseStatusCodesTest.java
@@ -65,7 +65,7 @@ public static Stream<Arguments> data()
         );
     }
 
-    private ByteBufferPool bufferPool = new MappedByteBufferPool();
+    private final ByteBufferPool bufferPool = new MappedByteBufferPool();
 
     @ParameterizedTest(name = "closeCode={0} {1}")
     @MethodSource("data")
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java
similarity index 98%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java
index a0dfcd2167a1..f06c8960e247 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserBadOpCodesTest.java
@@ -57,7 +57,7 @@ public static Stream<Arguments> data()
         );
     }
 
-    private ByteBufferPool bufferPool = new MappedByteBufferPool();
+    private final ByteBufferPool bufferPool = new MappedByteBufferPool();
 
     @ParameterizedTest(name = "opcode={0} {1}")
     @MethodSource("data")
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParserCapture.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserCapture.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParserCapture.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserCapture.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParserGoodCloseStatusCodesTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserGoodCloseStatusCodesTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParserGoodCloseStatusCodesTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserGoodCloseStatusCodesTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParserReservedBitTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserReservedBitTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParserReservedBitTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserReservedBitTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/ParserTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/RawFrameBuilder.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/RawFrameBuilder.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/RawFrameBuilder.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/RawFrameBuilder.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/SynchronousFrameHandler.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/SynchronousFrameHandler.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/SynchronousFrameHandler.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/SynchronousFrameHandler.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestAsyncFrameHandler.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestFrameHandler.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestMessageHandler.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestUpgradeHandler.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestUpgradeHandler.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestUpgradeHandler.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestUpgradeHandler.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketNegotiator.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketUpgradeHandler.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketUpgradeHandler.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketUpgradeHandler.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/TestWebSocketUpgradeHandler.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/Timeouts.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/Timeouts.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/Timeouts.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/Timeouts.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java
similarity index 99%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java
index bac1e2451d69..eeef7f56d4f4 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketCloseTest.java
@@ -58,7 +58,7 @@
  */
 public class WebSocketCloseTest extends WebSocketTester
 {
-    private static Logger LOG = LoggerFactory.getLogger(WebSocketCloseTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WebSocketCloseTest.class);
     private static final String WS_SCHEME = "ws";
     private static final String WSS_SCHEME = "wss";
 
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java
similarity index 98%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java
index 3ef42883dce8..6c75606b6ad7 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketFrameTest.java
@@ -32,7 +32,7 @@
 
 public class WebSocketFrameTest
 {
-    private Generator generator = new Generator();
+    private final Generator generator = new Generator();
 
     private ByteBuffer generateWholeFrame(Generator generator, Frame frame)
     {
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java
similarity index 99%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java
index 4cee6345c716..5fc140cb0b66 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java
@@ -76,7 +76,7 @@ public void onFrame(Frame frame)
 
     private WebSocketServer server;
     private WebSocketCoreClient client;
-    private WebSocketComponents components = new WebSocketComponents();
+    private final WebSocketComponents components = new WebSocketComponents();
 
     @BeforeEach
     public void startup() throws Exception
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java
similarity index 98%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java
index a96241d613d8..1b564a76448a 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketOpenTest.java
@@ -46,7 +46,7 @@
  */
 public class WebSocketOpenTest extends WebSocketTester
 {
-    private static Logger LOG = LoggerFactory.getLogger(WebSocketOpenTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WebSocketOpenTest.class);
 
     private WebSocketServer server;
     private DemandingAsyncFrameHandler serverHandler;
@@ -190,7 +190,7 @@ public void testAsyncOnOpen() throws Exception
 
     static class DemandingAsyncFrameHandler extends TestAsyncFrameHandler
     {
-        private BiFunction<CoreSession, Callback, Void> onOpen;
+        private final BiFunction<CoreSession, Callback, Void> onOpen;
 
         DemandingAsyncFrameHandler(BiFunction<CoreSession, Callback, Void> onOpen)
         {
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketServer.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java
similarity index 98%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java
index 8ea7da37f895..4eb84f8cc0aa 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketTester.java
@@ -44,7 +44,7 @@
 
 public class WebSocketTester
 {
-    private static String NON_RANDOM_KEY = Base64.getEncoder().encodeToString("0123456701234567".getBytes());
+    private static final String NON_RANDOM_KEY = Base64.getEncoder().encodeToString("0123456701234567".getBytes());
     private static SslContextFactory.Client sslContextFactory;
     protected ByteBufferPool bufferPool;
     protected ByteBuffer buffer;
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnFrameHandler.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnFrameHandler.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnFrameHandler.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/AutobahnFrameHandler.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java
similarity index 98%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java
index 79252a0c1a34..3e297e52127b 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnClient.java
@@ -138,9 +138,9 @@ public static void main(String[] args)
     }
 
     private static final Logger LOG = LoggerFactory.getLogger(CoreAutobahnClient.class);
-    private URI baseWebsocketUri;
-    private WebSocketCoreClient client;
-    private String userAgent;
+    private final URI baseWebsocketUri;
+    private final WebSocketCoreClient client;
+    private final String userAgent;
 
     public CoreAutobahnClient(String hostname, int port, String userAgent) throws Exception
     {
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/autobahn/CoreAutobahnServer.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java
similarity index 95%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java
index e5192c37dc3c..3734c4993246 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java
@@ -36,11 +36,11 @@
 
 public class ChatWebSocketClient
 {
-    private static Logger LOG = LoggerFactory.getLogger(ChatWebSocketClient.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ChatWebSocketClient.class);
 
-    private URI baseWebsocketUri;
-    private WebSocketCoreClient client;
-    private MessageHandler handler;
+    private final URI baseWebsocketUri;
+    private final WebSocketCoreClient client;
+    private final MessageHandler handler;
     private String name = String.format("unknown@%x", ThreadLocalRandom.current().nextInt());
 
     public ChatWebSocketClient(String hostname, int port) throws Exception
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java
similarity index 98%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java
index 493946f21835..fee181609553 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketServer.java
@@ -45,7 +45,7 @@
 
 public class ChatWebSocketServer
 {
-    private Set<MessageHandler> members = new HashSet<>();
+    private final Set<MessageHandler> members = new HashSet<>();
 
     private FrameHandler negotiate(Negotiation negotiation)
     {
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java
similarity index 98%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java
index 8a4260cad67a..3a4dc6741a4e 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/client/WebSocketClientServerTest.java
@@ -45,7 +45,7 @@
  */
 public class WebSocketClientServerTest
 {
-    private static Logger LOG = LoggerFactory.getLogger(WebSocketClientServerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WebSocketClientServerTest.class);
 
     private WebSocketServer server;
     private TestFrameHandler serverHandler;
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/AbstractExtensionTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/AbstractExtensionTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/AbstractExtensionTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/AbstractExtensionTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionConfigTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionConfigTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionConfigTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionConfigTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionStackTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java
similarity index 97%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java
index c8d080b0a134..1f5d2826da48 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ExtensionTool.java
@@ -51,11 +51,11 @@ public class ExtensionTool
 {
     public class Tester
     {
-        private String requestedExtParams;
-        private ExtensionConfig extConfig;
+        private final String requestedExtParams;
+        private final ExtensionConfig extConfig;
         private Extension ext;
-        private Parser parser;
-        private IncomingFramesCapture capture;
+        private final Parser parser;
+        private final IncomingFramesCapture capture;
 
         private Tester(String parameterizedExtension)
         {
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/FragmentExtensionTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/IdentityExtensionTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflateExtensionTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflateExtensionTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflateExtensionTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflateExtensionTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java
similarity index 98%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java
index 8d3a40bae68e..5f28a82b5444 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java
@@ -53,8 +53,8 @@
 public class PerMessageDeflaterBufferSizeTest
 {
     private WebSocketServer server;
-    private TestFrameHandler serverHandler = new TestFrameHandler();
-    private TestNegotiator testNegotiator = new TestNegotiator();
+    private final TestFrameHandler serverHandler = new TestFrameHandler();
+    private final TestNegotiator testNegotiator = new TestNegotiator();
     private URI serverUri;
 
     private WebSocketCoreClient client;
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/extensions/ValidationExtensionTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java
similarity index 99%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java
index 2e376571e18c..35f034d244cd 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/FrameFlusherTest.java
@@ -57,7 +57,7 @@
 
 public class FrameFlusherTest
 {
-    private ByteBufferPool bufferPool = new MappedByteBufferPool();
+    private final ByteBufferPool bufferPool = new MappedByteBufferPool();
     private Scheduler scheduler;
 
     @BeforeEach
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/internal/MockEndpoint.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java
similarity index 99%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java
index 5d6944e0bdc6..6af276077e18 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxy.java
@@ -51,8 +51,8 @@ enum State
     }
 
     private final Object lock = new Object();
-    private WebSocketCoreClient client;
-    private URI serverUri;
+    private final WebSocketCoreClient client;
+    private final URI serverUri;
 
     public Client2Proxy client2Proxy = new Client2Proxy();
     public Server2Proxy server2Proxy = new Server2Proxy();
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/proxy/WebSocketProxyTest.java
diff --git a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java
similarity index 99%
rename from jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java
rename to jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java
index 66f235de234b..d46db6e37f0b 100644
--- a/jetty-websocket/websocket-core/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java
+++ b/jetty-websocket/websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/server/WebSocketServerTest.java
@@ -53,7 +53,7 @@
  */
 public class WebSocketServerTest extends WebSocketTester
 {
-    private static Logger LOG = LoggerFactory.getLogger(WebSocketServerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WebSocketServerTest.class);
 
     private WebSocketServer server;
 
diff --git a/jetty-websocket/websocket-core/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-core-tests/src/test/resources/jetty-logging.properties
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/resources/jetty-logging.properties
rename to jetty-websocket/websocket-core-tests/src/test/resources/jetty-logging.properties
diff --git a/jetty-websocket/websocket-core/src/test/resources/keystore.p12 b/jetty-websocket/websocket-core-tests/src/test/resources/keystore.p12
similarity index 100%
rename from jetty-websocket/websocket-core/src/test/resources/keystore.p12
rename to jetty-websocket/websocket-core-tests/src/test/resources/keystore.p12
diff --git a/jetty-websocket/websocket-javax-client/pom.xml b/jetty-websocket/websocket-javax-client/pom.xml
index b2fa1cd48aa0..3d3f594e7239 100644
--- a/jetty-websocket/websocket-javax-client/pom.xml
+++ b/jetty-websocket/websocket-javax-client/pom.xml
@@ -15,6 +15,15 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-javax-websocket-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-javax-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-util</artifactId>
@@ -22,7 +31,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-javax-common</artifactId>
+      <artifactId>websocket-core-client</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -30,21 +39,12 @@
       <artifactId>jetty-client</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-javax-websocket-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-xml</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-test-helper</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/jetty-websocket/websocket-javax-client/src/main/java/module-info.java b/jetty-websocket/websocket-javax-client/src/main/java/module-info.java
index eb58cdef38e6..362a4a64ac53 100644
--- a/jetty-websocket/websocket-javax-client/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-javax-client/src/main/java/module-info.java
@@ -25,9 +25,10 @@
     exports org.eclipse.jetty.websocket.javax.client;
     exports org.eclipse.jetty.websocket.javax.client.internal to org.eclipse.jetty.websocket.javax.server;
 
-    requires transitive jetty.websocket.api;
-    requires transitive org.eclipse.jetty.client;
+    requires org.eclipse.jetty.client;
+    requires org.eclipse.jetty.websocket.core.client;
     requires org.eclipse.jetty.websocket.javax.common;
+    requires transitive jetty.websocket.api;
 
     provides ContainerProvider with JavaxWebSocketClientContainerProvider;
 }
diff --git a/jetty-websocket/websocket-javax-common/pom.xml b/jetty-websocket/websocket-javax-common/pom.xml
index d606965d46cd..5788cfeb68a8 100644
--- a/jetty-websocket/websocket-javax-common/pom.xml
+++ b/jetty-websocket/websocket-javax-common/pom.xml
@@ -67,9 +67,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-core</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-javax-websocket-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
@@ -77,8 +76,9 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-javax-websocket-api</artifactId>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-core-client</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -89,10 +89,5 @@
       <artifactId>jetty-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-test-helper</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java b/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
index 08b85dda8626..97397c3d70ef 100644
--- a/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-javax-common/src/main/java/module-info.java
@@ -23,10 +23,8 @@
     exports org.eclipse.jetty.websocket.javax.common.encoders;
     exports org.eclipse.jetty.websocket.javax.common.messages;
 
+    requires org.slf4j;
     requires transitive jetty.websocket.api;
-    requires transitive org.eclipse.jetty.http;
-    requires transitive org.eclipse.jetty.io;
-    requires transitive org.eclipse.jetty.websocket.core;
+    requires transitive org.eclipse.jetty.websocket.core.client;
     requires transitive org.eclipse.jetty.websocket.util;
-    requires org.slf4j;
 }
diff --git a/jetty-websocket/websocket-javax-server/pom.xml b/jetty-websocket/websocket-javax-server/pom.xml
index d629de148783..e543c2dc12c0 100644
--- a/jetty-websocket/websocket-javax-server/pom.xml
+++ b/jetty-websocket/websocket-javax-server/pom.xml
@@ -43,11 +43,6 @@
       <artifactId>jetty-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-test-helper</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod b/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod
index d46554bdfafc..bb9bd0b26c57 100644
--- a/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod
+++ b/jetty-websocket/websocket-javax-server/src/main/config/modules/websocket-javax.mod
@@ -11,7 +11,9 @@ client
 annotations
 
 [lib]
-lib/websocket/websocket-core-${jetty.version}.jar
+lib/websocket/websocket-core-common-${jetty.version}.jar
+lib/websocket/websocket-core-client-${jetty.version}.jar
+lib/websocket/websocket-core-server-${jetty.version}.jar
 lib/websocket/websocket-util-${jetty.version}.jar
 lib/websocket/websocket-util-server-${jetty.version}.jar
 lib/websocket/jetty-javax-websocket-api-1.1.2.jar
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java b/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
index af5c88bbdd4c..c4ad6598d80f 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/module-info.java
@@ -28,11 +28,11 @@
 {
     exports org.eclipse.jetty.websocket.javax.server.config;
 
-    requires transitive org.eclipse.jetty.webapp;
-    requires transitive org.eclipse.jetty.websocket.javax.client;
     requires org.eclipse.jetty.websocket.javax.common;
     requires org.eclipse.jetty.websocket.util.server;
     requires org.slf4j;
+    requires transitive org.eclipse.jetty.webapp;
+    requires transitive org.eclipse.jetty.websocket.javax.client;
 
     provides ServletContainerInitializer with JavaxWebSocketServletContainerInitializer;
     provides ServerEndpointConfig.Configurator with ContainerDefaultConfigurator;
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java
index 87739c6a4349..af4cca34fe31 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketServletContainerInitializer.java
@@ -37,6 +37,7 @@
 import org.eclipse.jetty.util.TypeUtil;
 import org.eclipse.jetty.util.thread.ThreadClassLoaderScope;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
+import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
 import org.eclipse.jetty.websocket.javax.server.internal.JavaxWebSocketServerContainer;
 import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
 import org.eclipse.jetty.websocket.util.server.internal.WebSocketMapping;
@@ -70,20 +71,14 @@ private static Boolean isEnabledViaContext(ServletContext context, String keyNam
         String cp = context.getInitParameter(keyName);
         if (cp != null)
         {
-            if (TypeUtil.isTrue(cp))
-                return true;
-            else
-                return false;
+            return TypeUtil.isTrue(cp);
         }
 
         // Next, try attribute on context
         Object enable = context.getAttribute(keyName);
         if (enable != null)
         {
-            if (TypeUtil.isTrue(enable))
-                return true;
-            else
-                return false;
+            return TypeUtil.isTrue(enable);
         }
 
         return null;
@@ -153,7 +148,7 @@ private static ServerContainer initialize(ServletContextHandler context)
         JavaxWebSocketServerContainer serverContainer = JavaxWebSocketServerContainer.getContainer(context.getServletContext());
         if (serverContainer == null)
         {
-            WebSocketComponents components = WebSocketComponents.ensureWebSocketComponents(context.getServletContext());
+            WebSocketComponents components = WebSocketServerComponents.ensureWebSocketComponents(context.getServletContext());
             FilterHolder filterHolder = WebSocketUpgradeFilter.ensureFilter(context.getServletContext());
             WebSocketMapping mapping = WebSocketMapping.ensureMapping(context.getServletContext(), WebSocketMapping.DEFAULT_KEY);
             serverContainer = JavaxWebSocketServerContainer.ensureContainer(context.getServletContext());
diff --git a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
index 35a5ba4a86c6..59f211b5f2e5 100644
--- a/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
+++ b/jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/internal/JavaxWebSocketServerContainer.java
@@ -37,6 +37,7 @@
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
+import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
 import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer;
 import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
 import org.eclipse.jetty.websocket.util.server.internal.WebSocketMapping;
@@ -95,7 +96,7 @@ public static JavaxWebSocketServerContainer ensureContainer(ServletContext servl
             // Create the Jetty ServerContainer implementation
             container = new JavaxWebSocketServerContainer(
                 WebSocketMapping.ensureMapping(servletContext, WebSocketMapping.DEFAULT_KEY),
-                WebSocketComponents.ensureWebSocketComponents(servletContext),
+                WebSocketServerComponents.ensureWebSocketComponents(servletContext),
                 coreClientSupplier);
             contextHandler.addManaged(container);
             contextHandler.addEventListener(container);
diff --git a/jetty-websocket/websocket-jetty-api/pom.xml b/jetty-websocket/websocket-jetty-api/pom.xml
index 5f7a34e1f77b..15edf958083d 100644
--- a/jetty-websocket/websocket-jetty-api/pom.xml
+++ b/jetty-websocket/websocket-jetty-api/pom.xml
@@ -14,14 +14,6 @@
     <bundle-symbolic-name>${project.groupId}.api</bundle-symbolic-name>
   </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-test-helper</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
   <build>
     <plugins>
       <plugin>
diff --git a/jetty-websocket/websocket-jetty-client/pom.xml b/jetty-websocket/websocket-jetty-client/pom.xml
index ad9d334d39f0..cc3c39db8324 100644
--- a/jetty-websocket/websocket-jetty-client/pom.xml
+++ b/jetty-websocket/websocket-jetty-client/pom.xml
@@ -25,6 +25,11 @@
       <artifactId>websocket-jetty-common</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-core-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
@@ -39,11 +44,6 @@
       <artifactId>jetty-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-test-helper</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/jetty-websocket/websocket-jetty-client/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-client/src/main/java/module-info.java
index aa113d80a627..27c6f8600c36 100644
--- a/jetty-websocket/websocket-jetty-client/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jetty-client/src/main/java/module-info.java
@@ -20,9 +20,9 @@
 {
     exports org.eclipse.jetty.websocket.client;
 
-    requires transitive org.eclipse.jetty.client;
-    requires transitive org.eclipse.jetty.websocket.jetty.api;
-    requires org.eclipse.jetty.websocket.core;
+    requires org.eclipse.jetty.websocket.core.client;
     requires org.eclipse.jetty.websocket.jetty.common;
     requires org.slf4j;
+    requires transitive org.eclipse.jetty.client;
+    requires transitive org.eclipse.jetty.websocket.jetty.api;
 }
diff --git a/jetty-websocket/websocket-jetty-common/pom.xml b/jetty-websocket/websocket-jetty-common/pom.xml
index 83c726eb91dd..b3809d06724e 100644
--- a/jetty-websocket/websocket-jetty-common/pom.xml
+++ b/jetty-websocket/websocket-jetty-common/pom.xml
@@ -51,39 +51,10 @@
       <artifactId>websocket-jetty-api</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-util</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-io</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-slf4j-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-test-helper</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java b/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
index 3b652531aab1..4bac66d7684a 100644
--- a/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-jetty-common/src/main/java/module-info.java
@@ -23,10 +23,11 @@
 {
     exports org.eclipse.jetty.websocket.common;
 
-    requires transitive org.eclipse.jetty.websocket.core;
+    requires org.eclipse.jetty.util;
+    requires org.slf4j;
+    requires transitive org.eclipse.jetty.websocket.core.common;
     requires transitive org.eclipse.jetty.websocket.jetty.api;
     requires transitive org.eclipse.jetty.websocket.util;
-    requires org.slf4j;
 
     provides ExtensionConfig.Parser with ExtensionConfigParser;
 }
diff --git a/jetty-websocket/websocket-jetty-server/pom.xml b/jetty-websocket/websocket-jetty-server/pom.xml
index ade9576c6e75..0387a72b773d 100644
--- a/jetty-websocket/websocket-jetty-server/pom.xml
+++ b/jetty-websocket/websocket-jetty-server/pom.xml
@@ -16,44 +16,39 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-jetty-api</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-annotations</artifactId>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-jetty-common</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-util-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-jmx</artifactId>
-      <version>${project.version}</version>
-      <optional>true</optional>
+      <groupId>org.eclipse.jetty.toolchain</groupId>
+      <artifactId>jetty-servlet-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-jetty-api</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-jetty-common</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-annotations</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-util-server</artifactId>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jmx</artifactId>
       <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-servlet-api</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -64,11 +59,6 @@
       <artifactId>jetty-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-test-helper</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod b/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod
index 9a93574f2bf5..0dae0b934d1c 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod
+++ b/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod
@@ -11,7 +11,9 @@ client
 annotations
 
 [lib]
-lib/websocket/websocket-core-${jetty.version}.jar
+lib/websocket/websocket-core-common-${jetty.version}.jar
+lib/websocket/websocket-core-client-${jetty.version}.jar
+lib/websocket/websocket-core-server-${jetty.version}.jar
 lib/websocket/websocket-util-${jetty.version}.jar
 lib/websocket/websocket-util-server-${jetty.version}.jar
 lib/websocket/websocket-jetty-api-${jetty.version}.jar
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
index 06a614efec25..bc6c85030e86 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServerContainer.java
@@ -39,6 +39,7 @@
 import org.eclipse.jetty.websocket.core.Configuration;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
 import org.eclipse.jetty.websocket.core.exception.WebSocketException;
+import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
 import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
 import org.eclipse.jetty.websocket.server.internal.JettyServerFrameHandlerFactory;
 import org.eclipse.jetty.websocket.util.server.internal.FrameHandlerFactory;
@@ -73,7 +74,7 @@ public static JettyWebSocketServerContainer ensureContainer(ServletContext servl
             container = new JettyWebSocketServerContainer(
                 contextHandler,
                 WebSocketMapping.ensureMapping(servletContext, WebSocketMapping.DEFAULT_KEY),
-                WebSocketComponents.ensureWebSocketComponents(servletContext), executor);
+                WebSocketServerComponents.ensureWebSocketComponents(servletContext), executor);
             servletContext.setAttribute(JETTY_WEBSOCKET_CONTAINER_ATTRIBUTE, container);
             contextHandler.addManaged(container);
             contextHandler.addEventListener(container);
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
index 448694577c50..be184470323d 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/JettyWebSocketServlet.java
@@ -31,6 +31,7 @@
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.websocket.core.Configuration;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
+import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
 import org.eclipse.jetty.websocket.server.internal.JettyServerFrameHandlerFactory;
 import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
 import org.eclipse.jetty.websocket.util.server.internal.FrameHandlerFactory;
@@ -129,7 +130,7 @@ public void init() throws ServletException
         {
             ServletContext servletContext = getServletContext();
 
-            components = WebSocketComponents.ensureWebSocketComponents(servletContext);
+            components = WebSocketServerComponents.ensureWebSocketComponents(servletContext);
             mapping = new WebSocketMapping(components);
 
             String max = getInitParameter("idleTimeout");
@@ -262,7 +263,7 @@ public boolean removeMapping(String pathSpec)
 
     private static class WrappedJettyCreator implements WebSocketCreator
     {
-        private JettyWebSocketCreator creator;
+        private final JettyWebSocketCreator creator;
 
         private WrappedJettyCreator(JettyWebSocketCreator creator)
         {
diff --git a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java
index 43b65eafd163..3b164c017f8f 100644
--- a/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java
+++ b/jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketServletContainerInitializer.java
@@ -26,6 +26,7 @@
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.listener.ContainerInitializer;
 import org.eclipse.jetty.websocket.core.WebSocketComponents;
+import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
 import org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer;
 import org.eclipse.jetty.websocket.util.server.WebSocketUpgradeFilter;
 import org.eclipse.jetty.websocket.util.server.internal.WebSocketMapping;
@@ -89,7 +90,7 @@ public static void configure(ServletContextHandler context, Configurator configu
      */
     private static JettyWebSocketServerContainer initialize(ServletContextHandler context)
     {
-        WebSocketComponents components = WebSocketComponents.ensureWebSocketComponents(context.getServletContext());
+        WebSocketComponents components = WebSocketServerComponents.ensureWebSocketComponents(context.getServletContext());
         FilterHolder filterHolder = WebSocketUpgradeFilter.ensureFilter(context.getServletContext());
         WebSocketMapping mapping = WebSocketMapping.ensureMapping(context.getServletContext(), WebSocketMapping.DEFAULT_KEY);
         JettyWebSocketServerContainer container = JettyWebSocketServerContainer.ensureContainer(context.getServletContext());
diff --git a/jetty-websocket/websocket-util-server/pom.xml b/jetty-websocket/websocket-util-server/pom.xml
index c8b502737998..3fd5fc74a48d 100644
--- a/jetty-websocket/websocket-util-server/pom.xml
+++ b/jetty-websocket/websocket-util-server/pom.xml
@@ -66,7 +66,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-core</artifactId>
+      <artifactId>websocket-core-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/jetty-websocket/websocket-util-server/src/main/java/module-info.java b/jetty-websocket/websocket-util-server/src/main/java/module-info.java
index ae57cc588942..c067bea8bf3b 100644
--- a/jetty-websocket/websocket-util-server/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-util-server/src/main/java/module-info.java
@@ -23,5 +23,5 @@
     
     requires org.slf4j;
     requires transitive org.eclipse.jetty.servlet;
-    requires transitive org.eclipse.jetty.websocket.core;
+    requires transitive org.eclipse.jetty.websocket.core.server;
 }
diff --git a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/WebSocketUpgradeFilter.java b/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/WebSocketUpgradeFilter.java
index b0a9c030e901..5a64fc85ef07 100644
--- a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/WebSocketUpgradeFilter.java
+++ b/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/WebSocketUpgradeFilter.java
@@ -38,7 +38,7 @@
 import org.eclipse.jetty.util.annotation.ManagedObject;
 import org.eclipse.jetty.util.component.Dumpable;
 import org.eclipse.jetty.websocket.core.Configuration;
-import org.eclipse.jetty.websocket.core.WebSocketComponents;
+import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
 import org.eclipse.jetty.websocket.util.server.internal.WebSocketMapping;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -168,7 +168,7 @@ public void init(FilterConfig config) throws ServletException
         if (mappingKey != null)
             mapping = WebSocketMapping.ensureMapping(context, mappingKey);
         else
-            mapping = new WebSocketMapping(WebSocketComponents.ensureWebSocketComponents(context));
+            mapping = new WebSocketMapping(WebSocketServerComponents.ensureWebSocketComponents(context));
 
         String max = config.getInitParameter("idleTimeout");
         if (max == null)
diff --git a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/WebSocketMapping.java b/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/WebSocketMapping.java
index a96a55d315c2..d76cbd53e9fe 100644
--- a/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/WebSocketMapping.java
+++ b/jetty-websocket/websocket-util-server/src/main/java/org/eclipse/jetty/websocket/util/server/internal/WebSocketMapping.java
@@ -42,6 +42,7 @@
 import org.eclipse.jetty.websocket.core.server.Handshaker;
 import org.eclipse.jetty.websocket.core.server.Negotiation;
 import org.eclipse.jetty.websocket.core.server.WebSocketNegotiator;
+import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -65,7 +66,7 @@ public static WebSocketMapping getMapping(ServletContext servletContext, String
 
         if (mappingObject != null)
         {
-            if (WebSocketMapping.class.isInstance(mappingObject))
+            if (mappingObject instanceof WebSocketMapping)
                 return (WebSocketMapping)mappingObject;
             else
                 throw new IllegalStateException(
@@ -88,7 +89,7 @@ public static WebSocketMapping ensureMapping(ServletContext servletContext, Stri
 
         if (mapping == null)
         {
-            mapping = new WebSocketMapping(WebSocketComponents.ensureWebSocketComponents(servletContext));
+            mapping = new WebSocketMapping(WebSocketServerComponents.ensureWebSocketComponents(servletContext));
             servletContext.setAttribute(mappingKey, mapping);
         }
 
diff --git a/jetty-websocket/websocket-util/pom.xml b/jetty-websocket/websocket-util/pom.xml
index 9412101ce9fe..cafdccef9492 100644
--- a/jetty-websocket/websocket-util/pom.xml
+++ b/jetty-websocket/websocket-util/pom.xml
@@ -48,7 +48,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-core</artifactId>
+      <artifactId>websocket-core-common</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
@@ -60,10 +60,5 @@
       <artifactId>jetty-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-test-helper</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/jetty-websocket/websocket-util/src/main/java/module-info.java b/jetty-websocket/websocket-util/src/main/java/module-info.java
index 183e1fd2715f..22dafa0caea3 100644
--- a/jetty-websocket/websocket-util/src/main/java/module-info.java
+++ b/jetty-websocket/websocket-util/src/main/java/module-info.java
@@ -21,6 +21,8 @@
     exports org.eclipse.jetty.websocket.util;
     exports org.eclipse.jetty.websocket.util.messages;
 
+    requires org.eclipse.jetty.util;
     requires org.slf4j;
-    requires transitive org.eclipse.jetty.websocket.core;
+    requires org.eclipse.jetty.io;
+    requires transitive org.eclipse.jetty.websocket.core.common;
 }

From 8b489806b66197481b5747c73bf01ff0787cb529 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 12 May 2020 17:00:30 +1000
Subject: [PATCH 2/3] Fix osgi issues in websocket-core-common

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 jetty-websocket/websocket-core-common/pom.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/jetty-websocket/websocket-core-common/pom.xml b/jetty-websocket/websocket-core-common/pom.xml
index 4290b2ffb5db..91cfb795f073 100644
--- a/jetty-websocket/websocket-core-common/pom.xml
+++ b/jetty-websocket/websocket-core-common/pom.xml
@@ -75,6 +75,24 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <id>generate-manifest</id>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <configuration>
+              <instructions>
+                <Export-Package>*,org.eclipse.jetty.websocket.core.common.internal.*</Export-Package>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

From dacd5e7e368fa7e74135afbbdebe99258b3b88b6 Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Thu, 14 May 2020 16:02:21 +1000
Subject: [PATCH 3/3] fix websocket-core-test pom.xml file

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 jetty-websocket/websocket-core-tests/pom.xml | 52 +++++---------------
 1 file changed, 13 insertions(+), 39 deletions(-)

diff --git a/jetty-websocket/websocket-core-tests/pom.xml b/jetty-websocket/websocket-core-tests/pom.xml
index bc20aa11c92e..f24b3607818d 100644
--- a/jetty-websocket/websocket-core-tests/pom.xml
+++ b/jetty-websocket/websocket-core-tests/pom.xml
@@ -41,45 +41,19 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>ban-ws-apis</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <bannedDependencies>
-                  <includes>
-                    <include>org.eclipse.jetty.websocket:websocket-jetty-api</include>
-                    <include>javax.websocket</include>
-                  </includes>
-                </bannedDependencies>
-              </rules>
-            </configuration>
-          </execution>
-          <execution>
-            <id>ban-java-servlet-api</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <bannedDependencies>
-                  <includes>
-                    <include>javax.servlet</include>
-                    <include>servletapi</include>
-                    <include>org.eclipse.jetty.orbit:javax.servlet</include>
-                    <include>org.mortbay.jetty:servlet-api</include>
-                    <include>jetty:servlet-api</include>
-                    <include>jetty-servlet-api</include>
-                  </includes>
-                </bannedDependencies>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <!-- No point deploying testing projects -->
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <!-- No point building javadoc on testing projects -->
+          <skip>true</skip>
+        </configuration>
       </plugin>
     </plugins>
   </build>