Skip to content

Commit dbca45c

Browse files
frankbenoitfrankbenoit
committed
Update target platform to r2024-09
javax to jakarta, jetty 10.x to 12.0.12
1 parent 818ba4d commit dbca45c

File tree

18 files changed

+256
-81
lines changed

18 files changed

+256
-81
lines changed

‎examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@ Export-Package: org.eclipse.glsp.example.workflow,
2222
org.eclipse.glsp.example.workflow.wfgraph.util
2323
Automatic-Module-Name: org.eclipse.glsp.example.workflow
2424
Bundle-RequiredExecutionEnvironment: JavaSE-17
25-
Require-Bundle: org.eclipse.glsp.layout;bundle-version="[2.0.0,3.0.0)",
25+
Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
26+
org.apache.commons.cli;bundle-version="1.9.0",
27+
org.eclipse.emf.common;bundle-version="2.31.0",
28+
org.eclipse.glsp.layout;bundle-version="[2.0.0,3.0.0)",
29+
org.eclipse.glsp.graph;bundle-version="2.3.0",
2630
org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
2731
org.eclipse.glsp.server.websocket;bundle-version="[2.0.0,3.0.0)",
28-
org.eclipse.elk.core;bundle-version="0.8.1",
2932
org.eclipse.elk.alg.layered;bundle-version="0.8.1",
33+
org.eclipse.elk.core;bundle-version="0.8.1",
3034
org.eclipse.elk.graph;bundle-version="0.8.1"
3135
Import-Package: org.apache.logging.log4j;version="2.17.1"

‎examples/org.eclipse.glsp.example.workflow/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@
140140
<artifactSet>
141141
<excludes>
142142
<exclude>jakarta.websocket:jakarta.websocket-api</exclude>
143-
<exclude>javax.websocket:javax.websocket-api</exclude>
144143
<exclude>log4j:log4j</exclude>
145144
</excludes>
146145
</artifactSet>

‎plugins/org.eclipse.glsp.graph/.classpath

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
</attributes>
77
</classpathentry>
88
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
9-
<classpathentry kind="src" path="src/"/>
10-
<classpathentry kind="src" path="src-gen/"/>
9+
<classpathentry kind="src" path="src"/>
10+
<classpathentry kind="src" path="src-gen">
11+
<attributes>
12+
<attribute name="ignore_optional_problems" value="true"/>
13+
</attributes>
14+
</classpathentry>
1115
<classpathentry kind="output" path="target/classes"/>
1216
</classpath>

‎plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Bundle-Version: 2.3.0.qualifier
66
Bundle-Vendor: Eclipse GLSP
77
Automatic-Module-Name: org.eclipse.glsp.graph
88
Bundle-RequiredExecutionEnvironment: JavaSE-17
9-
Require-Bundle: org.eclipse.emf.common;bundle-version="2.23.0",
10-
com.google.gson;bundle-version="2.8.7",
11-
org.eclipse.emf.ecore;bundle-version="2.25.0";visibility:=reexport
9+
Require-Bundle: org.eclipse.emf.common;bundle-version="2.31.0",
10+
org.eclipse.emf.ecore;bundle-version="2.37.0",
11+
com.google.gson;bundle-version="2.11.0"
1212
Export-Package: org.eclipse.glsp.graph,
1313
org.eclipse.glsp.graph,
1414
org.eclipse.glsp.graph.builder,

‎plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ Bundle-Version: 2.3.0.qualifier
66
Bundle-Vendor: EclispeSource
77
Automatic-Module-Name: org.eclipse.glsp.layout
88
Bundle-RequiredExecutionEnvironment: JavaSE-17
9-
Require-Bundle: org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
9+
Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
10+
org.apache.commons.cli;bundle-version="1.9.0",
11+
org.eclipse.emf.common;bundle-version="2.31.0",
1012
org.eclipse.elk.core;bundle-version="0.8.1",
11-
org.eclipse.elk.graph;bundle-version="0.8.1"
13+
org.eclipse.elk.graph;bundle-version="0.8.1",
14+
org.eclipse.glsp.graph;bundle-version="2.3.0",
15+
org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)"
1216
Export-Package: org.eclipse.glsp.layout

