[cxf] branch 3.6.x-fixes updated: Update Jetty to 10.0.16 (#1415)

[reta]

This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
     new dee4fedb2c Update Jetty to 10.0.16 (#1415)
dee4fedb2c is described below

commit dee4fedb2caa9dc0bc0101d0b7165beddc4a03db
Author: Andriy Redko <drr...@gmail.com>
AuthorDate: Fri Sep 1 10:41:06 2023 -0400

    Update Jetty to 10.0.16 (#1415)
---
 distribution/src/main/release/samples/pom.xml                      | 2 +-
 parent/pom.xml                                                     | 2 +-
 .../transport/websocket/jetty10/Jetty10WebSocketDestination.java   | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index cdaee9bd4d..b51d671dca 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -32,7 +32,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <cxf.spring.boot.version>2.7.15</cxf.spring.boot.version>
         
<cxf.spring.cloud.eureka.version>3.1.7</cxf.spring.cloud.eureka.version>
-        <cxf.jetty10.version>10.0.15</cxf.jetty10.version>
+        <cxf.jetty10.version>10.0.16</cxf.jetty10.version>
         <cxf.netty.version>4.1.97.Final</cxf.netty.version>
         
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
         <cxf.swagger.ui.version>5.4.2</cxf.swagger.ui.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 68ff24d87f..3cd796a1a1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -152,7 +152,7 @@
         <cxf.jdom.version>1.0</cxf.jdom.version>
         <cxf.jettison.version>1.5.4</cxf.jettison.version>
         <cxf.jetty.osgi.version>[9.2,11)</cxf.jetty.osgi.version>
-        <cxf.jetty10.version>10.0.15</cxf.jetty10.version>
+        <cxf.jetty10.version>10.0.16</cxf.jetty10.version>
         <cxf.jetty9.version>9.4.51.v20230217</cxf.jetty9.version>
         <cxf.jetty.version>${cxf.jetty10.version}</cxf.jetty.version>
         <cxf.jexl.version>3.3</cxf.jexl.version>
diff --git 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty10/Jetty10WebSocketDestination.java
 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty10/Jetty10WebSocketDestination.java
index 0e847597b0..8a444a6b01 100644
--- 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty10/Jetty10WebSocketDestination.java
+++ 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty10/Jetty10WebSocketDestination.java
@@ -57,9 +57,11 @@ import org.apache.cxf.workqueue.WorkQueueManager;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.UpgradeRequest;
 import org.eclipse.jetty.websocket.api.WebSocketAdapter;
+import org.eclipse.jetty.websocket.core.server.WebSocketServerComponents;
 import org.eclipse.jetty.websocket.server.JettyServerUpgradeRequest;
 import org.eclipse.jetty.websocket.server.JettyServerUpgradeResponse;
 import org.eclipse.jetty.websocket.server.JettyWebSocketCreator;
@@ -115,6 +117,11 @@ public class Jetty10WebSocketDestination extends 
JettyHTTPDestination implements
         if (webSocketServerContainer == null) {
             webSocketServerContainer = 
JettyWebSocketServerContainer.getContainer(context);
             if (webSocketServerContainer == null) {
+                final ServletContextHandler handler = 
ServletContextHandler.getServletContextHandler(
+                    servletContext, "Javax Websocket");
+                if (handler != null && handler.getServer() != null) {
+                    
WebSocketServerComponents.ensureWebSocketComponents(handler.getServer(), 
context);
+                }
                 webSocketServerContainer = 
JettyWebSocketServerContainer.ensureContainer(context);
             }
             return webSocketServerContainer;