Update target platform to r2024-09

javax to jakarta, jetty 10.x to 12.0.12
eclipse-glsp · Nov 8, 2024 · f529de1 · f529de1
1 parent 818ba4d
commit f529de1
Show file tree

Hide file tree

Showing 16 changed files with 241 additions and 74 deletions.
diff --git a/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF b/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF
@@ -22,10 +22,13 @@ Export-Package: org.eclipse.glsp.example.workflow,
  org.eclipse.glsp.example.workflow.wfgraph.util
 Automatic-Module-Name: org.eclipse.glsp.example.workflow
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.glsp.layout;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
+ org.apache.commons.cli;bundle-version="1.9.0",
+ org.eclipse.glsp.layout;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.glsp.graph;bundle-version="2.3.0",
  org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.glsp.server.websocket;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.elk.core;bundle-version="0.8.1",
  org.eclipse.elk.alg.layered;bundle-version="0.8.1",
+ org.eclipse.elk.core;bundle-version="0.8.1",
  org.eclipse.elk.graph;bundle-version="0.8.1"
 Import-Package: org.apache.logging.log4j;version="2.17.1"
diff --git a/plugins/org.eclipse.glsp.graph/.classpath b/plugins/org.eclipse.glsp.graph/.classpath
@@ -6,7 +6,11 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="src" path="src-gen/"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src-gen">
+		<attributes>
+			<attribute name="ignore_optional_problems" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@ Bundle-Version: 2.3.0.qualifier
 Bundle-Vendor: Eclipse GLSP
 Automatic-Module-Name: org.eclipse.glsp.graph
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.emf.common;bundle-version="2.23.0",
- com.google.gson;bundle-version="2.8.7",
- org.eclipse.emf.ecore;bundle-version="2.25.0";visibility:=reexport
+Require-Bundle: org.eclipse.emf.common;bundle-version="2.31.0",
+ org.eclipse.emf.ecore;bundle-version="2.37.0",
+ com.google.gson;bundle-version="2.11.0"
 Export-Package: org.eclipse.glsp.graph,
  org.eclipse.glsp.graph,
  org.eclipse.glsp.graph.builder,

diff --git a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF
@@ -6,7 +6,10 @@ Bundle-Version: 2.3.0.qualifier
 Bundle-Vendor: EclispeSource
 Automatic-Module-Name: org.eclipse.glsp.layout
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
+ org.apache.commons.cli;bundle-version="1.9.0",
  org.eclipse.elk.core;bundle-version="0.8.1",
- org.eclipse.elk.graph;bundle-version="0.8.1"
+ org.eclipse.elk.graph;bundle-version="0.8.1",
+ org.eclipse.glsp.graph;bundle-version="2.3.0",
+ org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)"
 Export-Package: org.eclipse.glsp.layout
diff --git a/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF
@@ -8,11 +8,12 @@ Bundle-Vendor: Eclipse GLSP
 Bundle-Localization: plugin
 Automatic-Module-Name: org.eclipse.glsp.example.emf
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)",
+Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
  org.eclipse.emf.ecore;bundle-version="2.25.0",
  org.eclipse.emf.ecore.edit;bundle-version="2.13.0",
- org.eclipse.emf.ecore.xmi;bundle-version="2.16.0"
+ org.eclipse.emf.ecore.xmi;bundle-version="2.16.0",
+ org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)"
 Export-Package: 
  org.eclipse.glsp.server.emf,
  org.eclipse.glsp.server.emf.idgen,

diff --git a/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF
@@ -7,28 +7,23 @@ Bundle-Vendor: Eclipse GLSP
 Automatic-Module-Name: com.eclipsesource.glps.server.websocket
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: com.google.gson;bundle-version="2.8.7",
+ com.google.inject;bundle-version="[7.0.0,8.0.0)",
  org.eclipse.glsp.server;bundle-version="[2.0.0,3.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.ee10.websocket.server;bundle-version="12.0.12",
+ org.eclipse.jetty.ee8.server;bundle-version="12.0.12",
+ org.eclipse.jetty.server;bundle-version="12.0.12",
+ org.eclipse.jetty.session;bundle-version="12.0.12",
+ org.eclipse.jetty.util;bundle-version="12.0.12",
+ org.eclipse.jetty.websocket.api;bundle-version="12.0.12",
  org.eclipse.lsp4j;bundle-version="0.11.0",
  org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0",
- org.eclipse.lsp4j.websocket;bundle-version="0.11.0",
- org.eclipse.jetty.servlet;bundle-version="[10.0.0,11.0.0)",
- org.eclipse.jetty.util;bundle-version="[10.0.0,11.0.0)",
- org.eclipse.jetty.server;bundle-version="[10.0.0,11.0.0)",
- org.eclipse.jetty.webapp;bundle-version="[10.0.0,11.0.0)",
- org.eclipse.jetty.http;bundle-version="[10.0.0,11.0.0)";visibility:=reexport,
- org.eclipse.jetty.io;bundle-version="[10.0.0,11.0.0)",
- org.eclipse.jetty.client;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.websocket.javax.server;bundle-version="[10.0.0,11.0.0)",
- org.eclipse.jetty.websocket.javax.common;bundle-version="[10.0.0,11.0.0)",
- org.eclipse.jetty.websocket.core.common;bundle-version="[10.0.0,11.0.0)",
- org.eclipse.jetty.websocket.core.client;bundle-version="[10.0.0,11.0.0)",
- org.eclipse.jetty.websocket.servlet;bundle-version="[10.0.0,11.0.0)",
- org.eclipse.jetty.websocket.core.server;bundle-version="[10.0.0,11.0.0)"
+ org.eclipse.lsp4j.websocket.jakarta;bundle-version="0.23.1"
 Export-Package: org.eclipse.glsp.server.websocket
