Skip to content

Commit b318c26

Browse files
authored
dbeaver/pro#7914 jetty server websocket version bump (#4079)
1 parent 547831d commit b318c26

10 files changed

Lines changed: 13 additions & 13 deletions

File tree

server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/jetty/CBJettyServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import io.cloudbeaver.service.DBWServiceBindingServlet;
3333
import io.cloudbeaver.service.DBWServiceBindingWebSocket;
3434
import jakarta.websocket.server.ServerEndpointConfig;
35-
import org.eclipse.jetty.ee10.servlet.*;
36-
import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
35+
import org.eclipse.jetty.ee11.servlet.*;
36+
import org.eclipse.jetty.ee11.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
3737
import org.eclipse.jetty.server.*;
3838
import org.eclipse.jetty.util.resource.ResourceFactory;
3939
import org.eclipse.jetty.xml.XmlConfiguration;

server/bundles/io.cloudbeaver.server.ce/src/io/cloudbeaver/server/servlets/CBStaticServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import jakarta.servlet.annotation.WebServlet;
3535
import jakarta.servlet.http.HttpServletRequest;
3636
import jakarta.servlet.http.HttpServletResponse;
37-
import org.eclipse.jetty.ee10.servlet.DefaultServlet;
37+
import org.eclipse.jetty.ee11.servlet.DefaultServlet;
3838
import org.eclipse.jetty.http.HttpHeader;
3939
import org.jkiss.code.NotNull;
4040
import org.jkiss.dbeaver.DBException;

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServletContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
import io.cloudbeaver.service.DBWServletContext;
2121
import jakarta.servlet.http.HttpServlet;
22-
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
23-
import org.eclipse.jetty.ee10.servlet.ServletHolder;
22+
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
23+
import org.eclipse.jetty.ee11.servlet.ServletHolder;
2424

2525
public class CBJettyServletContext implements DBWServletContext {
2626
private final ServletContextHandler contextHandler;

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyWebSocketContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import io.cloudbeaver.service.DBWWebSocketContext;
2020
import jakarta.websocket.server.ServerEndpointConfig;
21-
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
22-
import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
21+
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
22+
import org.eclipse.jetty.ee11.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
2323
import org.eclipse.jetty.server.Server;
2424
import org.jkiss.code.NotNull;
2525

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBSessionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.cloudbeaver.server.jetty;
1818

1919
import io.cloudbeaver.server.WebApplication;
20-
import org.eclipse.jetty.ee10.servlet.SessionHandler;
20+
import org.eclipse.jetty.ee11.servlet.SessionHandler;
2121
import org.jkiss.code.NotNull;
2222

2323
public class CBSessionHandler extends SessionHandler {

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/JettyUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.cloudbeaver.server.jetty;
1818

1919
import io.cloudbeaver.server.WebApplication;
20-
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
20+
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
2121
import org.eclipse.jetty.server.Server;
2222
import org.eclipse.jetty.session.DefaultSessionCache;
2323
import org.eclipse.jetty.session.DefaultSessionIdManager;

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/servlets/WebStatusServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import jakarta.servlet.annotation.WebServlet;
2424
import jakarta.servlet.http.HttpServletRequest;
2525
import jakarta.servlet.http.HttpServletResponse;
26-
import org.eclipse.jetty.ee10.servlet.DefaultServlet;
26+
import org.eclipse.jetty.ee11.servlet.DefaultServlet;
2727
import org.jkiss.dbeaver.Log;
2828
import org.jkiss.dbeaver.model.data.json.JSONUtils;
2929
import org.jkiss.dbeaver.utils.GeneralUtils;

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/websockets/CBWebSocketServerConfigurator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import jakarta.websocket.HandshakeResponse;
2424
import jakarta.websocket.server.HandshakeRequest;
2525
import jakarta.websocket.server.ServerEndpointConfig;
26-
import org.eclipse.jetty.ee10.websocket.jakarta.server.internal.JakartaWebSocketCreator;
26+
import org.eclipse.jetty.ee11.websocket.jakarta.server.internal.JakartaWebSocketCreator;
2727
import org.eclipse.jetty.http.BadMessageException;
2828
import org.jkiss.code.NotNull;
2929
import org.jkiss.code.Nullable;

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLFileLoaderServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import jakarta.servlet.annotation.MultipartConfig;
3131
import jakarta.servlet.http.HttpServletRequest;
3232
import jakarta.servlet.http.HttpServletResponse;
33-
import org.eclipse.jetty.ee10.servlet.ServletContextRequest;
33+
import org.eclipse.jetty.ee11.servlet.ServletContextRequest;
3434
import org.jkiss.dbeaver.DBException;
3535
import org.jkiss.dbeaver.Log;
3636
import org.jkiss.dbeaver.model.data.json.JSONUtils;

server/bundles/io.cloudbeaver.service.fs/src/io/cloudbeaver/service/fs/model/WebFSServlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import jakarta.servlet.http.HttpServletRequest;
2929
import jakarta.servlet.http.HttpServletResponse;
3030
import jakarta.servlet.http.Part;
31-
import org.eclipse.jetty.ee10.servlet.ServletContextRequest;
31+
import org.eclipse.jetty.ee11.servlet.ServletContextRequest;
3232
import org.jkiss.dbeaver.DBException;
3333
import org.jkiss.dbeaver.Log;
3434
import org.jkiss.dbeaver.model.data.json.JSONUtils;

0 commit comments

Comments
 (0)