Skip to content

Commit dc480c2

Browse files
tortmayrtortmayr
authored
2.6.0 Upgrade (#232)
* 2.6.0 Upgrade * Update main README.md
1 parent 844706c commit dc480c2

50 files changed

Lines changed: 371 additions & 352 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
7575
with:
7676
distribution: 'temurin'
77-
java-version: '17'
77+
java-version: '21'
7878
- name: Build
7979
env:
8080
NODE_OPTIONS: --max_old_space_size=4096
@@ -95,6 +95,6 @@ jobs:
9595
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
9696
with:
9797
distribution: 'temurin'
98-
java-version: '17'
98+
java-version: '21'
9999
- name: Build
100100
run: yarn build:java-emf-eclipse

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The following libraries/frameworks need to be installed on your system:
1111

1212
- [Node.js](https://nodejs.org/en/) `>=20`
1313
- [Yarn](https://classic.yarnpkg.com/en/docs/install#debian-stable) `>=1.7.0 < 2.x.x`
14-
- [Java](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html) `>=17`
14+
- [Java](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html) `>=21`
1515
- [Maven](https://maven.apache.org/) `>=3.6.0`
1616

1717
The examples are heavily interwoven with Eclipse Theia, so please also check the [prerequisites of Theia](https://github.com/eclipse-theia/theia/blob/master/doc/Developing.md#prerequisites).

‎project-templates/java-emf-eclipse/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The following libraries/frameworks need to be installed on your system:
4141

4242
- [Node.js](https://nodejs.org/en/) `>=20`
4343
- [Yarn](https://classic.yarnpkg.com/en/docs/install#debian-stable) `>=1.7.0 < 2`
44-
- [Java](https://adoptium.net/temurin/releases) `>=17`
44+
- [Java](https://adoptium.net/temurin/releases) `>=21`
4545
- [Maven](https://maven.apache.org/) `>=3.6.0`
4646

4747
## VS Code workspace

‎project-templates/java-emf-eclipse/glsp-client/lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.5.0",
2+
"version": "2.6.0",
33
"npmClient": "yarn",
44
"command": {
55
"run": {

‎project-templates/java-emf-eclipse/glsp-client/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "parent",
3-
"version": "2.5.0",
3+
"version": "2.6.0",
44
"private": true,
55
"homepage": "https://www.eclipse.org/glsp/",
66
"bugs": "https://github.com/eclipse-glsp/glsp/issues",
@@ -36,7 +36,7 @@
3636
"watch": "concurrently --kill-others -n tsc,app -c red,yellow \"tsc -b -w --preserveWatchOutput\" \"yarn -s eclipse watch:bundle\""
3737
},
3838
"devDependencies": {
39-
"@eclipse-glsp/config": "2.5.0",
39+
"@eclipse-glsp/config": "2.6.0",
4040
"concurrently": "^8.2.2",
4141
"copyfiles": "^2.4.1",
4242
"lerna": "8.1.7",

‎project-templates/java-emf-eclipse/glsp-client/tasklist-eclipse/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tasklist-eclipse",
3-
"version": "2.5.0",
3+
"version": "2.6.0",
44
"private": "true",
55
"description": "GLSP-frontend code for the EMF model TaskList Eclipse integration",
66
"keywords": [
@@ -40,8 +40,8 @@
4040
"watch:bundle": "webpack --watch"
4141
},
4242
"dependencies": {
43-
"@eclipse-glsp/ide": "2.5.0",
44-
"tasklist-glsp": "2.5.0"
43+
"@eclipse-glsp/ide": "2.6.0",
44+
"tasklist-glsp": "2.6.0"
4545
},
4646
"devDependencies": {
4747
"@vscode/codicons": "^0.0.25",

‎project-templates/java-emf-eclipse/glsp-client/tasklist-glsp/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tasklist-glsp",
3-
"version": "2.5.0",
3+
"version": "2.6.0",
44
"private": "true",
55
"description": "GLSP sprotty diagrams for the EMF model TaskList DSL",
66
"keywords": [
@@ -39,6 +39,6 @@
3939
"watch": "tsc -w"
4040
},
4141
"dependencies": {
42-
"@eclipse-glsp/client": "2.5.0"
42+
"@eclipse-glsp/client": "2.6.0"
4343
}
4444
}

‎project-templates/java-emf-eclipse/glsp-client/yarn.lock‎

Lines changed: 45 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,26 @@
3737
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
3838
integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
3939

40-
"@eclipse-glsp/client@2.5.0":
41-
version "2.5.0"
42-
resolved "https://registry.yarnpkg.com/@eclipse-glsp/client/-/client-2.5.0.tgz#cbaf931214177ead720d492e23cab6590ed31d76"
43-
integrity sha512-5uIyxXcUBxfGpvX/N8gIFvZnRmY19kjv2QAPt/polCcMLVSc2zRDXrF5OMvubf1K+bN1AJBNkLQhnFmg4FFAAg==
40+
"@eclipse-glsp/client@2.6.0":
41+
version "2.6.0"
42+
resolved "https://registry.yarnpkg.com/@eclipse-glsp/client/-/client-2.6.0.tgz#9c53a6bbe4ec7a1c378f8fda97320528470c09bd"
43+
integrity sha512-NGZgJxRzGb+eD2HGicSHIBWIaNKKU5b+d/2lWselIdJiPiET1U4UnJryrk6woIfHom4TgAt2qHM0Rjs+OJqQTA==
4444
dependencies:
45-
"@eclipse-glsp/sprotty" "2.5.0"
45+
"@eclipse-glsp/sprotty" "2.6.0"
4646
autocompleter "^9.1.2"
4747
file-saver "^2.0.5"
48-
lodash "4.17.21"
48+
lodash "4.17.23"
4949
snabbdom "~3.5.1"
5050
vscode-jsonrpc "8.2.0"
5151

52-
"@eclipse-glsp/config@2.5.0":
53-
version "2.5.0"
54-
resolved "https://registry.yarnpkg.com/@eclipse-glsp/config/-/config-2.5.0.tgz#a23787637931a866dd137409419115a898aea211"
55-
integrity sha512-JKpTR/3Nl2RJnA0zKAAXCBW/emBymQl4/4Hlgv2UcGfVbeVtnDus10/yGw0CdDzruIbID3p4HBeMS9dxS1wbDg==
52+
"@eclipse-glsp/config@2.6.0":
53+
version "2.6.0"
54+
resolved "https://registry.yarnpkg.com/@eclipse-glsp/config/-/config-2.6.0.tgz#1f6e70986315101a61f799eac899046b6056accd"
55+
integrity sha512-HSJolxpoAn/qVSao84WXR+MoVp/6HtP30Z7PWHTFfIrfmXcdPz2iprX+O22JzKIj7swKv5GDXb8bTpCBvSD2ZQ==
5656
dependencies:
57-
"@eclipse-glsp/eslint-config" "2.5.0"
58-
"@eclipse-glsp/prettier-config" "2.5.0"
59-
"@eclipse-glsp/ts-config" "2.5.0"
57+
"@eclipse-glsp/eslint-config" "2.6.0"
58+
"@eclipse-glsp/prettier-config" "2.6.0"
59+
"@eclipse-glsp/ts-config" "2.6.0"
6060
"@typescript-eslint/eslint-plugin" "^6.7.5"
6161
"@typescript-eslint/parser" "^6.7.5"
6262
eslint "^8.51.0"
@@ -70,50 +70,50 @@
7070
reflect-metadata "^0.1.13"
7171
rimraf "^5.0.5"
7272

73-
"@eclipse-glsp/eslint-config@2.5.0":
74-
version "2.5.0"
75-
resolved "https://registry.yarnpkg.com/@eclipse-glsp/eslint-config/-/eslint-config-2.5.0.tgz#65225e5b01c1dd6426164d60352b47682ed1fb31"
76-
integrity sha512-GBQeArYZypGtqhAtsUEzXl9PMrjnsXVmnaZe2Xvm0AVPc4QP53YBRaY2qJ6TLQBFe3DvbKrhzLYrDJK+OlF6lg==
73+
"@eclipse-glsp/eslint-config@2.6.0":
74+
version "2.6.0"
75+
resolved "https://registry.yarnpkg.com/@eclipse-glsp/eslint-config/-/eslint-config-2.6.0.tgz#c825431de3ad48447ea18c5daacc964f3fcbe215"
76+
integrity sha512-riTZkeSSXvnrceedgPc+y7bujplymLkDn2m/dtS87aiejsAvQB2tQsWFZCA0BVoqe+uurTeI+HVgQtiHKF/z1w==
7777

78-
"@eclipse-glsp/ide@2.5.0":
79-
version "2.5.0"
80-
resolved "https://registry.yarnpkg.com/@eclipse-glsp/ide/-/ide-2.5.0.tgz#018e168153b8c47e5d563e682fd6072845b224dd"
81-
integrity sha512-bLyb2eaGf+5NAkxUp1xG7wUrbGjc85nN+tw5Ucz4ZkgpvdIioIPiA0wnUlq+DOb32m0RWOMTEKbb9zllcMqtvA==
78+
"@eclipse-glsp/ide@2.6.0":
79+
version "2.6.0"
80+
resolved "https://registry.yarnpkg.com/@eclipse-glsp/ide/-/ide-2.6.0.tgz#b11a1c5a85297acc261d6ebefba0cffb256a6bd7"
81+
integrity sha512-OZJ+sdv31cQ/JezgY/c6xSvcR3u0godtwQFomhmjBCh73xHcmoJz5srdd038chPL5fgBJKbQNlYkjpXoKjxvWw==
8282
dependencies:
83-
"@eclipse-glsp/client" "2.5.0"
83+
"@eclipse-glsp/client" "2.6.0"
8484

85-
"@eclipse-glsp/prettier-config@2.5.0":
86-
version "2.5.0"
87-
resolved "https://registry.yarnpkg.com/@eclipse-glsp/prettier-config/-/prettier-config-2.5.0.tgz#c1744e6ee7f5124eef7610c035f7405e3608ee46"
88-
integrity sha512-JSoXoZLbdYm6YfQrCvFopKQiwaX3+iEJ27oR10da+wYY6Gio4jRXQZoqrGJaLygtZ8qe8j5DjRt8jEYdLInDLg==
85+
"@eclipse-glsp/prettier-config@2.6.0":
86+
version "2.6.0"
87+
resolved "https://registry.yarnpkg.com/@eclipse-glsp/prettier-config/-/prettier-config-2.6.0.tgz#6e7b72791c154e582633fc967c25cad0e3ebd5bf"
88+
integrity sha512-cq1ltXByyuEzgtDUGWsA+WfFQjOb3BeHVhI4JgoTByQmIqOBkUXY0vzMouuCmQooBh0MUOOoYboKIUGLOghFmw==
8989
dependencies:
9090
prettier-plugin-packagejson "~2.4.6"
9191

92-
"@eclipse-glsp/protocol@2.5.0":
93-
version "2.5.0"
94-
resolved "https://registry.yarnpkg.com/@eclipse-glsp/protocol/-/protocol-2.5.0.tgz#4c0325783bf296a8bdcef483cd0da96b760b35e3"
95-
integrity sha512-bPHGamXtkbhFqV+2LAzrkOWw7iUmFIdYT+5uPdGqo3BPITiAA2cyE3iRuePwqgiqidhZrhPW60vL0GRgvgZ3TQ==
92+
"@eclipse-glsp/protocol@2.6.0":
93+
version "2.6.0"
94+
resolved "https://registry.yarnpkg.com/@eclipse-glsp/protocol/-/protocol-2.6.0.tgz#171668f14a20e81695c5d21eb1aff6e1b97827f2"
95+
integrity sha512-DOhHM67EbWuPe3E/dhJaDVctTeAF8jJY1/WsiRQEvVGaVpq0rPxHChaErm0TKTrcZBEpX9/r0JTJlWtIh+GRYg==
9696
dependencies:
9797
sprotty-protocol "1.4.0"
9898
uuid "~10.0.0"
9999
vscode-jsonrpc "8.2.0"
100100

101-
"@eclipse-glsp/sprotty@2.5.0":
102-
version "2.5.0"
103-
resolved "https://registry.yarnpkg.com/@eclipse-glsp/sprotty/-/sprotty-2.5.0.tgz#0f83bec254717cc0bb16308babcf1c23de62d9bd"
104-
integrity sha512-pjVoa0iXoRPivFuKxmxYETGlIIwVmW1tKVd2jKauci4m11a48yenaFGqEtlxHJPRBnXrRKTPdoSmTtovKM5lhA==
101+
"@eclipse-glsp/sprotty@2.6.0":
102+
version "2.6.0"
103+
resolved "https://registry.yarnpkg.com/@eclipse-glsp/sprotty/-/sprotty-2.6.0.tgz#01aaced47e86fa8b060a7eea44167aa097b3d10e"
104+
integrity sha512-Kt+FXa3v3Ycxz/Nju10x9I+r/28RhCPGZNNXqq3W4oXUnklHpdnYkSQScZ1M2v/xS3o1vBYEs2kGZgeZS70Iww==
105105
dependencies:
106-
"@eclipse-glsp/protocol" "2.5.0"
106+
"@eclipse-glsp/protocol" "2.6.0"
107107
autocompleter "^9.1.0"
108108
snabbdom "~3.5.1"
109109
sprotty "1.4.0"
110110
sprotty-protocol "1.4.0"
111111
vscode-jsonrpc "8.2.0"
112112

113-
"@eclipse-glsp/ts-config@2.5.0":
114-
version "2.5.0"
115-
resolved "https://registry.yarnpkg.com/@eclipse-glsp/ts-config/-/ts-config-2.5.0.tgz#1893464f5f9d3492fef69b0c7d3a3521525e2f0e"
116-
integrity sha512-TSUnDUsLrMiu0VT+hqB7JzSAhgVFA803xbtk8xBjkFVKJMpOb9R5DahODloT1m3C7dcgZPYg6LwH6MpjsRl3ZQ==
113+
"@eclipse-glsp/ts-config@2.6.0":
114+
version "2.6.0"
115+
resolved "https://registry.yarnpkg.com/@eclipse-glsp/ts-config/-/ts-config-2.6.0.tgz#c97b5e83f993f9969ce9db2be41b169ffb16d494"
116+
integrity sha512-DPQOhnsxRgL8NQYS8J7mdxpKdzC+xXoodib2UW1HMZY2F8WOknSSWlFxNDEXNxUGvCeTdfuBlLo9RACx+TrbIw==
117117

118118
"@emnapi/core@^1.1.0":
119119
version "1.2.0"
@@ -3776,7 +3776,12 @@ lodash.merge@^4.6.2:
37763776
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
37773777
integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
37783778

3779-
lodash@4.17.21, lodash@^4.17.21:
3779+
lodash@4.17.23:
3780+
version "4.17.23"
3781+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
3782+
integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
3783+
3784+
lodash@^4.17.21:
37803785
version "4.17.21"
37813786
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
37823787
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==

‎project-templates/java-emf-eclipse/glsp-server/org.eclipse.glsp.example.javaemf.editor/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: GLSP TaskList Example Editor
44
Bundle-SymbolicName: org.eclipse.glsp.example.javaemf.editor;singleton:=true
5-
Bundle-Version: 2.5.0
5+
Bundle-Version: 2.6.0
66
Automatic-Module-Name: org.eclipse.glsp.example.javaemf.editor
77
Bundle-RequiredExecutionEnvironment: JavaSE-17
88
Require-Bundle: org.eclipse.elk.alg.common;bundle-version="0.5.0",

‎project-templates/java-emf-eclipse/glsp-server/org.eclipse.glsp.example.javaemf.editor/TaskListEditor.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
1818
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
1919
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
20-
<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"/>
20+
<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"/>
2121
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
2222
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
2323
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true"/>

0 commit comments

Comments
 (0)