From 64655f7b7e049c0ed9dc6856d8e955f829fa027a Mon Sep 17 00:00:00 2001
From: Lachlan Roberts <lachlan@webtide.com>
Date: Tue, 3 Nov 2020 17:16:27 +1100
Subject: [PATCH] Issue #5320 - allow websocket client jars to be provided by
 server

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
---
 jetty-home/pom.xml                                    |  5 +++++
 .../src/main/config/modules/websocket.mod             | 11 -----------
 .../src/main/config/modules/websocket.mod             | 11 -----------
 .../src/main/config/modules/websocket-jetty.mod       |  1 +
 4 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 jetty-websocket/websocket-core-client/src/main/config/modules/websocket.mod
 delete mode 100644 jetty-websocket/websocket-core-common/src/main/config/modules/websocket.mod

diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index c9a6ef5207b7..c98483bed258 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -655,6 +655,11 @@
       <artifactId>websocket-jetty-server</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.websocket</groupId>
+      <artifactId>websocket-jetty-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-javax-server</artifactId>
diff --git a/jetty-websocket/websocket-core-client/src/main/config/modules/websocket.mod b/jetty-websocket/websocket-core-client/src/main/config/modules/websocket.mod
deleted file mode 100644
index bc693b7e3d1a..000000000000
--- a/jetty-websocket/websocket-core-client/src/main/config/modules/websocket.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-# DO NOT EDIT - See: https://www.eclipse.org/jetty/documentation/current/startup-modules.html
-
-[description]
-Enables both Jetty and javax websocket modules for deployed web applications.
-
-[tags]
-websocket
-
-[depend]
-websocket-jetty
-websocket-javax
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
deleted file mode 100644
index 97974ff6319e..000000000000
--- a/jetty-websocket/websocket-core-common/src/main/config/modules/websocket.mod
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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-jetty-server/src/main/config/modules/websocket-jetty.mod b/jetty-websocket/websocket-jetty-server/src/main/config/modules/websocket-jetty.mod
index 5c24a906fb5a..d2992fd2bac0 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
@@ -18,6 +18,7 @@ lib/websocket/websocket-util-${jetty.version}.jar
 lib/websocket/websocket-util-server-${jetty.version}.jar
 lib/websocket/websocket-jetty-api-${jetty.version}.jar
 lib/websocket/websocket-jetty-common-${jetty.version}.jar
+lib/websocket/websocket-jetty-client-${jetty.version}.jar
 lib/websocket/websocket-jetty-server-${jetty.version}.jar
 
 [jpms]