From 5095c8a7b2c66471c1ccd0e94fcdfefc6c6e7c5d Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 23 Jan 2019 15:58:11 -0600
Subject: [PATCH] Issue #3288 - Correcting Jetty WebSocket API artifactIds

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 examples/embedded/pom.xml                      |  2 +-
 jetty-bom/pom.xml                              | 18 ++++++++++++++----
 .../jetty-gcloud-session-manager/pom.xml       |  2 +-
 jetty-hazelcast/pom.xml                        |  2 +-
 jetty-home/pom.xml                             |  2 +-
 jetty-maven-plugin/pom.xml                     |  2 +-
 jetty-osgi/test-jetty-osgi/pom.xml             |  4 ++--
 jetty-runner/pom.xml                           |  2 +-
 jetty-websocket/jetty-websocket-client/pom.xml |  2 +-
 jetty-websocket/jetty-websocket-server/pom.xml |  2 +-
 tests/test-quickstart/pom.xml                  |  2 +-
 tests/test-webapps/test-jetty-webapp/pom.xml   |  2 +-
 12 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml
index d1981634ee4..b0f80b4d304 100644
--- a/examples/embedded/pom.xml
+++ b/examples/embedded/pom.xml
@@ -62,7 +62,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-server</artifactId>
+      <artifactId>jetty-websocket-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml
index a8c82d10c13..2ece3477aaf 100644
--- a/jetty-bom/pom.xml
+++ b/jetty-bom/pom.xml
@@ -326,22 +326,27 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>websocket-api</artifactId>
+        <artifactId>javax-websocket-common</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>websocket-client</artifactId>
+        <artifactId>jetty-websocket-api</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>websocket-common</artifactId>
+        <artifactId>jetty-websocket-client</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>websocket-server</artifactId>
+        <artifactId>jetty-websocket-common</artifactId>
+        <version>10.0.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.websocket</groupId>
+        <artifactId>jetty-websocket-server</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
@@ -349,6 +354,11 @@
         <artifactId>websocket-servlet</artifactId>
         <version>10.0.0-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.websocket</groupId>
+        <artifactId>websocket-core</artifactId>
+        <version>10.0.0-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-xml</artifactId>
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
index 4fa60b89ddc..999b127daab 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
+++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
@@ -67,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-server</artifactId>
+      <artifactId>jetty-websocket-server</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml
index 92b27e7cc7f..472482b7019 100644
--- a/jetty-hazelcast/pom.xml
+++ b/jetty-hazelcast/pom.xml
@@ -58,7 +58,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-server</artifactId>
+      <artifactId>jetty-websocket-server</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index c1a69624a14..a4ce39f8b48 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -590,7 +590,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-server</artifactId>
+      <artifactId>jetty-websocket-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
index 157f1f76ce4..48251c6eab0 100644
--- a/jetty-maven-plugin/pom.xml
+++ b/jetty-maven-plugin/pom.xml
@@ -227,7 +227,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-server</artifactId>
+      <artifactId>jetty-websocket-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 827936ceb9a..627f1821301 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -293,7 +293,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-client</artifactId>
+      <artifactId>jetty-websocket-client</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
@@ -311,7 +311,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-server</artifactId>
+      <artifactId>jetty-websocket-server</artifactId>
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml
index aac41008896..b4c53d531fb 100644
--- a/jetty-runner/pom.xml
+++ b/jetty-runner/pom.xml
@@ -125,7 +125,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-server</artifactId>
+      <artifactId>jetty-websocket-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/jetty-websocket/jetty-websocket-client/pom.xml b/jetty-websocket/jetty-websocket-client/pom.xml
index 80fee83092f..19e757f4cc0 100644
--- a/jetty-websocket/jetty-websocket-client/pom.xml
+++ b/jetty-websocket/jetty-websocket-client/pom.xml
@@ -9,7 +9,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>websocket-client</artifactId>
+  <artifactId>jetty-websocket-client</artifactId>
   <name>Jetty :: Websocket :: org.eclipse.jetty.websocket :: Client</name>
 
   <properties>
diff --git a/jetty-websocket/jetty-websocket-server/pom.xml b/jetty-websocket/jetty-websocket-server/pom.xml
index 25e78c9a424..4a4083a5362 100644
--- a/jetty-websocket/jetty-websocket-server/pom.xml
+++ b/jetty-websocket/jetty-websocket-server/pom.xml
@@ -9,7 +9,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>websocket-server</artifactId>
+  <artifactId>jetty-websocket-server</artifactId>
   <name>Jetty :: Websocket :: org.eclipse.jetty.websocket :: Server</name>
 
   <properties>
diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml
index 8a585a47bae..5d1a16abbf4 100644
--- a/tests/test-quickstart/pom.xml
+++ b/tests/test-quickstart/pom.xml
@@ -85,7 +85,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-server</artifactId>
+      <artifactId>jetty-websocket-server</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml
index d9e17110c43..acda95015cc 100644
--- a/tests/test-webapps/test-jetty-webapp/pom.xml
+++ b/tests/test-webapps/test-jetty-webapp/pom.xml
@@ -219,7 +219,7 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-server</artifactId>
+      <artifactId>jetty-websocket-server</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>