Jetty 12 module renaming - jetty-websocket.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

jetty-bom/pom.xml

@@ -449,17 +449,17 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>websocket-core-common</artifactId>
+        <artifactId>jetty-websocket-core-common</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>websocket-core-client</artifactId>
+        <artifactId>jetty-websocket-core-client</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>websocket-core-server</artifactId>
+        <artifactId>jetty-websocket-core-server</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>

jetty-core/jetty-bom/pom.xml

@@ -315,17 +315,17 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>websocket-core-common</artifactId>
+        <artifactId>jetty-websocket-core-common</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>websocket-core-client</artifactId>
+        <artifactId>jetty-websocket-core-client</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.websocket</groupId>
-        <artifactId>websocket-core-server</artifactId>
+        <artifactId>jetty-websocket-core-server</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>

jetty-core/jetty-websocket/jetty-websocket-core-client/pom.xml

@@ -2,12 +2,12 @@
 <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</artifactId>
+    <artifactId>jetty-websocket</artifactId>
     <version>12.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>websocket-core-client</artifactId>
+  <artifactId>jetty-websocket-core-client</artifactId>
   <name>Jetty Core :: Websocket :: Core :: Client</name>
 
   <properties>
@@ -17,7 +17,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-core-common</artifactId>
+      <artifactId>jetty-websocket-core-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/internal/XmlHttpClientProvider.java

@@ -16,7 +16,6 @@ package org.eclipse.jetty.websocket.core.client.internal;
 import java.net.URL;
 
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.resource.ResourceFactory;
 import org.eclipse.jetty.xml.XmlConfiguration;
 import org.slf4j.Logger;

jetty-core/jetty-websocket/jetty-websocket-core-common/pom.xml

@@ -2,12 +2,12 @@
 <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</artifactId>
+    <artifactId>jetty-websocket</artifactId>
     <version>12.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>websocket-core-common</artifactId>
+  <artifactId>jetty-websocket-core-common</artifactId>
   <name>Jetty Core :: Websocket :: Core :: Common</name>
 
   <properties>

jetty-core/jetty-websocket/jetty-websocket-core-server/pom.xml

@@ -2,12 +2,12 @@
 <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</artifactId>
+    <artifactId>jetty-websocket</artifactId>
     <version>12.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>websocket-core-server</artifactId>
+  <artifactId>jetty-websocket-core-server</artifactId>
   <name>Jetty Core :: Websocket :: Core :: Server</name>
 
   <properties>
@@ -17,7 +17,7 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
-      <artifactId>websocket-core-common</artifactId>
+      <artifactId>jetty-websocket-core-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>