Skip to content

Commit d096a29

Browse files
tortmayrtortmayr
committed
GLSP-1608: Update jetty version
-Update to Jetty 12.1.4 -Update to ELK 0.11.0 -Create new default target for 2025-12 -Remove not working workaround in pom.xml for temporarily removing the .gitignore file in the diagram folder. Instead apply the removal to the Jenkins file itself Fixes eclipse-glsp/glsp/issues/1608
1 parent fcdccd7 commit d096a29

File tree

10 files changed

+52
-81
lines changed

10 files changed

+52
-81
lines changed

‎Jenkinsfile‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: Pod
44
spec:
55
containers:
66
- name: ci
7-
image: eclipseglsp/ci:alpine-v6.0
7+
image: eclipseglsp/ci:alpine-v7.0
88
resources:
99
limits:
1010
memory: "2Gi"
@@ -65,7 +65,7 @@ pipeline {
6565
YARN_CACHE_FOLDER = "${env.WORKSPACE}/yarn-cache"
6666
SPAWN_WRAP_SHIM_ROOT = "${env.WORKSPACE}"
6767
EMAIL_TO= "glsp-build@eclipse.org"
68-
MAVEN_VERSION = "3.9.11"
68+
MAVEN_VERSION = "3.9.12"
6969

7070
}
7171