-Import-Package: javax.servlet;version="[4.0.0,5.0.0)",
- javax.websocket;version="1.1.0",
- javax.websocket.server;version="1.1.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)",
  org.apache.logging.log4j;version="2.17.1",
  org.apache.logging.log4j.core.config;version="2.17.1",
  org.apache.logging.slf4j;version="2.17.1"
diff --git a/...eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPConfigurator.java b/...eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPConfigurator.java
@@ -19,16 +19,16 @@
 import java.util.ServiceLoader;
 import java.util.function.Supplier;
 
-import javax.websocket.Extension;
-import javax.websocket.HandshakeResponse;
-import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.ServerEndpointConfig;
-import javax.websocket.server.ServerEndpointConfig.Configurator;
-
-import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator;
+import org.eclipse.jetty.ee10.websocket.jakarta.server.config.ContainerDefaultConfigurator;
 
 import com.google.inject.Injector;
 
+import jakarta.websocket.Extension;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.server.HandshakeRequest;
+import jakarta.websocket.server.ServerEndpointConfig;
+import jakarta.websocket.server.ServerEndpointConfig.Configurator;
+
 public class GLSPConfigurator extends Configurator {
    protected Configurator containerConfigurator;
    protected final Supplier<Injector> injector;
@@ -40,7 +40,7 @@ public GLSPConfigurator(final Supplier<Injector> injector) {
    Configurator getContainerConfigurator() {
       if (containerConfigurator == null) {
          ServiceLoader<Configurator> loader = ServiceLoader
-            .load(javax.websocket.server.ServerEndpointConfig.Configurator.class);
+            .load(jakarta.websocket.server.ServerEndpointConfig.Configurator.class);
          if (loader.iterator().hasNext()) {
             containerConfigurator = loader.iterator().next();
          } else {

diff --git a/...lipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPServerEndpoint.java b/...lipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPServerEndpoint.java
@@ -19,20 +19,20 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import javax.websocket.CloseReason;
-import javax.websocket.EndpointConfig;
-import javax.websocket.Session;
-
 import org.eclipse.glsp.server.gson.ServerGsonConfigurator;
 import org.eclipse.glsp.server.protocol.GLSPClient;
 import org.eclipse.glsp.server.protocol.GLSPServer;
 import org.eclipse.lsp4j.jsonrpc.Launcher.Builder;
 import org.eclipse.lsp4j.jsonrpc.MessageConsumer;
-import org.eclipse.lsp4j.websocket.WebSocketEndpoint;
+import org.eclipse.lsp4j.websocket.jakarta.WebSocketEndpoint;
 
 import com.google.gson.GsonBuilder;
 import com.google.inject.Inject;
 
+import jakarta.websocket.CloseReason;
+import jakarta.websocket.EndpointConfig;
+import jakarta.websocket.Session;
+
 public class GLSPServerEndpoint extends WebSocketEndpoint<GLSPClient> {
    public static final int MAX_TEXT_MESSAGE_BUFFER_SIZE = 8388608;
 

diff --git a/....eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketModule.java b/....eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketModule.java
@@ -15,10 +15,10 @@
  ******************************************************************************/
 package org.eclipse.glsp.server.websocket;
 
-import javax.websocket.Endpoint;
-
 import com.google.inject.AbstractModule;
 
+import jakarta.websocket.Endpoint;
+
 public class WebsocketModule extends AbstractModule {
 
    @Override

diff --git a/....glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java b/....glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java
@@ -17,20 +17,20 @@
 
 import java.net.InetSocketAddress;
 
-import javax.websocket.server.ServerEndpointConfig;
-
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.eclipse.glsp.server.di.ServerModule;
 import org.eclipse.glsp.server.launch.GLSPServerLauncher;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
 
 import com.google.inject.Module;
 
+import jakarta.websocket.server.ServerEndpointConfig;
+
 public class WebsocketServerLauncher extends GLSPServerLauncher {
    public static final String START_UP_COMPLETE_MSG = "[GLSP-Server]:Startup completed. Accepting requests on port:";
    protected static Logger LOGGER = LogManager.getLogger(WebsocketServerLauncher.class);
@@ -68,12 +68,14 @@ public void start(final String hostname, int port) {
 
          // Configure web socket
 
-         JavaxWebSocketServletContainerInitializer.configure(webAppContext, (servletContext, wsContainer) -> {
+         JakartaWebSocketServletContainerInitializer.configure(webAppContext, (servletContext, wsContainer) -> {
             ServerEndpointConfig.Builder builder = ServerEndpointConfig.Builder.create(GLSPServerEndpoint.class,
                "/" + endpointPath);
             builder.configurator(new GLSPConfigurator(this::createInjector));
-            wsContainer.setDefaultMaxSessionIdleTimeout(-1);
-            wsContainer.addEndpoint(builder.build());
+            ServerEndpointConfig endPointConfig = builder.build();
+
+            // wsContainer.setDefaultMaxSessionIdleTimeout(-1);
+            wsContainer.addEndpoint(endPointConfig);
          });
 
          server.setHandler(webAppContext);

diff --git a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF
@@ -6,13 +6,13 @@ Bundle-Version: 2.3.0.qualifier
 Bundle-Vendor: Eclipse GLSP
 Automatic-Module-Name: org.eclipse.glsp.server
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.eclipse.emf.ecore.change;bundle-version="2.14.0",
- com.google.gson;bundle-version="2.8.7",
- org.eclipse.lsp4j;bundle-version="0.11.0",
- org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0",
- org.apache.commons.cli;bundle-version="1.4.0";visibility:=reexport,
- com.google.inject;bundle-version="[5.0.1,8.0.0)";visibility:=reexport,
- org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
+Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
+ com.google.gson;bundle-version="2.11.0",
+ org.apache.commons.cli;bundle-version="1.9.0",
+ org.eclipse.emf.ecore.change;bundle-version="2.17.0",
+ org.eclipse.glsp.graph;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.lsp4j;bundle-version="0.23.1",
+ org.eclipse.lsp4j.jsonrpc;bundle-version="0.23.1"
 Export-Package: org.eclipse.glsp.server.actions,
  org.eclipse.glsp.server.di,
  org.eclipse.glsp.server.di.scope,

diff --git a/pom.xml b/pom.xml
@@ -73,10 +73,10 @@
 		<emf.ecore.version>[2.25.0,)</emf.ecore.version>
 		<emf.ecore.xmi.version>2.16.0</emf.ecore.xmi.version>
 		<emfjson.jackson.version>2.0.0</emfjson.jackson.version>
-		<google.guice.version>[5.0.1,)</google.guice.version>
+		<google.guice.version>[7.0.0,)</google.guice.version>
 		<google.gson.version>[2.8.7,)</google.gson.version>
 		<junit.jupiter.engine.version>[5.7.1,6.0.0)</junit.jupiter.engine.version>
-		<lsp4j.version>[0.11.0,)</lsp4j.version>
+		<lsp4j.version>[0.23.1,)</lsp4j.version>
 		<jetty.websocket.version>[10.0.12,)</jetty.websocket.version>
 
 
@@ -233,7 +233,7 @@
 								<artifact>
 									<groupId>org.eclipse.glsp</groupId>
 									<artifactId>org.eclipse.glsp.parent</artifactId>
-									<classifier>targetplatforms/r2022-12</classifier>
+									<classifier>targetplatforms/r2024-09</classifier>
 									<version>${project.version}</version>
 								</artifact>
 							</target>

diff --git a/releng/org.eclipse.glsp.feature/feature.xml b/releng/org.eclipse.glsp.feature/feature.xml
@@ -318,25 +318,19 @@ version(s), and exceptions or additional permissions here}.&quot;
       <import plugin="org.eclipse.lsp4j.jsonrpc" version="0.11.0" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.cli" version="1.4.0" match="greaterOrEqual"/>
       <import plugin="com.google.inject" version="5.0.1" match="greaterOrEqual"/>
-      <import plugin="javax.inject"/>
       <import plugin="org.apache.logging.log4j.api"/>
       <import plugin="org.apache.logging.log4j.core"/>
       <import plugin="org.eclipse.emf.common" version="2.23.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore" version="2.25.0" match="greaterOrEqual"/>
+      <import plugin="jakarta.inject.jakarta.inject-api"/>
    </requires>
 
    <plugin
          id="org.eclipse.glsp.server"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="org.eclipse.glsp.graph"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>
diff --git a/targetplatforms/pom.xml b/targetplatforms/pom.xml
@@ -17,7 +17,7 @@
 		<tycho-version>2.7.5</tycho-version>
 		<tycho-extras-version>2.7.5</tycho-extras-version>
 		<targetPlatform.application.name>org.eclipse.cbi.targetplatform.tpd.converter</targetPlatform.application.name>
-		<targetPlatform.application.args>r2020-06.tpd</targetPlatform.application.args>
+		<targetPlatform.application.args>r2024-09.tpd</targetPlatform.application.args>
 	</properties>
 
 	<build>
@@ -29,9 +29,9 @@
 				<configuration>
 					<repositories>
 						<repository>
-							<id>2020-06</id>
+							<id>2024-09</id>
 							<layout>p2</layout>
-							<url>https://download.eclipse.org/releases/2020-06</url>
+							<url>https://download.eclipse.org/releases/2024-09</url>
 						</repository>
 						<repository>
 							<id>tpd</id>