‎plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ Bundle-Vendor: Eclipse GLSP
88
Bundle-Localization: plugin
99
Automatic-Module-Name: org.eclipse.glsp.example.emf
1010
Bundle-RequiredExecutionEnvironment: JavaSE-17
11-
Require-Bundle: org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
12-
org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)",
11+
Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
1312
org.eclipse.emf.ecore;bundle-version="2.25.0",
1413
org.eclipse.emf.ecore.edit;bundle-version="2.13.0",
15-
org.eclipse.emf.ecore.xmi;bundle-version="2.16.0"
14+
org.eclipse.emf.ecore.xmi;bundle-version="2.16.0",
15+
org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)",
16+
org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)"
1617
Export-Package:
1718
org.eclipse.glsp.server.emf,
1819
org.eclipse.glsp.server.emf.idgen,

‎plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,23 @@ Bundle-Vendor: Eclipse GLSP
77
Automatic-Module-Name: com.eclipsesource.glps.server.websocket
88
Bundle-RequiredExecutionEnvironment: JavaSE-17
99
Require-Bundle: com.google.gson;bundle-version="2.8.7",
10+
com.google.inject;bundle-version="[7.0.0,8.0.0)",
1011
org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0]",
12+
org.eclipse.jetty.ee10.servlet;bundle-version="12.0.12",
13+
org.eclipse.jetty.ee10.websocket.jakarta.server;bundle-version="12.0.12",
14+
org.eclipse.jetty.ee10.websocket.server;bundle-version="12.0.12",
15+
org.eclipse.jetty.ee8.server;bundle-version="12.0.12",
16+
org.eclipse.jetty.server;bundle-version="12.0.12",
17+
org.eclipse.jetty.session;bundle-version="12.0.12",
18+
org.eclipse.jetty.util;bundle-version="12.0.12",
19+
org.eclipse.jetty.websocket.api;bundle-version="12.0.12",
1120
org.eclipse.lsp4j;bundle-version="0.11.0",
1221
org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0",
13-
org.eclipse.lsp4j.websocket;bundle-version="0.11.0",
14-
org.eclipse.jetty.servlet;bundle-version="[10.0.0,11.0.0)",
15-
org.eclipse.jetty.util;bundle-version="[10.0.0,11.0.0)",
16-
org.eclipse.jetty.server;bundle-version="[10.0.0,11.0.0)",
17-
org.eclipse.jetty.webapp;bundle-version="[10.0.0,11.0.0)",
18-
org.eclipse.jetty.http;bundle-version="[10.0.0,11.0.0)";visibility:=reexport,
19-
org.eclipse.jetty.io;bundle-version="[10.0.0,11.0.0)",
20-
org.eclipse.jetty.client;bundle-version="[10.0.0,11.0.0)",
21-
org.eclipse.jetty.websocket.javax.client;bundle-version="[10.0.0,11.0.0)",
22-
org.eclipse.jetty.websocket.javax.server;bundle-version="[10.0.0,11.0.0)",
23-
org.eclipse.jetty.websocket.javax.common;bundle-version="[10.0.0,11.0.0)",
24-
org.eclipse.jetty.websocket.core.common;bundle-version="[10.0.0,11.0.0)",
25-
org.eclipse.jetty.websocket.core.client;bundle-version="[10.0.0,11.0.0)",
26-
org.eclipse.jetty.websocket.servlet;bundle-version="[10.0.0,11.0.0)",
27-
org.eclipse.jetty.websocket.core.server;bundle-version="[10.0.0,11.0.0)"
22+
org.eclipse.lsp4j.websocket.jakarta;bundle-version="0.23.1"
2823
Export-Package: org.eclipse.glsp.server.websocket
29-
Import-Package: javax.servlet;version="[4.0.0,5.0.0)",
30-
javax.websocket;version="1.1.0",
31-
javax.websocket.server;version="1.1.0",
24+
Import-Package: jakarta.servlet;version="[6.1.0,7.0.0)",
25+
jakarta.websocket;version="[2.2.0,3.0.0)",
26+
jakarta.websocket.server;version="[2.2.0,3.0.0)",
3227
org.apache.logging.log4j;version="2.17.1",
3328
org.apache.logging.log4j.core.config;version="2.17.1",
3429
org.apache.logging.slf4j;version="2.17.1"