@@ -87,6 +87,14 @@ pipeline {
8787
}
8888
}
8989
}
90+
stage('Prepare Build') {
91+
steps {
92+
container('ci') {
93+
// Remove .gitignore from diagram folder to ensure artifacts are not ignored during deployment
94+
sh 'rm -f server/example/org.eclipse.glsp.ide.workflow.editor/diagram/.gitignore'
95+
}
96+
}
97+
}
9098
stage('Build client') {
9199
steps {
92100
container('ci') {

‎server/example/org.eclipse.glsp.ide.workflow.editor/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.elk.alg.common;bundle-version="0.8.1",
2020
org.eclipse.elk.graph;bundle-version="0.8.1",
2121
org.eclipse.lsp4j.websocket.jakarta;bundle-version="0.11.0",
2222
org.eclipse.e4.core.contexts;bundle-version="1.8.400",
23-
org.eclipse.jetty.server;bundle-version="12.0.12",
23+
org.eclipse.jetty.server;bundle-version="[12.1.4,13.0.0)",
2424
org.eclipse.e4.ui.model.workbench,
2525
org.eclipse.e4.ui.workbench,
2626
org.eclipse.e4.core.di.annotations,

‎server/example/org.eclipse.glsp.ide.workflow.editor/WorkflowEditor.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
2121
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
2222
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
23-
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
23+
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
2424
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
2525
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
2626
<booleanAttribute key="pde.generated.config" value="false"/>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="3.18.0",
2020
org.eclipse.lsp4j;bundle-version="0.11.0",
2121
org.eclipse.lsp4j.websocket.jakarta;bundle-version="0.21.0",
2222
org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0",
23-
org.eclipse.glsp.graph;bundle-version="2.3.0",
23+
org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)",
2424
org.eclipse.glsp.server.websocket;bundle-version="[2.0.0,3.0.0)",
2525
org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
2626
org.eclipse.e4.core.contexts;bundle-version="1.8.400",
27-
org.eclipse.jetty.server;bundle-version="[12.0.0,13.0.0)",
28-
org.eclipse.jetty.ee10.servlet;bundle-version="12.0.12",
29-
org.eclipse.jetty.ee10.websocket.jakarta.server;bundle-version="12.0.12",
30-
org.eclipse.jetty.util;bundle-version="[12.0.0,13.0.0)",
27+
org.eclipse.jetty.server;bundle-version="[12.1.4,13.0.0)",
28+
org.eclipse.jetty.ee10.servlet;bundle-version="[12.1.4,13.0.0)",
29+
org.eclipse.jetty.ee10.websocket.jakarta.server;bundle-version="[12.1.4,13.0.0)",
30+
org.eclipse.jetty.util;bundle-version="[12.1.4,13.0.0)",
3131
org.eclipse.jface.text;bundle-version="3.0.0",
3232
org.eclipse.e4.ui.di,
3333
org.eclipse.e4.ui.model.workbench,

‎server/releng/org.eclipse.glsp.ide.releng.target/r2023-12.target‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="2023-12 - Minimal" sequenceNumber="1743950517">
4+
<target name="2023-12 - Minimal" sequenceNumber="1768798134">
55
<locations>
66
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
77
<unit id="org.eclipse.platform.feature.group" version="4.30.0.v20231201-0512"/>
@@ -13,10 +13,10 @@
1313
<repository location="http://download.eclipse.org/releases/2023-12"/>
1414
</location>
1515
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
16-
<unit id="org.eclipse.jetty.ee10.websocket.jakarta.server" version="12.0.12"/>
17-
<unit id="org.eclipse.jetty.ee10.websocket.server" version="12.0.12"/>
18-
<unit id="org.eclipse.jetty.websocket.api" version="12.0.12"/>
19-
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12"/>
16+
<unit id="org.eclipse.jetty.ee10.websocket.jakarta.server" version="12.1.4"/>
17+
<unit id="org.eclipse.jetty.ee10.websocket.server" version="12.1.4"/>
18+
<unit id="org.eclipse.jetty.websocket.api" version="12.1.4"/>
19+
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.1.4"/>
2020
</location>
2121
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
2222
<unit id="jakarta.websocket-api" version="2.2.0"/>
@@ -33,11 +33,11 @@
3333
<repository location="https://download.eclipse.org/glsp/server/p2/nightly/2.6"/>
3434
</location>
3535
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
36-
<unit id="org.eclipse.elk.core" version="0.8.1"/>
37-
<unit id="org.eclipse.elk.graph" version="0.8.1"/>
38-
<unit id="org.eclipse.elk.graph.text" version="0.8.1"/>
39-
<unit id="org.eclipse.elk.alg.layered" version="0.8.1"/>
40-
<repository location="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
36+
<unit id="org.eclipse.elk.core" version="0.11.0"/>
37+
<unit id="org.eclipse.elk.graph" version="0.11.0"/>
38+
<unit id="org.eclipse.elk.graph.text" version="0.11.0"/>
39+
<unit id="org.eclipse.elk.alg.layered" version="0.11.0"/>
40+
<repository location="https://download.eclipse.org/elk/updates/releases/0.11.0/"/>
4141
</location>
4242
</locations>
4343
</target>

‎server/releng/org.eclipse.glsp.ide.releng.target/r2023-12.tpd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ location "http://download.eclipse.org/releases/2023-12" {
99
com.ibm.icu [74.1.0,74.1.0]
1010
}
1111

12-
location "https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12" {
12+
location "https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.1.4" {
1313
org.eclipse.jetty.ee10.websocket.jakarta.server
1414
org.eclipse.jetty.ee10.websocket.server
1515
org.eclipse.jetty.websocket.api
@@ -29,7 +29,7 @@ location "https://download.eclipse.org/glsp/server/p2/nightly/2.6"{
2929
org.eclipse.glsp.example.workflow lazy
3030
}
3131

32-
location "https://download.eclipse.org/elk/updates/releases/0.8.1/" {
32+
location "https://download.eclipse.org/elk/updates/releases/0.11.0/" {
3333
org.eclipse.elk.core
3434
org.eclipse.elk.graph
3535
org.eclipse.elk.graph.text

server/releng/org.eclipse.glsp.ide.releng.target/r2024-09.target renamed to server/releng/org.eclipse.glsp.ide.releng.target/r2025-12.target

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="2024-09 - Default" sequenceNumber="1757325762">
4+
<target name="2025-12 - Default" sequenceNumber="1768798197">
55
<locations>
66
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
7-
<unit id="org.eclipse.platform.feature.group" version="4.33.0.v20240903-0618"/>
8-
<unit id="org.eclipse.emf.sdk.feature.group" version="2.39.0.v20240731-0952"/>
9-
<unit id="org.eclipse.emf.transaction.feature.group" version="1.14.0.202408231629"/>
10-
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2600.v20240722-2106"/>
11-
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.3.500.v20240803-1337"/>
12-
<repository location="http://download.eclipse.org/releases/2024-09"/>
7+
<unit id="org.eclipse.platform.feature.group" version="4.38.0.v20251201-0920"/>
8+
<unit id="org.eclipse.emf.sdk.feature.group" version="2.44.0.v20251106-1447"/>
9+
<unit id="org.eclipse.emf.transaction.feature.group" version="1.14.2.202510231413"/>
10+
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.3100.v20251111-0406"/>
11+
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.3.900.v20250616-0711"/>
12+
<repository location="http://download.eclipse.org/releases/2025-12"/>
1313
</location>
1414
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
15-
<unit id="org.eclipse.jetty.ee10.websocket.jakarta.server" version="12.0.12"/>
16-
<unit id="org.eclipse.jetty.ee10.websocket.server" version="12.0.12"/>
17-
<unit id="org.eclipse.jetty.websocket.api" version="12.0.12"/>
18-
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12"/>
15+
<unit id="org.eclipse.jetty.ee10.websocket.jakarta.server" version="12.1.4"/>
16+
<unit id="org.eclipse.jetty.ee10.websocket.server" version="12.1.4"/>
17+
<unit id="org.eclipse.jetty.websocket.api" version="12.1.4"/>
18+
<repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.1.4"/>
1919
</location>
2020
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
2121
<unit id="jakarta.websocket-api" version="2.2.0"/>
2222
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
2323
<unit id="jakarta.servlet-api" version="6.1.0"/>
24-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
24+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12"/>
2525
</location>
2626
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
2727
<unit id="org.eclipse.glsp.feature.feature.group" version="0.0.0"/>
@@ -32,11 +32,11 @@
3232
<repository location="https://download.eclipse.org/glsp/server/p2/nightly/2.6"/>
3333
</location>
3434
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
35-
<unit id="org.eclipse.elk.core" version="0.9.1"/>
36-
<unit id="org.eclipse.elk.graph" version="0.9.1"/>
37-
<unit id="org.eclipse.elk.graph.text" version="0.9.1"/>
38-
<unit id="org.eclipse.elk.alg.layered" version="0.9.1"/>
39-
<repository location="https://download.eclipse.org/elk/updates/releases/0.9.1/"/>
35+
<unit id="org.eclipse.elk.core" version="0.11.0"/>
36+
<unit id="org.eclipse.elk.graph" version="0.11.0"/>
37+
<unit id="org.eclipse.elk.graph.text" version="0.11.0"/>
38+
<unit id="org.eclipse.elk.alg.layered" version="0.11.0"/>
39+
<repository location="https://download.eclipse.org/elk/updates/releases/0.11.0/"/>
4040
</location>
4141
</locations>
4242
</target>

server/releng/org.eclipse.glsp.ide.releng.target/r2024-09.tpd renamed to server/releng/org.eclipse.glsp.ide.releng.target/r2025-12.tpd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
target "2024-09 - Default" with source requirements
1+
target "2025-12 - Default" with source requirements
22

3-
location "http://download.eclipse.org/releases/2024-09" {
3+
location "http://download.eclipse.org/releases/2025-12" {
44
org.eclipse.platform.feature.group
55
org.eclipse.emf.sdk.feature.group
66
org.eclipse.emf.transaction.feature.group
77
org.eclipse.equinox.executable.feature.group
88
org.eclipse.equinox.p2.discovery.feature.feature.group
99
}
1010

11-
location "https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12" {
11+
location "https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.1.4" {
1212
org.eclipse.jetty.ee10.websocket.jakarta.server
1313
org.eclipse.jetty.ee10.websocket.server
1414
org.eclipse.jetty.websocket.api
1515
}
1616

17-
location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09" {
17+
location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12" {
1818
jakarta.websocket-api [2.2.0,3.0.0)
1919
jakarta.inject.jakarta.inject-api [2.0.1,3.0.0)
2020
jakarta.servlet-api [6.1.0,7.0.0)
@@ -28,7 +28,7 @@ location "https://download.eclipse.org/glsp/server/p2/nightly/2.6"{
2828
org.eclipse.glsp.example.workflow lazy
2929
}
3030

31-
location "https://download.eclipse.org/elk/updates/releases/0.9.1/" {
31+
location "https://download.eclipse.org/elk/updates/releases/0.11.0/" {
3232
org.eclipse.elk.core
3333
org.eclipse.elk.graph
3434
org.eclipse.elk.graph.text

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
<category name="org.eclipse.glsp"/>
1515
</category-def>
1616
<repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09" name="Eclipse Orbit" enabled="true" />
17-
<repository-reference location="https://download.eclipse.org/glsp/server/p2/nightly/2.6" name="GLSP" enabled="true" />
17+
<repository-reference location="file:///home/tobias/Git/OpenSource/glsp/glsp-server/releng/org.eclipse.glsp.repository/target/repository" name="GLSP" enabled="true" />
1818
</site>

‎server/releng/org.eclipse.glsp.ide.repository/pom.xml‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -30,43 +30,6 @@
3030
<skip>true</skip>
3131
</configuration>
3232
</plugin>
33-
<!-- Temporarily remove .gitignore during p2 updatesite build to ensure
34-
gitignored files are included in the repository -->
35-
<plugin>
36-
<groupId>org.apache.maven.plugins</groupId>
37-
<artifactId>maven-antrun-plugin</artifactId>
38-
<version>${maven-antrun-plugin.version}</version>
39-
<executions>
40-
<execution>
41-
<id>remove-gitignore</id>
42-
<phase>initialize</phase>
43-
<goals>
44-
<goal>run</goal>
45-
</goals>
46-
<configuration>
47-
<target>
48-
<move file="${project.basedir}/../../example/org.eclipse.glsp.ide.workflow.editor/diagram/.gitignore"
49-
tofile="${project.basedir}/../../example/org.eclipse.glsp.ide.workflow.editor/diagram/.gitignore.bak"
50-
failonerror="true"/>
51-
</target>
52-
</configuration>
53-
</execution>
54-
<execution>
55-
<id>restore-gitignore</id>
56-
<phase>verify</phase>
57-
<goals>
58-
<goal>run</goal>
59-
</goals>
60-
<configuration>
61-
<target>
62-
<move file="${project.basedir}/../../example/org.eclipse.glsp.ide.workflow.editor/diagram/.gitignore.bak"
63-
tofile="${project.basedir}/../../example/org.eclipse.glsp.ide.workflow.editor/diagram/.gitignore"
64-
failonerror="true"/>
65-
</target>
66-
</configuration>
67-
</execution>
68-
</executions>
69-
</plugin>
7033
</plugins>
7134
</build>
7235

0 commit comments

Comments
 (0)