Update target platform to r2024-09

javax to jakarta, jetty 10.x to 12.0.12

Author: frankbenoit

server/plugins/org.eclipse.glsp.ide.editor/.settings/org.eclipse.jdt.core.prefs

@@ -30,7 +30,7 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=15
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
@@ -147,7 +147,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=15
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO

server/plugins/org.eclipse.glsp.ide.editor/META-INF/MANIFEST.MF

@@ -18,23 +18,24 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="3.18.0",
  org.eclipse.ui.editors;bundle-version="3.11.0",
  com.google.inject;bundle-version="[5.0.0,8.0.0)",
  org.eclipse.lsp4j;bundle-version="0.11.0",
- org.eclipse.lsp4j.websocket;bundle-version="0.11.0",
+ org.eclipse.lsp4j.websocket.jakarta;bundle-version="0.23.1",
  org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0",
+ org.eclipse.glsp.graph;bundle-version="2.3.0",
  org.eclipse.glsp.server.websocket;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.e4.core.contexts;bundle-version="1.8.400",
- org.eclipse.jetty.server;bundle-version="[10.0.0,11.0.0)",
- org.eclipse.jetty.websocket.javax.client;bundle-version="[10.0.0,11.0.0)",
- org.eclipse.jetty.util;bundle-version="[10.0.0,11.0.0)",
- org.eclipse.jetty.servlet;bundle-version="[10.0.0,11.0.0)",
- org.eclipse.jetty.websocket.javax.server;bundle-version="[10.0.0,11.0.0)",
+ org.eclipse.jetty.server;bundle-version="[12.0.0,13.0.0)",
+ org.eclipse.jetty.ee10.servlet;bundle-version="12.0.12",
+ org.eclipse.jetty.ee10.websocket.jakarta.server;bundle-version="12.0.12",
+ org.eclipse.jetty.util;bundle-version="[12.0.0,13.0.0)",
  org.eclipse.jface.text;bundle-version="3.0.0",
  org.eclipse.e4.ui.di,
  org.eclipse.e4.ui.model.workbench,
  org.eclipse.e4.ui.workbench,
  org.eclipse.e4.core.commands,
  org.eclipse.e4.core.di.annotations,
- org.eclipse.e4.ui.services
+ org.eclipse.e4.ui.services,
+ org.eclipse.emf.ecore;bundle-version="2.37.0"
 Bundle-ClassPath: .
 Export-Package: org.eclipse.glsp.ide.editor,
  org.eclipse.glsp.ide.editor.actions,
@@ -48,11 +49,11 @@ Export-Package: org.eclipse.glsp.ide.editor,
  org.eclipse.glsp.ide.editor.internal.actions,
  org.eclipse.glsp.ide.editor.ui,
  org.eclipse.glsp.ide.editor.utils
-Import-Package: javax.annotation;version="[1.3.5,2.0.0)",
+Import-Package: jakarta.servlet;version="[6.1.0,7.0.0)",
+ jakarta.websocket;version="[2.2.0,3.0.0)",
+ jakarta.websocket.server;version="[2.2.0,3.0.0)",
+ javax.annotation;version="[1.3.5,2.0.0)",
  javax.inject,
- javax.servlet;version="[4.0.0,5.0.0)",
- javax.websocket;version="1.1.0",
- javax.websocket.server;version="1.1.0",
  org.apache.logging.log4j;version="2.19.0",
  org.apache.logging.log4j.core;version="2.19.0",
  org.apache.logging.log4j.core.appender;version="2.19.0",

server/plugins/org.eclipse.glsp.ide.editor/src/org/eclipse/glsp/ide/editor/DiagramWebsocketEndpoint.java

@@ -18,9 +18,6 @@
 import java.util.Collection;
 import java.util.function.Function;
 
-import javax.websocket.CloseReason;
-import javax.websocket.Session;
-
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.glsp.ide.editor.ui.GLSPIdeEditorPlugin;
@@ -31,6 +28,9 @@
 
 import com.google.inject.Inject;
 
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.Session;
+
 public class DiagramWebsocketEndpoint extends GLSPServerEndpoint {
 
    protected GLSPClient glspClient;

server/plugins/org.eclipse.glsp.ide.editor/src/org/eclipse/glsp/ide/editor/GLSPServerManager.java

@@ -24,11 +24,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.ServletException;
-import javax.websocket.DeploymentException;
-import javax.websocket.server.ServerContainer;
-import javax.websocket.server.ServerEndpointConfig;
-
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.appender.ConsoleAppender;
 import org.apache.logging.log4j.core.config.Configurator;
@@ -43,19 +38,24 @@
 import org.eclipse.glsp.server.di.ServerModule;
 import org.eclipse.glsp.server.utils.LaunchUtil;
 import org.eclipse.glsp.server.websocket.GLSPConfigurator;
+import org.eclipse.jetty.ee10.servlet.DefaultServlet;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
 import org.eclipse.jetty.server.AllowedResourceAliasChecker;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.servlet.DefaultServlet;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.eclipse.jetty.util.resource.Resource;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
+import org.eclipse.jetty.util.resource.PathResourceFactory;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Module;
 
+import jakarta.servlet.ServletException;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.server.ServerContainer;
+import jakarta.websocket.server.ServerEndpointConfig;
+
 public abstract class GLSPServerManager {
 
    protected Server server;
@@ -101,14 +101,15 @@ protected void configure(final Server server)
 
       String resourceBase = resolveResourceBase();
       if (SystemUtils.isWindows()) {
-         var resource = Resource.newResource(resourceBase);
+         var resource = new PathResourceFactory()
+            .newResource(resourceBase);
          context.addAliasCheck(new AllowedResourceAliasChecker(context, resource));
       }
 
       defaultServletHolder.setInitParameter("resourceBase", resourceBase);
       defaultServletHolder.setInitParameter("dirAllowed", "false");
       context.addServlet(defaultServletHolder, "/");
-      JavaxWebSocketServletContainerInitializer.configure(context, (servletContext, wsContainer) -> {
+      JakartaWebSocketServletContainerInitializer.configure(context, (servletContext, wsContainer) -> {
          container = wsContainer;
          ServerEndpointConfig.Builder builder = ServerEndpointConfig.Builder.create(DiagramWebsocketEndpoint.class,
             "/" + getGlspId());

server/plugins/org.eclipse.glsp.ide.editor/src/org/eclipse/glsp/ide/editor/internal/utils/SystemUtils.java

@@ -18,6 +18,7 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
+@SuppressWarnings("removal")
 public final class SystemUtils {
    private static final String OS_NAME;
    static {

server/plugins/org.eclipse.glsp.ide.editor/src/org/eclipse/glsp/ide/editor/utils/SWTUtil.java

@@ -22,7 +22,7 @@
 import org.eclipse.swt.browser.Browser;
 import org.eclipse.swt.widgets.Control;
 
-@SuppressWarnings("deprecation")
+@SuppressWarnings("removal")
 public final class SWTUtil {
    private SWTUtil() {}