Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Node.js
uses: actions/[email protected]
with:
node-version: '18.x'
node-version: '20.x'
- name: Build
env:
NODE_OPTIONS: --max_old_space_size=4096
Expand All @@ -39,7 +39,7 @@ jobs:
- name: Set up Node.js
uses: actions/[email protected]
with:
node-version: '18.x'
node-version: '20.x'
- name: Build
env:
NODE_OPTIONS: --max_old_space_size=4096
Expand All @@ -55,7 +55,7 @@ jobs:
- name: Set up Node.js
uses: actions/[email protected]
with:
node-version: '18.x'
node-version: '20.x'
- name: Build
run: yarn build:node-json-vscode

Expand All @@ -68,6 +68,8 @@ jobs:
uses: actions/[email protected]
- name: Set up Node.js
uses: actions/[email protected]
with:
node-version: '20.x'
- name: Set up JDK
uses: actions/[email protected]
with:
Expand All @@ -87,6 +89,8 @@ jobs:
uses: actions/[email protected]
- name: Set up Node.js
uses: actions/[email protected]
with:
node-version: '20.x'
- name: Set up JDK
uses: actions/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Each example is self-contained and provides both, an example diagram client (`gl

The following libraries/frameworks need to be installed on your system:

- [Node.js](https://nodejs.org/en/) `>=16.11.0`
- [Node.js](https://nodejs.org/en/) `>=20`
- [Yarn](https://classic.yarnpkg.com/en/docs/install#debian-stable) `>=1.7.0 < 2.x.x`
- [Java](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html) `>=17`
- [Maven](https://maven.apache.org/) `>=3.6.0`
Expand Down
2 changes: 1 addition & 1 deletion project-templates/java-emf-eclipse/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The most important entry points are:

The following libraries/frameworks need to be installed on your system:

- [Node.js](https://nodejs.org/en/) `>=18`
- [Node.js](https://nodejs.org/en/) `>=20`
- [Yarn](https://classic.yarnpkg.com/en/docs/install#debian-stable) `>=1.7.0 < 2`
- [Java](https://adoptium.net/temurin/releases) `>=17`
- [Maven](https://maven.apache.org/) `>=3.6.0`
Expand Down
4 changes: 2 additions & 2 deletions project-templates/java-emf-eclipse/glsp-client/lerna.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"version": "2.3.0",
"version": "2.5.0",
"npmClient": "yarn",
"command": {
"run": {
"stream": true
}
}
}
}
6 changes: 3 additions & 3 deletions project-templates/java-emf-eclipse/glsp-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "parent",
"version": "2.3.0",
"version": "2.5.0",
"private": true,
"homepage": "https://www.eclipse.org/glsp/",
"bugs": "https://github.com/eclipse-glsp/glsp/issues",
Expand Down Expand Up @@ -36,14 +36,14 @@
"watch": "concurrently --kill-others -n tsc,app -c red,yellow \"tsc -b -w --preserveWatchOutput\" \"yarn -s eclipse watch:bundle\""
},
"devDependencies": {
"@eclipse-glsp/config": "2.3.0",
"@eclipse-glsp/config": "2.5.0",
"concurrently": "^8.2.2",
"copyfiles": "^2.4.1",
"lerna": "8.1.7",
"typescript": "5.5.3"
},
"engines": {
"node": ">=16.11.0",
"node": ">=20",
"yarn": ">=1.7.0 <2.x.x"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tasklist-eclipse",
"version": "2.3.0",
"version": "2.5.0",
"private": "true",
"description": "GLSP-frontend code for the EMF model TaskList Eclipse integration",
"keywords": [
Expand Down Expand Up @@ -40,8 +40,8 @@
"watch:bundle": "webpack --watch"
},
"dependencies": {
"@eclipse-glsp/ide": "2.3.0",
"tasklist-glsp": "2.3.0"
"@eclipse-glsp/ide": "2.5.0",
"tasklist-glsp": "2.5.0"
},
"devDependencies": {
"@vscode/codicons": "^0.0.25",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tasklist-glsp",
"version": "2.3.0",
"version": "2.5.0",
"private": "true",
"description": "GLSP sprotty diagrams for the EMF model TaskList DSL",
"keywords": [
Expand Down Expand Up @@ -39,6 +39,6 @@
"watch": "tsc -w"
},
"dependencies": {
"@eclipse-glsp/client": "2.3.0"
"@eclipse-glsp/client": "2.5.0"
}
}
76 changes: 38 additions & 38 deletions project-templates/java-emf-eclipse/glsp-client/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,26 +37,26 @@
resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==

"@eclipse-glsp/client@2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/client/-/client-2.3.0.tgz#97e1a75dd63f4d0c4131b6e269e1948ab456f506"
integrity sha512-YIHN5ySSu14S4g/vUOuCKexk/0OdB1Y3lyN7KrRLyppPnSjwX7n9VnkWfImzBfgWrUBAST97m1uTIA3e4yT2og==
"@eclipse-glsp/client@2.5.0":
version "2.5.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/client/-/client-2.5.0.tgz#cbaf931214177ead720d492e23cab6590ed31d76"
integrity sha512-5uIyxXcUBxfGpvX/N8gIFvZnRmY19kjv2QAPt/polCcMLVSc2zRDXrF5OMvubf1K+bN1AJBNkLQhnFmg4FFAAg==
dependencies:
"@eclipse-glsp/sprotty" "^2.3.0"
"@eclipse-glsp/sprotty" "2.5.0"
autocompleter "^9.1.2"
file-saver "^2.0.5"
lodash "4.17.21"
snabbdom "~3.5.1"
vscode-jsonrpc "8.2.0"

"@eclipse-glsp/config@2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/config/-/config-2.3.0.tgz#075ba32546920996a43807f817383bf294ce846c"
integrity sha512-LkE+1UNpt1ZjPZhXAQLpqbEz3NPeZObLphgzmf3hMJ8z1gzUBZYsbfArTI4sZxXyEkfmr6YJ4b91nsTLWMaWlw==
"@eclipse-glsp/config@2.5.0":
version "2.5.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/config/-/config-2.5.0.tgz#a23787637931a866dd137409419115a898aea211"
integrity sha512-JKpTR/3Nl2RJnA0zKAAXCBW/emBymQl4/4Hlgv2UcGfVbeVtnDus10/yGw0CdDzruIbID3p4HBeMS9dxS1wbDg==
dependencies:
"@eclipse-glsp/eslint-config" "2.3.0"
"@eclipse-glsp/prettier-config" "2.3.0"
"@eclipse-glsp/ts-config" "2.3.0"
"@eclipse-glsp/eslint-config" "2.5.0"
"@eclipse-glsp/prettier-config" "2.5.0"
"@eclipse-glsp/ts-config" "2.5.0"
"@typescript-eslint/eslint-plugin" "^6.7.5"
"@typescript-eslint/parser" "^6.7.5"
eslint "^8.51.0"
Expand All @@ -70,50 +70,50 @@
reflect-metadata "^0.1.13"
rimraf "^5.0.5"

"@eclipse-glsp/eslint-config@2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/eslint-config/-/eslint-config-2.3.0.tgz#e88dcbdef9319fad55de817db3dcf0943b14eada"
integrity sha512-ks8icAt35BPZY/F5ucALrbqW4lhpslrQJABUxAM+/WxLNNbggLMTa5jJc4HJITIM3DPpVSKnIzx9jHv6Ywp6Wg==
"@eclipse-glsp/eslint-config@2.5.0":
version "2.5.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/eslint-config/-/eslint-config-2.5.0.tgz#65225e5b01c1dd6426164d60352b47682ed1fb31"
integrity sha512-GBQeArYZypGtqhAtsUEzXl9PMrjnsXVmnaZe2Xvm0AVPc4QP53YBRaY2qJ6TLQBFe3DvbKrhzLYrDJK+OlF6lg==

"@eclipse-glsp/ide@2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/ide/-/ide-2.3.0.tgz#86988fe80e92e40f19024661d677f107c62bed12"
integrity sha512-Izzvm1s79LpCZ0VM+HPnVkjO7XCq1C5lbJubi6zyGd2qcr6LmBIHZy3UyQVXmeXbjIbjIt5qdy8H++SY3Rulng==
"@eclipse-glsp/ide@2.5.0":
version "2.5.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/ide/-/ide-2.5.0.tgz#018e168153b8c47e5d563e682fd6072845b224dd"
integrity sha512-bLyb2eaGf+5NAkxUp1xG7wUrbGjc85nN+tw5Ucz4ZkgpvdIioIPiA0wnUlq+DOb32m0RWOMTEKbb9zllcMqtvA==
dependencies:
"@eclipse-glsp/client" "2.3.0"
"@eclipse-glsp/client" "2.5.0"

"@eclipse-glsp/prettier-config@2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/prettier-config/-/prettier-config-2.3.0.tgz#2fef36d466b54e7fa08a40fbcb4b06134a37639d"
integrity sha512-ZeemPmMrU0vMcE/wVH0QiJvlWtXUFwYHFCc2VjbXFs8/3+PTbi2ROk7ZvLdohPpGkZfD/1WzfHlolatl89r4MQ==
"@eclipse-glsp/prettier-config@2.5.0":
version "2.5.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/prettier-config/-/prettier-config-2.5.0.tgz#c1744e6ee7f5124eef7610c035f7405e3608ee46"
integrity sha512-JSoXoZLbdYm6YfQrCvFopKQiwaX3+iEJ27oR10da+wYY6Gio4jRXQZoqrGJaLygtZ8qe8j5DjRt8jEYdLInDLg==
dependencies:
prettier-plugin-packagejson "~2.4.6"

"@eclipse-glsp/protocol@^2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/protocol/-/protocol-2.3.0.tgz#87db53ffb81090abfe900e6ab7a5bb383a8cf2a3"
integrity sha512-y9gKtDYjvwLaWXi9ULhU21W4uEwNy94B2NjnNoxhAcZXwFxG14G4B2tBULnLJPCSeH+R717a7NRk3ECNX7lkcQ==
"@eclipse-glsp/protocol@2.5.0":
version "2.5.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/protocol/-/protocol-2.5.0.tgz#4c0325783bf296a8bdcef483cd0da96b760b35e3"
integrity sha512-bPHGamXtkbhFqV+2LAzrkOWw7iUmFIdYT+5uPdGqo3BPITiAA2cyE3iRuePwqgiqidhZrhPW60vL0GRgvgZ3TQ==
dependencies:
sprotty-protocol "1.4.0"
uuid "~10.0.0"
vscode-jsonrpc "8.2.0"

"@eclipse-glsp/sprotty@^2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/sprotty/-/sprotty-2.3.0.tgz#6cbb1d299625315fbee22445343c3569b71c2bf7"
integrity sha512-bsyrpJyH05ksQnLnpJg7hPVZX8yt16gke387VYnkQoiryB24XM/Korbukb3q/OQSka30rECt6OC3NgazKP59DQ==
"@eclipse-glsp/sprotty@2.5.0":
version "2.5.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/sprotty/-/sprotty-2.5.0.tgz#0f83bec254717cc0bb16308babcf1c23de62d9bd"
integrity sha512-pjVoa0iXoRPivFuKxmxYETGlIIwVmW1tKVd2jKauci4m11a48yenaFGqEtlxHJPRBnXrRKTPdoSmTtovKM5lhA==
dependencies:
"@eclipse-glsp/protocol" "^2.3.0"
"@eclipse-glsp/protocol" "2.5.0"
autocompleter "^9.1.0"
snabbdom "~3.5.1"
sprotty "1.4.0"
sprotty-protocol "1.4.0"
vscode-jsonrpc "8.2.0"

"@eclipse-glsp/ts-config@2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/ts-config/-/ts-config-2.3.0.tgz#9b4c91b1a8341f1ab6cf5894d51484ceb5054bc1"
integrity sha512-mQukxKKx6l/seowiCfOI0+/PiMM2kDduPN4GE51aLOI9dMSd5jmiFq61mt1eBAn1hLo3/V4s2dhjjhBO7S/36A==
"@eclipse-glsp/ts-config@2.5.0":
version "2.5.0"
resolved "https://registry.yarnpkg.com/@eclipse-glsp/ts-config/-/ts-config-2.5.0.tgz#1893464f5f9d3492fef69b0c7d3a3521525e2f0e"
integrity sha512-TSUnDUsLrMiu0VT+hqB7JzSAhgVFA803xbtk8xBjkFVKJMpOb9R5DahODloT1m3C7dcgZPYg6LwH6MpjsRl3ZQ==

"@emnapi/core@^1.1.0":
version "1.2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: GLSP TaskList Example Editor
Bundle-SymbolicName: org.eclipse.glsp.example.javaemf.editor;singleton:=true
Bundle-Version: 2.3.0
Bundle-Version: 2.5.0
Automatic-Module-Name: org.eclipse.glsp.example.javaemf.editor
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.elk.alg.common;bundle-version="0.5.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.eclipse.glsp.example</groupId>
<artifactId>org.eclipse.glsp.example.javaemf.parent</artifactId>
<version>2.3.0</version>
<version>2.5.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: GLSP Tasklist Example Server
Bundle-SymbolicName: org.eclipse.glsp.example.javaemf.server
Bundle-Version: 2.3.0
Bundle-Version: 2.5.0
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: org.eclipse.glsp.example.javaemf.server
Export-Package: org.eclipse.glsp.example.javaemf.server,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.eclipse.glsp.example</groupId>
<artifactId>org.eclipse.glsp.example.javaemf.parent</artifactId>
<version>2.3.0</version>
<version>2.5.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>org.eclipse.glsp.example</groupId>
<artifactId>org.eclipse.glsp.example.javaemf.target</artifactId>
<version>2.3.0</version>
<version>2.5.0</version>
<packaging>pom</packaging>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<unit id="org.eclipse.glsp.layout" version="0.0.0"/>
<unit id="org.eclipse.glsp.server.emf" version="0.0.0"/>
<unit id="org.eclipse.glsp.example.workflow" version="0.0.0"/>
<repository location="https://download.eclipse.org/glsp/server/p2/releases/2.3.0"/>
<repository location="https://download.eclipse.org/glsp/server/p2/releases/2.5.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.glsp.ide.feature.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/glsp/ide/p2/releases/2.3.0/"/>
<repository location="https://download.eclipse.org/glsp/ide/p2/releases/2.5.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.jetty.ee10.websocket.jakarta.server" version="12.0.12"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ location "http://download.eclipse.org/releases/2024-09" {
}


location "https://download.eclipse.org/glsp/server/p2/releases/2.3.0"{
location "https://download.eclipse.org/glsp/server/p2/releases/2.5.0"{
org.eclipse.glsp.feature.feature.group lazy
org.eclipse.glsp.server.websocket lazy
org.eclipse.glsp.layout lazy
org.eclipse.glsp.server.emf lazy
org.eclipse.glsp.example.workflow lazy
}

location "https://download.eclipse.org/glsp/ide/p2/releases/2.3.0/"{
location "https://download.eclipse.org/glsp/ide/p2/releases/2.5.0/"{
org.eclipse.glsp.ide.feature.feature.group lazy
}

Expand Down
17 changes: 12 additions & 5 deletions project-templates/java-emf-eclipse/glsp-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.eclipse.glsp.example</groupId>
<artifactId>org.eclipse.glsp.example.javaemf.parent</artifactId>
<description>Java/EMF/Eclipse GLSP Example parent</description>
<version>2.3.0</version>
<version>2.5.0</version>
<packaging>pom</packaging>
<url>https://github.com/eclipse/glsp-examples</url>

Expand Down Expand Up @@ -34,11 +34,18 @@
<tag>HEAD</tag>
</scm>


<pluginRepositories>
<pluginRepository>
<id>sonatype</id>
<name>Sonatype</name>
<url>https://oss.sonatype.org/content/groups/public</url>
<name>Central Portal Snapshots</name>
<id>central-portal-snapshots</id>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

Expand All @@ -54,7 +61,7 @@
<maven.compiler.plugin.version>3.8.0</maven.compiler.plugin.version>
<maven.source.plugin.version>3.0.1</maven.source.plugin.version>
<maven.resources.plugin.version>2.7</maven.resources.plugin.version>
<tycho-version>2.7.5</tycho-version>
<tycho-version>4.0.8</tycho-version>
</properties>

<modules>
Expand Down
4 changes: 2 additions & 2 deletions project-templates/java-emf-theia/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ The most important entry points are:

The following libraries/frameworks need to be installed on your system:

- [Node.js](https://nodejs.org/en/) `>=18`
- [Node.js](https://nodejs.org/en/) `>=20`
- [Yarn](https://classic.yarnpkg.com/en/docs/install#debian-stable) `>=1.7.0 <2.x.x`
- [Java](https://adoptium.net/temurin/releases) `>=17`
- [Maven](https://maven.apache.org/) `>=3.6.0`
Expand All @@ -44,7 +44,7 @@ The examples are heavily interweaved with Eclipse Theia, so please also check th

## Theia Version compatibility

This project template is compatible with Theia `>=1.39.0`.
This project template is compatible with Theia `>=1.64.0`.

## VS Code workspace

Expand Down
2 changes: 1 addition & 1 deletion project-templates/java-emf-theia/glsp-client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ For more detailed instructions and information please confer to the [README](../

## Theia Version compatibility

This project template is compatible with Theia `>=1.56.0`.
This project template is compatible with Theia `>=1.64.0`.

## Building

Expand Down
Loading