v2.0.0

.prettierrc

@@ -0,0 +1,20 @@
+{
+  "$schema": "http://json.schemastore.org/prettierrc",
+  "singleQuote": true,
+  "jsxSingleQuote": true,
+  "arrowParens": "avoid",
+  "trailingComma": "none",
+  "endOfLine": "lf",
+  "printWidth": 140,
+  "tabWidth": 4,
+  "overrides": [
+    {
+      "files": ["*.json", "*.yml"],
+      "options": {
+        "printWidth": 100,
+        "tabWidth": 2
+      }
+    }
+  ],
+  "plugins": ["prettier-plugin-packagejson"]
+}

.vscode/settings.json

@@ -10,7 +10,6 @@
     "source.fixAll.eslint": true
   },
   "eslint.validate": ["javascript", "typescript"],
-  "prettier.prettierPath": "node_modules/prettier",
   "search.exclude": {
     "**/node_modules": true,
     "**/lib": true

CHANGELOG.md

@@ -1,42 +1,49 @@
 # Eclipse GLSP Eclipse Integration Changelog
 
-## v1.1.0 - upcoming
+## v2.0.0 - 14/10/2023(<https://github.com/eclipse-glsp/glsp-eclipse-integration/releases/tag/v2.0.0>)
 
 ### Changes
 
-- [diagram] Fixed a bug that could cause a crash when closing a diagram editor on Windows [#59](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/59)
-- [debug] Fixed a bug to ensure that the system browser opens reliably when using the `Debug (External Browser)` command [#60](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/60)
-- [websocket] Fixed a bug that could trigger premature session disposal even if other GLSP clients where associated with this session [#63](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/63)
-- [eclipse] Propagate the GLSP diagram selection to the Eclipse selection service [#73](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/73) -- Contributed on behalf of STMicroelectronics
+-   [diagram] Fix a bug that could cause a crash when closing a diagram editor on Windows [#59](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/59)
+-   [debug] Fix a bug to ensure that the system browser opens reliably when using the `Debug (External Browser)` command [#60](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/60)
+-   [websocket] Fix a bug that could trigger premature session disposal even if other GLSP clients where associated with this session [#63](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/63)
+-   [eclipse] Propagate the GLSP diagram selection to the Eclipse selection service [#73](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/73) -- Contributed on behalf of STMicroelectronics
+-   [eclipse] Fix a dead-lock bug that could occur saving by closing a dirty editor [#75](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/75)
+-   [diagram] Add context menu support for Windows (Edge) [#77](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/77)
+-   [websocket] Implement websocket reconnect handling in example app [#84](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/84)
+-   [server] Ensure that resources with a symlink a correctly resolved by the Jetty server on Windows [#85](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/85)
+-   [deps] Remove upper bound version requirements for Guava and Guice to stay compatible with newer Eclipse versions [#89](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/89)
 
 ### Breaking Changes
 
-- [websocket] Update to Jetty Websocket 10 [#70](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/70) - Contributed on behalf of STMicroelectronics
-  - This includes breaking changes due to major API changes in Jetty and the following new minimum versions:
-    - Jetty 9.x -> Jetty 10.0.13
-    - LSP4J -> 0.8.0 -> 0.11.0
-    - ELK 0.7.0 -> 0.8.1
-    - Log4J 1.2x -> 2.19
-  - Remove the `keepAliveModule` and rely on Jetty's infinite session timeout mechanism instead
-- [eclipse] Rework of the GLSPDiagramEditor to support E4 Parts [#83](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/83)
-  - Most methods in GLSPDiagramEditor moved to GLSPDiagramComposite if you want to override them with your own implementation override GLSPDiagramEditor.createGLSPDiagramComposite() and return our own class
-  - Extent GLSPDiagramPart to implement your own E4 Part
-  - GLSPEditorRegistry works on GLSPDiagramComposite and no longer on GLSPDiagramEditor, which is the implementation used by E3 and E4
+-   [websocket] Update to Jetty Websocket 10 [#70](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/70) - Contributed on behalf of STMicroelectronics
+    -   This includes breaking changes due to major API changes in Jetty and the following new minimum versions:
+        -   Jetty 9.x -> Jetty 10.0.13
+        -   LSP4J -> 0.8.0 -> 0.11.0
+        -   ELK 0.7.0 -> 0.8.1
+        -   Log4J 1.2x -> 2.19
+    -   Remove the `keepAliveModule` and rely on Jetty's infinite session timeout mechanism instead
+-   [eclipse] Rework of the GLSPDiagramEditor to support E4 Parts [#83](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/83)
+    -   Most methods in GLSPDiagramEditor moved to GLSPDiagramComposite if you want to override them with your own implementation override GLSPDiagramEditor.createGLSPDiagramComposite() and return our own class
+    -   Extent GLSPDiagramPart to implement your own E4 Part
+    -   GLSPEditorRegistry works on GLSPDiagramComposite and no longer on GLSPDiagramEditor, which is the implementation used by E3 and E4
+-   [client] Remove dependency to `vscode-ws-jsonrpc`. Use websocket handling provided by glsp-client instead [#76](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/76)
+-   [deps] Use Java 17 as minimum compilation target since Java 11 is EOL [#91](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/91)
 
 ## [v1.0.0 - 30/06/2022](https://github.com/eclipse-glsp/glsp-eclipse-integration/releases/tag/v1.0.0)
 
 ### Changes
 
-- [diagram] Fixed a bug that prevented successful completion the `DefaultModelInitializationConstraint` [#47](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/47)
-- [editor] Made editor retrieval thread safe to ensure that actions that are sent after the editor has been disposed are correctly handled (i.e. ignored) [#48](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/48)
-- [example] Improved and modernized styling of the GLSP workflow example [#49](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/49)
-- [editor] Fixed a bug to ensure that keybindings are also working when using `WebView2` [#54](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/54/)
+-   [diagram] Fix a bug that prevented successful completion the `DefaultModelInitializationConstraint` [#47](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/47)
+-   [editor] Make editor retrieval thread safe to ensure that actions that are sent after the editor has been disposed are correctly handled (i.e. ignored) [#48](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/48)
+-   [example] Improve and modernize styling of the GLSP workflow example [#49](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/49)
+-   [editor] Fix a bug to ensure that keybindings are also working when using `WebView2` [#54](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/54/)
 
 ### Breaking Changes
 
-- [build] Removed dependency to `Apache Commons IO` [#52](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/52)
-- [gmodel] Rename handlers and services that operate directly on the GModels [#53](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/53):
-  - `IdePasteOperationHandler` -> `GModelIdePasteOperationHandler`
+-   [build] Remove dependency to `Apache Commons IO` [#52](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/52)
+-   [gmodel] Rename handlers and services that operate directly on the GModels [#53](https://github.com/eclipse-glsp/glsp-eclipse-integration/pull/53):
+    -   `IdePasteOperationHandler` -> `GModelIdePasteOperationHandler`
 
 ## [v0.9.0- 09/12/2021](https://github.com/eclipse-glsp/glsp-eclipse-integration/releases/tag/v0.9.0)
 

Jenkinsfile

@@ -136,7 +136,7 @@ pipeline {
         stage('Deploy (master only)') {
             when { 
                 allOf {
-                    branch 'master';
+                    branch 'skipForRelease';
                     expression {  
                       /* Only trigger the deployment job if the changeset contains changes in 
                       the `server` or `client/packages/` directory */

client/examples/workflow-webapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp-examples/workflow-webapp",
-  "version": "1.1.0-next",
+  "version": "2.0.0",
   "private": true,
   "description": "GLSP-based webapp for the Workflow example",
   "scripts": {
@@ -14,8 +14,8 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp-examples/workflow-glsp": "next",
-    "@eclipse-glsp/ide": "^1.1.0-next"
+    "@eclipse-glsp-examples/workflow-glsp": "~2.0.0",
+    "@eclipse-glsp/ide": "~2.0.0"
   },
   "devDependencies": {
     "@vscode/codicons": "^0.0.25",

client/lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-next",
+  "version": "2.0.0",
   "useWorkspaces": true,
   "npmClient": "yarn",
   "command": {

client/packages/ide/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-glsp/ide",
-  "version": "1.1.0-next",
+  "version": "2.0.0",
   "description": "Glue code to integrate GLSP clients into Eclipse via a webapp",
   "homepage": "https://www.eclipse.org/glsp/",
   "bugs": "https://github.com/eclipse-glsp/glsp/issues",
@@ -34,7 +34,7 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp/client": "next"
+    "@eclipse-glsp/client": "~2.0.0"
   },
   "engines": {
     "yarn": "1.0.x || >=1.2.1"

client/yarn.lock

@@ -206,12 +206,12 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@eclipse-glsp-examples/workflow-glsp@next":
-  version "1.1.0-next.e8bdd69.287"
-  resolved "https://registry.yarnpkg.com/@eclipse-glsp-examples/workflow-glsp/-/workflow-glsp-1.1.0-next.e8bdd69.287.tgz#9d36057c89103ea88b9be8f917291e30d89c7121"
-  integrity sha512-uGHiBqbC7FcYZ5jGQUVuDhHGQar1vf1w5MZc3ocgd2HezBSca5k/U/du/AsdyDF/sYeydzcknFqbqVA2npj53Q==
+"@eclipse-glsp-examples/workflow-glsp@~2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@eclipse-glsp-examples/workflow-glsp/-/workflow-glsp-2.0.0.tgz#d6a566acd3f397959ff6ee9fa36fc8ebd039d290"
+  integrity sha512-MuhNaJwj6D6tqs7j2kR/t2tgYJbk6dTFN74zba2aLBg3ObEwHjJxJ5JMr64ByYoG4c+PR6HFvEXDbvmGdpuyBA==
   dependencies:
-    "@eclipse-glsp/client" "1.1.0-next.e8bdd69.287+e8bdd69"
+    "@eclipse-glsp/client" "~2.0.0"
     balloon-css "^0.5.0"
 
 "@eclipse-glsp/[email protected]+cbae4df":
@@ -226,12 +226,12 @@
     semver "^7.5.1"
     shelljs "^0.8.5"
 
-"@eclipse-glsp/client@1.1.0-next.e8bdd69.287+e8bdd69", "@eclipse-glsp/client@next":
-  version "1.1.0-next.e8bdd69.287"
-  resolved "https://registry.yarnpkg.com/@eclipse-glsp/client/-/client-1.1.0-next.e8bdd69.287.tgz#f89a9beba9adfe12aec4ecc8f0222c1e5c4ebbf6"
-  integrity sha512-Br0XVjo2xS+0PU6nRcx1wKluIP1BwfDg9yLFJvyZNQXWMnuGZ/28pzXTtFr/q0BOLoFXMEKjZT5i/5nvO3lG5w==
+"@eclipse-glsp/client@~2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@eclipse-glsp/client/-/client-2.0.0.tgz#1100d7b2de0b4a92f4397417cc196fe7324af0f5"
+  integrity sha512-Bi3Pxv0jgr8uyKTtxivPEfD6nHYPB35a0+eaq5wjxymB3VlX3Fgguy+dAmO9P2FexRN/d4Wh8ZwWhtjC3XP0AQ==
   dependencies:
-    "@eclipse-glsp/sprotty" "1.1.0-next.e8bdd69.287+e8bdd69"
+    "@eclipse-glsp/sprotty" "~2.0.0"
     autocompleter "^9.1.0"
     file-saver "^2.0.5"
     lodash "4.17.21"
@@ -308,24 +308,25 @@
   dependencies:
     prettier-plugin-packagejson "~2.4.6"
 
-"@eclipse-glsp/protocol@1.1.0-next.e8bdd69.287+e8bdd69":
-  version "1.1.0-next.e8bdd69.287"
-  resolved "https://registry.yarnpkg.com/@eclipse-glsp/protocol/-/protocol-1.1.0-next.e8bdd69.287.tgz#5a66fb8f75a5be1f99a55fb82f65561923a7e24a"
-  integrity sha512-wvOk8pZ6vtv4mcpAifkHXNCER8RpzOFEtTxCQqxfs3Hgol7/vPmP5sWv4TRMgOB9KtZJ3C/woh3t0EOTsb0yOQ==
+"@eclipse-glsp/protocol@~2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@eclipse-glsp/protocol/-/protocol-2.0.0.tgz#d09fa068c32dadf678696c987feded1790f3099b"
+  integrity sha512-6vFP2aY0+9AcrWvAtNFzcDX00z/rEFwTzYXg9ucDEYwYn105DUadhMruwSn9rsWLxf2movBzEkLSE2TNOX1PkQ==
   dependencies:
     sprotty-protocol "0.15.0-next.044bba2.13"
     uuid "7.0.3"
     vscode-jsonrpc "^8.0.2"
 
-"@eclipse-glsp/sprotty@1.1.0-next.e8bdd69.287+e8bdd69":
-  version "1.1.0-next.e8bdd69.287"
-  resolved "https://registry.yarnpkg.com/@eclipse-glsp/sprotty/-/sprotty-1.1.0-next.e8bdd69.287.tgz#2b79cc7dcf7f76cb7b4ec4ac31837fa83dd2da54"
-  integrity sha512-teTwr4UROcegSveY+AdhsB87kWvSQsNbmMCohxTbqTeU5cA2d5Bzwi8eevhrTVPbT6iXohS+yJWAYvYNayvK5Q==
+"@eclipse-glsp/sprotty@~2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@eclipse-glsp/sprotty/-/sprotty-2.0.0.tgz#dc3915a2ec8959ffbc0b518854820d46f7af5cef"
+  integrity sha512-bXnPwYhyw/dOl4YSGcMciBCJp6toYesa0v8U4iDs0P+x7/Q9yMAPBRYKajxKzyuoVs09hvCkNUVEM1e4cRQ1BA==
   dependencies:
-    "@eclipse-glsp/protocol" "1.1.0-next.e8bdd69.287+e8bdd69"
+    "@eclipse-glsp/protocol" "~2.0.0"
     autocompleter "^9.1.0"
     snabbdom "^3.5.1"
-    sprotty "0.15.0-next.044bba2.13"
+    sprotty "1.0.0"
+    sprotty-protocol "1.0.0"
 
 "@eclipse-glsp/[email protected]+cbae4df":
   version "1.1.0-next.cbae4df.145"
@@ -6739,20 +6740,25 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-[email protected], [email protected]+044bba2:
+[email protected]:
   version "0.15.0-next.044bba2.13"
   resolved "https://registry.yarnpkg.com/sprotty-protocol/-/sprotty-protocol-0.15.0-next.044bba2.13.tgz#10d5c36b00a8a24f62007336743c7e98d56e205b"
   integrity sha512-DmWdIXFeZ5Gwa9uicbTNUkJMfUZa62w76Gb1w9lpYDs2S21HFZU4bvPuMD+yN31V/ChX5TGPCCTHmHLJ3Oe85w==
 
-[email protected]:
-  version "0.15.0-next.044bba2.13"
-  resolved "https://registry.yarnpkg.com/sprotty/-/sprotty-0.15.0-next.044bba2.13.tgz#b5b59869406e8b1c5f65fdf8dfdcb49d4a93ca1a"
-  integrity sha512-rqsoHBuHf/SB7Cd8xyEOXVfa+jb709Evwe/IvjnUaercbf6qKnC99IoAeMYAV0VK5HXWExkhRUBpPqWEwiRFeQ==
+[email protected], sprotty-protocol@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/sprotty-protocol/-/sprotty-protocol-1.0.0.tgz#b22e2da7e10b168debdc17feb61c4b832f01f614"
+  integrity sha512-p1H+ihcOmj0LEk2atcwOnYQPm0WByaOB1yX7fd869ONfQ5R+7x0X20YPdVLeCWmnhsszC/Rf91ojwaQiNIiHNA==
+
+[email protected]:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/sprotty/-/sprotty-1.0.0.tgz#f575a97064ec90f08c468aa3f98a8b0df6887230"
+  integrity sha512-PaGVT1Qc19Mjl1X29UtMm1TNqz9k4AT1QgaXc04njSBKDsSfskS0OupV+oV5m/igbf+juOcHwcbcZdhAxF7RjQ==
   dependencies:
     autocompleter "^9.1.0"
     file-saver "^2.0.5"
     snabbdom "^3.5.1"
-    sprotty-protocol "0.15.0-next.044bba2.13+044bba2"
+    sprotty-protocol "^1.0.0"
     tinyqueue "^2.0.3"
 
 [email protected], ssri@^9.0.0:
@@ -7595,6 +7601,7 @@ [email protected]:
   integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
 
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+  name wrap-ansi-cjs
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

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

@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Workflow Editor
 Bundle-SymbolicName: org.eclipse.glsp.ide.workflow.editor;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 2.0.0
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.glsp.ide.workflow.editor.Activator
 Bundle-Vendor: Eclipse GLSP
 Require-Bundle: org.eclipse.elk.alg.common;bundle-version="0.8.1",
  org.eclipse.elk.alg.layered;bundle-version="0.8.1",
  org.eclipse.elk.graph.text;bundle-version="0.8.1",
- org.eclipse.glsp.server.websocket;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.glsp.layout;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.glsp.ide.editor;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.glsp.example.workflow;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.glsp.server.websocket;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.glsp.layout;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.glsp.ide.editor;bundle-version="[1.0.0,2.0.0]",
+ org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.glsp.example.workflow;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="3.18.0",
  org.eclipse.ui;bundle-version="3.117.0",
  org.eclipse.elk.core;bundle-version="0.8.1",

server/example/org.eclipse.glsp.ide.workflow.editor/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.eclipse.glsp.ide</groupId>
 		<artifactId>org.eclipse.glsp.ide.parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>2.0.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

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

@@ -4,7 +4,7 @@ Bundle-Name: GLSP Editor Integration
 Bundle-SymbolicName: org.eclipse.glsp.ide.editor;singleton:=true
 Bundle-Activator: org.eclipse.glsp.ide.editor.ui.GLSPIdeEditorPlugin
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 2.0.0
 Bundle-Vendor: Eclipse GLSP
 Automatic-Module-Name: com.eclipsesource.glsp.editor
 Bundle-RequiredExecutionEnvironment: JavaSE-17
@@ -20,8 +20,8 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="3.18.0",
  org.eclipse.lsp4j;bundle-version="0.11.0",
  org.eclipse.lsp4j.websocket;bundle-version="0.11.0",
  org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0",
- org.eclipse.glsp.server.websocket;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.glsp.server.websocket;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.e4.core.contexts;bundle-version="1.8.400",
  org.eclipse.jetty.server;bundle-version="[10.0.0,11.0.0)",
  org.eclipse.jetty.websocket.javax.client;bundle-version="[10.0.0,11.0.0)",

server/plugins/org.eclipse.glsp.ide.editor/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.eclipse.glsp.ide</groupId>
 		<artifactId>org.eclipse.glsp.ide.parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>2.0.0</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

server/pom.xml

@@ -6,7 +6,7 @@
 	<groupId>org.eclipse.glsp.ide</groupId>
 	<artifactId>org.eclipse.glsp.ide.parent</artifactId>
 	<description>GLSP Eclipse IDE Integration Parent pom </description>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>2.0.0</version>
 	<packaging>pom</packaging>
 
 	<name>GLSP Eclipse IDE Integration Parent</name>

server/releng/org.eclipse.glsp.ide.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.glsp.ide.feature"
       label="GLSP Eclipse IDE Integration"
-      version="1.1.0.qualifier"
+      version="2.0.0"
       provider-name="Eclipse GLSP">
 
    <description url="http://www.example.com/description">
@@ -320,8 +320,8 @@ version(s), and exceptions or additional permissions here}.&quot;
       <import plugin="com.google.gson" version="2.8.7" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.editors" version="3.11.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.glsp.server.websocket" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.glsp.server" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.glsp.server.websocket" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.glsp.server" version="2.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.e4.core.contexts" version="1.8.400" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jetty.server" version="10.0.0" match="compatible"/>
       <import plugin="org.eclipse.jetty.websocket.javax.client" version="10.0.0" match="compatible"/>