‎plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPConfigurator.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
import java.util.ServiceLoader;
2020
import java.util.function.Supplier;
2121

22-
import javax.websocket.Extension;
23-
import javax.websocket.HandshakeResponse;
24-
import javax.websocket.server.HandshakeRequest;
25-
import javax.websocket.server.ServerEndpointConfig;
26-
import javax.websocket.server.ServerEndpointConfig.Configurator;
27-
28-
import org.eclipse.jetty.websocket.javax.server.config.ContainerDefaultConfigurator;
22+
import org.eclipse.jetty.ee10.websocket.jakarta.server.config.ContainerDefaultConfigurator;
2923

3024
import com.google.inject.Injector;
3125

26+
import jakarta.websocket.Extension;
27+
import jakarta.websocket.HandshakeResponse;
28+
import jakarta.websocket.server.HandshakeRequest;
29+
import jakarta.websocket.server.ServerEndpointConfig;
30+
import jakarta.websocket.server.ServerEndpointConfig.Configurator;
31+
3232
public class GLSPConfigurator extends Configurator {
3333
protected Configurator containerConfigurator;
3434
protected final Supplier<Injector> injector;
@@ -40,7 +40,7 @@ public GLSPConfigurator(final Supplier<Injector> injector) {
4040
Configurator getContainerConfigurator() {
4141
if (containerConfigurator == null) {
4242
ServiceLoader<Configurator> loader = ServiceLoader
43-
.load(javax.websocket.server.ServerEndpointConfig.Configurator.class);
43+
.load(jakarta.websocket.server.ServerEndpointConfig.Configurator.class);
4444
if (loader.iterator().hasNext()) {
4545
containerConfigurator = loader.iterator().next();
4646
} else {

‎plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/GLSPServerEndpoint.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@
1919
import java.util.function.Consumer;
2020
import java.util.function.Function;
2121

22-
import javax.websocket.CloseReason;
23-
import javax.websocket.EndpointConfig;
24-
import javax.websocket.Session;
25-
2622
import org.eclipse.glsp.server.gson.ServerGsonConfigurator;
2723
import org.eclipse.glsp.server.protocol.GLSPClient;
2824
import org.eclipse.glsp.server.protocol.GLSPServer;
2925
import org.eclipse.lsp4j.jsonrpc.Launcher.Builder;
3026
import org.eclipse.lsp4j.jsonrpc.MessageConsumer;
31-
import org.eclipse.lsp4j.websocket.WebSocketEndpoint;
27+
import org.eclipse.lsp4j.websocket.jakarta.WebSocketEndpoint;
3228

3329
import com.google.gson.GsonBuilder;
3430
import com.google.inject.Inject;
3531

32+
import jakarta.websocket.CloseReason;
33+
import jakarta.websocket.EndpointConfig;
34+
import jakarta.websocket.Session;
35+
3636
public class GLSPServerEndpoint extends WebSocketEndpoint<GLSPClient> {
3737
public static final int MAX_TEXT_MESSAGE_BUFFER_SIZE = 8388608;
3838

‎plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketModule.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
******************************************************************************/
1616
package org.eclipse.glsp.server.websocket;
1717

18-
import javax.websocket.Endpoint;
19-
2018
import com.google.inject.AbstractModule;
2119

20+
import jakarta.websocket.Endpoint;
21+
2222
public class WebsocketModule extends AbstractModule {
2323

2424
@Override

‎plugins/org.eclipse.glsp.server.websocket/src/org/eclipse/glsp/server/websocket/WebsocketServerLauncher.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717

1818
import java.net.InetSocketAddress;
1919

20-
import javax.websocket.server.ServerEndpointConfig;
21-
2220
import org.apache.logging.log4j.Level;
2321
import org.apache.logging.log4j.LogManager;
2422
import org.apache.logging.log4j.Logger;
2523
import org.apache.logging.log4j.core.config.Configurator;
2624
import org.eclipse.glsp.server.di.ServerModule;
2725
import org.eclipse.glsp.server.launch.GLSPServerLauncher;
26+
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
27+
import org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
2828
import org.eclipse.jetty.server.Server;
29-
import org.eclipse.jetty.servlet.ServletContextHandler;
30-
import org.eclipse.jetty.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer;
3129

3230
import com.google.inject.Module;
3331

32+
import jakarta.websocket.server.ServerEndpointConfig;
33+
3434
public class WebsocketServerLauncher extends GLSPServerLauncher {
3535
public static final String START_UP_COMPLETE_MSG = "[GLSP-Server]:Startup completed. Accepting requests on port:";
3636
protected static Logger LOGGER = LogManager.getLogger(WebsocketServerLauncher.class);
@@ -68,12 +68,14 @@ public void start(final String hostname, int port) {
6868

6969
// Configure web socket
7070

71-
JavaxWebSocketServletContainerInitializer.configure(webAppContext, (servletContext, wsContainer) -> {
71+
JakartaWebSocketServletContainerInitializer.configure(webAppContext, (servletContext, wsContainer) -> {
7272
ServerEndpointConfig.Builder builder = ServerEndpointConfig.Builder.create(GLSPServerEndpoint.class,
7373
"/" + endpointPath);
7474
builder.configurator(new GLSPConfigurator(this::createInjector));
75-
wsContainer.setDefaultMaxSessionIdleTimeout(-1);
76-
wsContainer.addEndpoint(builder.build());
75+
ServerEndpointConfig endPointConfig = builder.build();
76+
77+
// wsContainer.setDefaultMaxSessionIdleTimeout(-1);
78+
wsContainer.addEndpoint(endPointConfig);
7779
});
7880

7981
server.setHandler(webAppContext);

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ Bundle-Version: 2.3.0.qualifier
66
Bundle-Vendor: Eclipse GLSP
77
Automatic-Module-Name: org.eclipse.glsp.server
88
Bundle-RequiredExecutionEnvironment: JavaSE-17
9-
Require-Bundle: org.eclipse.emf.ecore.change;bundle-version="2.14.0",
10-
com.google.gson;bundle-version="2.8.7",
11-
org.eclipse.lsp4j;bundle-version="0.11.0",
12-
org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0",
13-
org.apache.commons.cli;bundle-version="1.4.0";visibility:=reexport,
14-
com.google.inject;bundle-version="[5.0.1,8.0.0)";visibility:=reexport,
15-
org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
9+
Require-Bundle: com.google.inject;bundle-version="[7.0.0,8.0.0)",
10+
com.google.gson;bundle-version="2.11.0",
11+
org.apache.commons.cli;bundle-version="1.9.0",
12+
org.eclipse.emf.ecore.change;bundle-version="2.17.0",
13+
org.eclipse.glsp.graph;bundle-version="[2.3.0,3.0.0)",
14+
org.eclipse.lsp4j;bundle-version="0.23.1",
15+
org.eclipse.lsp4j.jsonrpc;bundle-version="0.23.1"
1616
Export-Package: org.eclipse.glsp.server.actions,
1717
org.eclipse.glsp.server.di,
1818
org.eclipse.glsp.server.di.scope,
@@ -58,7 +58,6 @@ Export-Package: org.eclipse.glsp.server.actions,
5858
org.eclipse.glsp.server.types,
5959
org.eclipse.glsp.server.utils
6060
Import-Package: jakarta.inject;resolution:=optional,
61-
javax.inject;version="1.0.0",
6261
org.apache.logging.log4j;version="2.17.1",
6362
org.apache.logging.log4j.core;version="2.17.1",
6463
org.apache.logging.log4j.core.appender;version="2.17.1",

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@
7373
<emf.ecore.version>[2.25.0,)</emf.ecore.version>
7474
<emf.ecore.xmi.version>2.16.0</emf.ecore.xmi.version>
7575
<emfjson.jackson.version>2.0.0</emfjson.jackson.version>
76-
<google.guice.version>[5.0.1,)</google.guice.version>
76+
<google.guice.version>[7.0.0,)</google.guice.version>
7777
<google.gson.version>[2.8.7,)</google.gson.version>
7878
<junit.jupiter.engine.version>[5.7.1,6.0.0)</junit.jupiter.engine.version>
79-
<lsp4j.version>[0.11.0,)</lsp4j.version>
79+
<lsp4j.version>[0.23.1,)</lsp4j.version>
8080
<jetty.websocket.version>[10.0.12,)</jetty.websocket.version>
8181

8282

@@ -233,7 +233,7 @@
233233
<artifact>
234234
<groupId>org.eclipse.glsp</groupId>
235235
<artifactId>org.eclipse.glsp.parent</artifactId>
236-
<classifier>targetplatforms/r2022-12</classifier>
236+
<classifier>targetplatforms/r2024-09</classifier>
237237
<version>${project.version}</version>
238238
</artifact>
239239
</target>

‎releng/org.eclipse.glsp.feature/feature.xml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -314,29 +314,23 @@ version(s), and exceptions or additional permissions here}.&quot;
314314
<requires>
315315
<import plugin="org.eclipse.emf.ecore.change" version="2.14.0" match="greaterOrEqual"/>
316316
<import plugin="com.google.gson" version="2.8.7" match="greaterOrEqual"/>
317-
<import plugin="org.eclipse.lsp4j" version="0.11.0" match="greaterOrEqual"/>
318-
<import plugin="org.eclipse.lsp4j.jsonrpc" version="0.11.0" match="greaterOrEqual"/>
317+
<import plugin="org.eclipse.lsp4j" version="0.23.1" match="greaterOrEqual"/>
318+
<import plugin="org.eclipse.lsp4j.jsonrpc" version="0.23.1" match="greaterOrEqual"/>
319319
<import plugin="org.apache.commons.cli" version="1.4.0" match="greaterOrEqual"/>
320320
<import plugin="com.google.inject" version="5.0.1" match="greaterOrEqual"/>
321-
<import plugin="javax.inject"/>
322321
<import plugin="org.apache.logging.log4j.api"/>
323322
<import plugin="org.apache.logging.log4j.core"/>
324323
<import plugin="org.eclipse.emf.common" version="2.23.0" match="greaterOrEqual"/>
325324
<import plugin="org.eclipse.emf.ecore" version="2.25.0" match="greaterOrEqual"/>
325+
<import plugin="jakarta.inject.jakarta.inject-api"/>
326326
</requires>
327327

328328
<plugin
329329
id="org.eclipse.glsp.server"
330-
download-size="0"
331-
install-size="0"
332-
version="0.0.0"
333-
unpack="false"/>
330+
version="0.0.0"/>
334331

335332
<plugin
336333
id="org.eclipse.glsp.graph"
337-
download-size="0"
338-
install-size="0"
339-
version="0.0.0"
340-
unpack="false"/>
334+
version="0.0.0"/>
341335

342336
</feature>

‎releng/org.eclipse.glsp.repository/category.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@
4242
<bundle id="slf4j.api">
4343
<category name="org.eclipse.glsp.dependencies"/>
4444
</bundle>
45-
<bundle id="javax.websocket">
46-
<category name="org.eclipse.glsp.dependencies"/>
47-
</bundle>
4845
<bundle id="org.apache.aries.spifly.dynamic.bundle">
4946
<category name="org.eclipse.glsp.dependencies"/>
5047
</bundle>

‎targetplatforms/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<tycho-version>2.7.5</tycho-version>
1818
<tycho-extras-version>2.7.5</tycho-extras-version>
1919
<targetPlatform.application.name>org.eclipse.cbi.targetplatform.tpd.converter</targetPlatform.application.name>
20-
<targetPlatform.application.args>r2020-06.tpd</targetPlatform.application.args>
20+
<targetPlatform.application.args>r2024-09.tpd</targetPlatform.application.args>
2121
</properties>
2222

2323
<build>
@@ -29,9 +29,9 @@
2929
<configuration>
3030
<repositories>
3131
<repository>
32-
<id>2020-06</id>
32+
<id>2024-09</id>
3333
<layout>p2</layout>
34-
<url>https://download.eclipse.org/releases/2020-06</url>
34+
<url>https://download.eclipse.org/releases/2024-09</url>
3535
</repository>
3636
<repository>
3737
<id>tpd</id>

0 commit comments

Comments
 (0)