diff --git a/CHANGELOG.md b/CHANGELOG.md index 468d0183..7d8b80f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,14 @@ - [graph] Updated the Graph model and add Layoutable interface [#175](https://github.com/eclipse-glsp/glsp-server/pull/175) - Contributed on behalf of STMicroelectronics - [layout] Extend `ComputedBoundsAction` to also provide route data for client-side routed edges and store source/target point in the `args` map [#181](https://github.com/eclipse-glsp/glsp-server/pull/181) - [websocket] Remove listing on `stdin` from `WebsocketServerLauncher` [#189](https://github.com/eclipse-glsp/glsp-server/pull/189) -- [diagram] Fixed a bug that prevented stable ids within one session when using the `IdKeeperAdapter` [#192](https://github.com/eclipse-glsp/glsp-server/pull/192) - Contributed on behalf of STMicroelectronics +- [diagram] Fix a bug that prevented stable ids within one session when using the `IdKeeperAdapter` [#192](https://github.com/eclipse-glsp/glsp-server/pull/192) - Contributed on behalf of STMicroelectronics +- [API] Introduce `deselectAll` flag for `SelectAction`s [#204](https://github.com/eclipse-glsp/glsp-server/pull/204) +- [API] Add support for progress reporting [#205](https://github.com/eclipse-glsp/glsp-server/pull/205) +- [diagram] Add support for handling reconnection requests to RequestModelActionHandler [#208](https://github.com/eclipse-glsp/glsp-server/pull/208) +- [diagram] Add support for dynamic edge type hints [#210](https://github.com/eclipse-glsp/glsp-server/pull/210) + - Provide EdgeCreationChecker API. Adopters can implement this to handle dynamic edge creation validation requests. +- [launch] Add `hostname` arg to `CLIParser` [#214](https://github.com/eclipse-glsp/glsp-server/pull/214) +- [deps] Remove upper bounds version constraints for Guice and Guava [#216](https://github.com/eclipse-glsp/glsp-server/pull/216) ### Breaking Changes @@ -19,12 +26,20 @@ - [operation] Rework `OperationHandler` to provide an optional command instead of direct execution to allow more execution control [#187](https://github.com/eclipse-glsp/glsp-server/pull/187) - `Abstract` base implementations were deprecated in favor of `GModelOperationHandler` and `EMFOperationHandler` base classes - Long-term deprecated and unused `Basic` base classes were removed -- [modelstate] Use interface-injection for all subclasses of GModelState (EMFModelState, EMFNotationModelState) - - EMFModelState and EMFNotationModelState are now interfaces instead of classes - - EMFModelStateImpl and EMFNotationModelStateImpl classes have been added - - Related Modules have been updated to inject these GModelState sub-types as a Singleton +- [modelstate] Use interface-injection for all subclasses of GModelState (EMFModelState, EMFNotationModelState) [#199](https://github.com/eclipse-glsp/glsp-server/pull/199) + - `EMFModelState` and `EMFNotationModelState` are now interfaces instead of classes + - Add `EMFModelStateImpl` and `EMFNotationModelStateImpl` classes + - Update related modules to inject these GModelState sub-types as a Singleton - [validation] Add explicit support and API for live and batch validation [#200](https://github.com/eclipse-glsp/glsp-server/pull/200) -- [server] Default ports have changed from 5007 (and 8081 for websockets) to 0, which implies autoassignment by the OS [#198](https://github.com/eclipse-glsp/glsp-server/pull/198) +- [server] Change default ports from 5007 (and 8081 for websockets) to 0, which implies autoassignment by the OS [#198](https://github.com/eclipse-glsp/glsp-server/pull/198) +- [API] Remove deprecated `GConstants.STACK` constant [#209](https://github.com/eclipse-glsp/glsp-server/pull/209) +- [API] Revise model loading and client action handling [#211](https://github.com/eclipse-glsp/glsp-server/pull/211) + - Refactor `ModelSubmissionHandler` to enable handling of `RequestModelAction` as proper request action + - Introduce a `submitInitialModel` method that is called by the `RequestModelActionHandler` + - Remove `configureClientActions` from `DiagramModule` as client actions are now implicitly configured via `InitializeClientSession` request + - Remove `ClientActionHandler` and replace with `ClientActionForwarder` + - Rename `ServerStatusAction` -> `StatusAction` and `ServerMessageAction` -> `MessageAction` +- [deps] Set Java compliance level to Java 17 as Java 11 is now EOL [#217](https://github.com/eclipse-glsp/glsp-server/pull/217) ## [v1.0.0 - 30/06/2022](https://github.com/eclipse-glsp/glsp-server/releases/tag/v1.0.0) diff --git a/README.md b/README.md index 83539864..f3204e45 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Contains the code for the Java-based framework to create [GLSP](https://github.c ## Building -The GLSP server bundles are built with Java 11 or higher and maven. +The GLSP server bundles are built with Java 17 or higher and maven. Execute `mvn clean verify -Pm2` (for maven) or `mvn clean verify -Pp2` (for p2). The nightly builds are available as maven repository or p2 update site. diff --git a/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF b/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF index 40119187..7fd17303 100644 --- a/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GLSP Workflow Example Bundle-SymbolicName: org.eclipse.glsp.example.workflow;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 2.0.0 Bundle-ClassPath: . Bundle-Vendor: Eclipse GLSP Bundle-Localization: plugin @@ -22,9 +22,9 @@ Export-Package: org.eclipse.glsp.example.workflow, org.eclipse.glsp.example.workflow.wfgraph.util Automatic-Module-Name: org.eclipse.glsp.example.workflow Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.glsp.layout;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="[1.0.0,2.0.0)", +Require-Bundle: org.eclipse.glsp.layout;bundle-version="[2.0.0,3.0.0)", + org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)", + org.eclipse.glsp.server.websocket;bundle-version="[2.0.0,3.0.0)", org.eclipse.elk.core;bundle-version="0.8.1", org.eclipse.elk.alg.layered;bundle-version="0.8.1", org.eclipse.elk.graph;bundle-version="0.8.1" diff --git a/examples/org.eclipse.glsp.example.workflow/pom.xml b/examples/org.eclipse.glsp.example.workflow/pom.xml index 0d9cae89..caabbd45 100644 --- a/examples/org.eclipse.glsp.example.workflow/pom.xml +++ b/examples/org.eclipse.glsp.example.workflow/pom.xml @@ -9,7 +9,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - 1.1.0-SNAPSHOT + 2.0.0 ../../pom.xml diff --git a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF index 4bbf0366..3cd273dd 100644 --- a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GLSP Graph Bundle-SymbolicName: org.eclipse.glsp.graph;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 2.0.0 Bundle-Vendor: Eclipse GLSP Automatic-Module-Name: org.eclipse.glsp.graph Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/org.eclipse.glsp.graph/pom.xml b/plugins/org.eclipse.glsp.graph/pom.xml index 3fb109f8..b57e95c6 100644 --- a/plugins/org.eclipse.glsp.graph/pom.xml +++ b/plugins/org.eclipse.glsp.graph/pom.xml @@ -8,7 +8,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - 1.1.0-SNAPSHOT + 2.0.0 ../../pom.xml diff --git a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF index 2a5fafb9..675dbbef 100644 --- a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GLSP Layout Bundle-SymbolicName: org.eclipse.glsp.layout -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 2.0.0 Bundle-Vendor: EclispeSource Automatic-Module-Name: org.eclipse.glsp.layout Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)", +Require-Bundle: org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)", org.eclipse.elk.core;bundle-version="0.8.1", org.eclipse.elk.graph;bundle-version="0.8.1", com.google.guava;bundle-version="[30.1.0,33.0.0)" diff --git a/plugins/org.eclipse.glsp.layout/pom.xml b/plugins/org.eclipse.glsp.layout/pom.xml index 5890df37..0f04897a 100644 --- a/plugins/org.eclipse.glsp.layout/pom.xml +++ b/plugins/org.eclipse.glsp.layout/pom.xml @@ -8,7 +8,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - 1.1.0-SNAPSHOT + 2.0.0 ../../pom.xml diff --git a/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF index 7c791e59..1ae7f763 100644 --- a/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GLSP Server EMF Bundle-SymbolicName: org.eclipse.glsp.server.emf;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 2.0.0 Bundle-ClassPath: . Bundle-Vendor: Eclipse GLSP Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.glsp.example.emf Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)", - org.eclipse.glsp.graph;bundle-version="[1.0.0,2.0.0)", +Require-Bundle: org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)", + org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)", org.eclipse.emf.ecore;bundle-version="2.25.0", org.eclipse.emf.ecore.edit;bundle-version="2.13.0", org.eclipse.emf.ecore.xmi;bundle-version="2.16.0" diff --git a/plugins/org.eclipse.glsp.server.emf/pom.xml b/plugins/org.eclipse.glsp.server.emf/pom.xml index 2118d404..5d364a73 100644 --- a/plugins/org.eclipse.glsp.server.emf/pom.xml +++ b/plugins/org.eclipse.glsp.server.emf/pom.xml @@ -9,7 +9,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - 1.1.0-SNAPSHOT + 2.0.0 ../../pom.xml diff --git a/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF index b3841fd8..487af57d 100644 --- a/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GLSP Server Websocket Bundle-SymbolicName: org.eclipse.glsp.server.websocket -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 2.0.0 Bundle-Vendor: Eclipse GLSP Automatic-Module-Name: com.eclipsesource.glps.server.websocket Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: com.google.gson;bundle-version="2.8.7", - org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)", + org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0]", org.eclipse.lsp4j;bundle-version="0.11.0", org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0", org.eclipse.lsp4j.websocket;bundle-version="0.11.0", diff --git a/plugins/org.eclipse.glsp.server.websocket/pom.xml b/plugins/org.eclipse.glsp.server.websocket/pom.xml index 2eca2b73..a6a07c6e 100644 --- a/plugins/org.eclipse.glsp.server.websocket/pom.xml +++ b/plugins/org.eclipse.glsp.server.websocket/pom.xml @@ -8,7 +8,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - 1.1.0-SNAPSHOT + 2.0.0 ../../pom.xml diff --git a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF index 8c878a94..6e5af8d9 100644 --- a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: GLSP Server Bundle-SymbolicName: org.eclipse.glsp.server -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 2.0.0 Bundle-Vendor: Eclipse GLSP Automatic-Module-Name: org.eclipse.glsp.server Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.emf.ecore.change;bundle-version="2.14.0", org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0", org.apache.commons.cli;bundle-version="1.4.0";visibility:=reexport, com.google.inject;bundle-version="[5.0.1,8.0.0)";visibility:=reexport, - org.eclipse.glsp.graph;bundle-version="[1.0.0,2.0.0)";visibility:=reexport + org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)";visibility:=reexport Export-Package: org.eclipse.glsp.server.actions, org.eclipse.glsp.server.di, org.eclipse.glsp.server.di.scope, diff --git a/plugins/org.eclipse.glsp.server/pom.xml b/plugins/org.eclipse.glsp.server/pom.xml index e7ea9cb4..d0a32820 100644 --- a/plugins/org.eclipse.glsp.server/pom.xml +++ b/plugins/org.eclipse.glsp.server/pom.xml @@ -8,7 +8,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - 1.1.0-SNAPSHOT + 2.0.0 ../../pom.xml diff --git a/pom.xml b/pom.xml index e7d23c17..883a5355 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.eclipse.glsp org.eclipse.glsp.parent GLSP Parent pom - 1.1.0-SNAPSHOT + 2.0.0 pom GLSP Parent @@ -64,7 +64,7 @@ 2.7 + platform in ,2. We try to match the p2-version if possible. --> [2.19.0,) [1.4,) [0.8.1,) diff --git a/releng/org.eclipse.glsp.feature/feature.xml b/releng/org.eclipse.glsp.feature/feature.xml index 8195d050..d9f4f7fd 100644 --- a/releng/org.eclipse.glsp.feature/feature.xml +++ b/releng/org.eclipse.glsp.feature/feature.xml @@ -2,7 +2,7 @@ @@ -318,7 +318,6 @@ version(s), and exceptions or additional permissions here}." - diff --git a/releng/org.eclipse.glsp.feature/pom.xml b/releng/org.eclipse.glsp.feature/pom.xml index 2b62c0d1..3d80bd00 100644 --- a/releng/org.eclipse.glsp.feature/pom.xml +++ b/releng/org.eclipse.glsp.feature/pom.xml @@ -4,7 +4,7 @@ org.eclipse.glsp org.eclipse.glsp.releng - 1.1.0-SNAPSHOT + 2.0.0 ../ eclipse-feature diff --git a/releng/org.eclipse.glsp.repository/pom.xml b/releng/org.eclipse.glsp.repository/pom.xml index b8c2aef5..57501d1c 100644 --- a/releng/org.eclipse.glsp.repository/pom.xml +++ b/releng/org.eclipse.glsp.repository/pom.xml @@ -5,7 +5,7 @@ org.eclipse.glsp org.eclipse.glsp.releng - 1.1.0-SNAPSHOT + 2.0.0 ../ org.eclipse.glsp.repository diff --git a/releng/pom.xml b/releng/pom.xml index d6803bc8..0c925844 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -12,7 +12,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - 1.1.0-SNAPSHOT + 2.0.0 ../pom.xml diff --git a/targetplatforms/pom.xml b/targetplatforms/pom.xml index a5b6b4d3..d96c58ed 100644 --- a/targetplatforms/pom.xml +++ b/targetplatforms/pom.xml @@ -10,7 +10,7 @@ org.eclipse.glsp targetplatforms - 0.10.0-SNAPSHOT + 2.0.0 pom diff --git a/tests/org.eclipse.glsp.graph.test/pom.xml b/tests/org.eclipse.glsp.graph.test/pom.xml index 03b76b04..441e1c86 100644 --- a/tests/org.eclipse.glsp.graph.test/pom.xml +++ b/tests/org.eclipse.glsp.graph.test/pom.xml @@ -7,7 +7,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - 1.1.0-SNAPSHOT + 2.0.0 ../../pom.xml diff --git a/tests/org.eclipse.glsp.server.test/pom.xml b/tests/org.eclipse.glsp.server.test/pom.xml index 42a5241a..07803a7c 100644 --- a/tests/org.eclipse.glsp.server.test/pom.xml +++ b/tests/org.eclipse.glsp.server.test/pom.xml @@ -7,7 +7,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - 1.1.0-SNAPSHOT + 2.0.0 ../../pom.xml diff --git a/tests/pom.xml b/tests/pom.xml index d49d6d35..29deae86 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -12,7 +12,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - 1.1.0-SNAPSHOT + 2.0.0 ../pom.xml