Issue #4722 - changes from review

- Fix packages exposed in the websocket configuration
- Make servlet dependency for websocket-util optional

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

jetty-websocket/websocket-javax-server/src/main/java/org/eclipse/jetty/websocket/javax/server/config/JavaxWebSocketConfiguration.java

@@ -40,6 +40,7 @@ public JavaxWebSocketConfiguration()
         protectAndExpose("org.eclipse.jetty.websocket.util.server."); // For WebSocketUpgradeFilter
         protectAndExpose("org.eclipse.jetty.websocket.javax.server.config.");
         protectAndExpose("org.eclipse.jetty.websocket.javax.client.JavaxWebSocketClientContainerProvider");
-        hide("org.eclipse.jetty.websocket.javax.server.internal");
+        hide("org.eclipse.jetty.websocket.javax.server.internal.",
+            "org.eclipse.jetty.websocket.util.server.internal.");
     }
 }

jetty-websocket/websocket-jetty-server/src/main/java/org/eclipse/jetty/websocket/server/config/JettyWebSocketConfiguration.java

@@ -58,10 +58,12 @@ else if (isAvailable("org.eclipse.jetty.annotations.AnnotationConfiguration"))
 
         protectAndExpose(
             "org.eclipse.jetty.websocket.api.",
-            "org.eclipse.jetty.websocket.server.");
+            "org.eclipse.jetty.websocket.server.",
+            "org.eclipse.jetty.websocket.util.server."); // For WebSocketUpgradeFilter
 
         hide("org.eclipse.jetty.server.internal.",
-            "org.eclipse.jetty.server.config.");
+            "org.eclipse.jetty.server.config.",
+            "org.eclipse.jetty.websocket.util.server.internal.");
     }
 
     @Override

jetty-websocket/websocket-util/pom.xml

@@ -55,6 +55,7 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
       <version>${project.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>